From 3e4b15864da3d82dc17c7daa85fdfdef5b1359de Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sun, 2 Jan 2011 18:19:12 +0000
Subject: [PATCH] Minor updates to the MSP430X CCS4 demo application.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1211 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../Demo_Source/FreeRTOSConfig.h                      |  9 +++++++++
 .../Demo_Source/RunTimeStatsConfig.c                  |  4 ++--
 Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c      | 11 ++---------
 Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd    |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h
index e547af8d6..6ca457319 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h
@@ -51,6 +51,15 @@
     licensing and training services.
 */
 
+
+/* The following #error directive is to remind users that a batch file must be
+ * executed prior to this project being built.  The batch file *cannot* be 
+ * executed from within CCS4!  Once it has been executed, re-open or refresh 
+ * the CCS4 project and remove the #error line below.
+ */
+#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
+
+
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c
index 1978672e9..1718338f3 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c
@@ -78,8 +78,8 @@ void vConfigureTimerForRunTimeStats( void )
 	/* Ensure the timer is stopped. */
 	TA1CTL = 0;
 
-	/* Run the timer from the ACLK/4. */
-	TA1CTL = TASSEL_1 | ID__4;
+	/* Run the timer from the ACLK/2. */
+	TA1CTL = TASSEL_1 | ID__2;
 
 	/* Clear everything to start with. */
 	TA1CTL |= TACLR;
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
index d82e6a085..813ab6a23 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
@@ -236,13 +236,6 @@ typedef struct
 
 /*-----------------------------------------------------------*/
 
-/* The following #error directive is to remind users that a batch file must be
- * executed prior to this project being built.  The batch file *cannot* be 
- * executed from within CCS4!  Once it has been executed, re-open the CCS4
- * project and remove the #error line below.
- */
-#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
-
 /* The linker script tests the FreeRTOS ports use of 20bit addresses by
 locating all code in high memory.  The following pragma ensures that main
 remains in low memory. */
@@ -571,10 +564,10 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 
 /* The MSP430X port uses this callback function to configure its tick interrupt.
 This allows the application to choose the tick interrupt source.
-configTICK_INTERRUPT_VECTOR must also be set in FreeRTOSConfig.h to the correct
+configTICK_VECTOR must also be set in FreeRTOSConfig.h to the correct
 interrupt vector for the chosen tick interrupt source.  This implementation of
 vApplicationSetupTimerInterrupt() generates the tick from timer A0, so in this
-case configTICK_INTERRUPT_VECTOR is set to TIMER0_A0_VECTOR. */
+case configTICK_VECTOR is set to TIMER0_A0_VECTOR. */
 void vApplicationSetupTimerInterrupt( void )
 {
 const unsigned short usACLK_Frequency_Hz = 32768;
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
index fa1ff8a9f..9238b3473 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
+++ b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
@@ -106,11 +106,11 @@ SECTIONS
     .sysmem    : {} > RAM                /* DYNAMIC MEMORY ALLOCATION AREA    */
     .stack     : {} > RAM (HIGH)         /* SOFTWARE SYSTEM STACK             */
 
-/* Modified to test the use of high memory. */
+/* Can be modified to test the use of high memory. */
 /* Original line. */
-/*    .text      : {}>> FLASH | FLASH2 */  /* CODE                              */
+    .text      : {}>> FLASH | FLASH2   /* CODE                              */
 /* Modified line. */
-    .text      : {}>> FLASH2              /* CODE                              */
+/*    .text      : {}>> FLASH2 */              /* CODE                              */
 	.main      : {} > FLASH
     .text:_isr : {} > FLASH              /* ISR CODE SPACE                    */
     .cinit     : {} > FLASH              /* INITIALIZATION TABLES             */
-- 
2.39.5