From 3823ae510cb2b9c79b823ac6f1ffef64af0bf103 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Mon, 14 Mar 2011 07:26:50 +0000 Subject: [PATCH] Finalise MSP430X CCS4 port and demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1322 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c | 2 +- Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c | 8 +++----- Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c index 8b357d8fa..e07c33b47 100644 --- 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 ) /* The baud rate used by the comtest tasks. */ -#define mainCOM_TEST_BAUD_RATE ( 115200 ) +#define mainCOM_TEST_BAUD_RATE ( 38400 ) /* The maximum number of lines of text that can be displayed on the LCD. */ #define mainMAX_LCD_LINES ( 8 ) diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c index b85079a43..e351dedf6 100644 --- 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; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; - while( ( UCA1IFG & UCRXIFG ) != 0 ) + if( ( UCA1IFG & UCRXIFG ) != 0 ) { /* Get the character from the UART and post it on the queue of Rxed characters. */ cChar = UCA1RXBUF; xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken ); - } - - /* If there is a Tx interrupt pending and the tx interrupts are enabled. */ - if( ( UCA1IFG & UCTXIFG ) != 0 ) + } + else if( ( UCA1IFG & UCTXIFG ) != 0 ) { /* The previous character has been transmitted. See if there are any further characters waiting transmission. */ diff --git a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd index 5f9258739..439b21a13 100644 --- a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd +++ b/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd @@ -108,9 +108,9 @@ SECTIONS /* 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