Finalise MSP430X CCS4 port and demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1322 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
index 8b357d8faeed5549d64fb748243619dfbb6e2f8a..e07c33b478d374139b5177beeeffed9f4440fce0 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
@@ -176,7 +176,7 @@ information.  */
 #define mainCOM_TEST_LED                               ( 1 )\r
 \r
 /* The baud rate used by the comtest tasks. */\r
-#define mainCOM_TEST_BAUD_RATE                 ( 115200 )\r
+#define mainCOM_TEST_BAUD_RATE                 ( 38400 )\r
 \r
 /* The maximum number of lines of text that can be displayed on the LCD. */\r
 #define mainMAX_LCD_LINES                              ( 8 )\r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c
index b85079a43046bced55db9b14622bcc03a0298c61..e351dedf65c6b37c029eab032cffdfbdd797c04e 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c
@@ -169,16 +169,14 @@ interrupt void prvUSCI_A1_ISR( void )
 signed char cChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
-       while( ( UCA1IFG & UCRXIFG ) != 0 )\r
+       if( ( UCA1IFG & UCRXIFG ) != 0 )\r
        {\r
                /* Get the character from the UART and post it on the queue of Rxed\r
                characters. */\r
                cChar = UCA1RXBUF;\r
                xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
-       }\r
-       \r
-       /* If there is a Tx interrupt pending and the tx interrupts are enabled. */\r
-       if( ( UCA1IFG & UCTXIFG ) != 0 )\r
+       }       \r
+       else if( ( UCA1IFG & UCTXIFG ) != 0 )\r
        {\r
                /* The previous character has been transmitted.  See if there are any\r
                further characters waiting transmission. */\r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
index 5f9258739b80f7f54e07a68cfb295fac621ad7ae..439b21a138c7a05a5135e3c7af7a4cc1a4887698 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
+++ b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
@@ -108,9 +108,9 @@ SECTIONS
 \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