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

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h
index e547af8d65dbb23c48004c7cf423f14228606f9a..6ca457319cc76564c24f5afa004f699858edb885 100644 (file)
--- 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.\r
 */\r
 \r
+\r
+/* The following #error directive is to remind users that a batch file must be\r
+ * executed prior to this project being built.  The batch file *cannot* be \r
+ * executed from within CCS4!  Once it has been executed, re-open or refresh \r
+ * the CCS4 project and remove the #error line below.\r
+ */\r
+#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.\r
+\r
+\r
 #ifndef FREERTOS_CONFIG_H\r
 #define FREERTOS_CONFIG_H\r
 \r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c
index 1978672e92b9de9b9d6f3b7fc718138549b1f050..1718338f3fcb43e53260ee9cca81a5fc39144e2f 100644 (file)
--- 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. */\r
        TA1CTL = 0;\r
 \r
-       /* Run the timer from the ACLK/4. */\r
-       TA1CTL = TASSEL_1 | ID__4;\r
+       /* Run the timer from the ACLK/2. */\r
+       TA1CTL = TASSEL_1 | ID__2;\r
 \r
        /* Clear everything to start with. */\r
        TA1CTL |= TACLR;\r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
index d82e6a085535f2c93e4ec41ee6f510d73f8e52c8..813ab6a23774a11bc46966b7eb7bc880eb7f76d5 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
@@ -236,13 +236,6 @@ typedef struct
 \r
 /*-----------------------------------------------------------*/\r
 \r
-/* The following #error directive is to remind users that a batch file must be\r
- * executed prior to this project being built.  The batch file *cannot* be \r
- * executed from within CCS4!  Once it has been executed, re-open the CCS4\r
- * project and remove the #error line below.\r
- */\r
-#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.\r
-\r
 /* The linker script tests the FreeRTOS ports use of 20bit addresses by\r
 locating all code in high memory.  The following pragma ensures that main\r
 remains in low memory. */\r
@@ -571,10 +564,10 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 \r
 /* The MSP430X port uses this callback function to configure its tick interrupt.\r
 This allows the application to choose the tick interrupt source.\r
-configTICK_INTERRUPT_VECTOR must also be set in FreeRTOSConfig.h to the correct\r
+configTICK_VECTOR must also be set in FreeRTOSConfig.h to the correct\r
 interrupt vector for the chosen tick interrupt source.  This implementation of\r
 vApplicationSetupTimerInterrupt() generates the tick from timer A0, so in this\r
-case configTICK_INTERRUPT_VECTOR is set to TIMER0_A0_VECTOR. */\r
+case configTICK_VECTOR is set to TIMER0_A0_VECTOR. */\r
 void vApplicationSetupTimerInterrupt( void )\r
 {\r
 const unsigned short usACLK_Frequency_Hz = 32768;\r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
index fa1ff8a9f02b76617e419d064287dd6cf0843352..9238b3473b995083d4db20aaecf8169964d00b98 100644 (file)
--- 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    */\r
     .stack     : {} > RAM (HIGH)         /* SOFTWARE SYSTEM STACK             */\r
 \r
-/* Modified to test the use of high memory. */\r
+/* Can be modified to test the use of high memory. */\r
 /* Original line. */\r
-/*    .text      : {}>> FLASH | FLASH2 */  /* CODE                              */\r
+    .text      : {}>> FLASH | FLASH2   /* CODE                              */\r
 /* Modified line. */\r
-    .text      : {}>> FLASH2              /* CODE                              */\r
+/*    .text      : {}>> FLASH2 */              /* CODE                              */\r
        .main      : {} > FLASH\r
     .text:_isr : {} > FLASH              /* ISR CODE SPACE                    */\r
     .cinit     : {} > FLASH              /* INITIALIZATION TABLES             */\r