Tidy up the IAR MSP430X demo serial.c file.

[freertos] / Demo / MSP430X_MSP430F5438_IAR / serial.c

diff --git a/Demo/MSP430X_MSP430F5438_IAR/serial.c b/Demo/MSP430X_MSP430F5438_IAR/serial.c
index 89ca091bd43ebd3c789fd82b43452459cebbf8f6..9eb494142dcfc73b558d079a12ca0f6d06b82a52 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/serial.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/serial.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V6.1.0 - Copyright (C) 2010 Real Time Engineers Ltd.\r
+    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
 \r
     ***************************************************************************\r
     *                                                                         *\r
@@ -55,7 +55,7 @@
 /* BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER.\r
  *\r
  * This is not a proper UART driver.  It only supports one port, uses loopback\r
- * mode, and is used to test interrupts that use the FreeRTOS API as part of \r
+ * mode, and is used to test interrupts that use the FreeRTOS API as part of\r
  * a wider test suite.  Nor is it intended to show an efficient implementation\r
  * of a UART interrupt service routine as queues are used to pass individual\r
  * characters one at a time!\r
@@ -158,10 +158,9 @@ signed portBASE_TYPE xReturn;
 /*-----------------------------------------------------------*/\r
 \r
 #pragma vector=USCI_A1_VECTOR\r
-static __interrupt void prvUSCI_A0_ISR( void )\r
+static __interrupt void prvUSCI_A1_ISR( void )\r
 {\r
-signed portCHAR cChar;\r
-portBASE_TYPE xTaskWoken = pdFALSE;\r
+signed char cChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        while( ( UCA1IFG & UCRXIFG ) != 0 )\r
@@ -177,7 +176,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
        {\r
                /* The previous character has been transmitted.  See if there are any\r
                further characters waiting transmission. */\r
-               if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWoken ) == pdTRUE )\r
+               if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )\r
                {\r
                        /* There was another character queued - transmit it now. */\r
                        UCA1TXBUF = cChar;\r
@@ -196,7 +195,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
        has a priority equal to or above the task that this interrupt interrupted,\r
        then lHigherPriorityTaskWoken will have been set to pdTRUE internally within\r
        xQueuesendFromISR(), and portEND_SWITCHING_ISR() will ensure that this\r
-       interrupt returns directly to the higher priority unblocked task. \r
+       interrupt returns directly to the higher priority unblocked task.\r
        \r
        THIS MUST BE THE LAST THING DONE IN THE ISR. */ \r
        portYIELD_FROM_ISR( xHigherPriorityTaskWoken );\r