***IMMINENT RELEASE NOTICE***

[freertos] / FreeRTOS / Demo / msp430_GCC / serial / serial.c

diff --git a/FreeRTOS/Demo/msp430_GCC/serial/serial.c b/FreeRTOS/Demo/msp430_GCC/serial/serial.c
index e7f5e18a9fe1e874d574500abdca9a3fc4697902..149e92812014d82132787b2d8fae30f99c13fac6 100644 (file)
--- a/FreeRTOS/Demo/msp430_GCC/serial/serial.c
+++ b/FreeRTOS/Demo/msp430_GCC/serial/serial.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd. \r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -85,16 +85,16 @@
 #define serTX_AND_RX                   ( ( unsigned char ) 0x03 )\r
 \r
 /* Misc. constants. */\r
-#define serNO_BLOCK                            ( ( portTickType ) 0 )\r
+#define serNO_BLOCK                            ( ( TickType_t ) 0 )\r
 \r
 /* Enable the UART Tx interrupt. */\r
 #define vInterruptOn() IFG2 |= UTXIFG1\r
 \r
 /* The queue used to hold received characters. */\r
-static xQueueHandle xRxedChars; \r
+static QueueHandle_t xRxedChars; \r
 \r
 /* The queue used to hold characters waiting transmission. */\r
-static xQueueHandle xCharsForTx; \r
+static QueueHandle_t xCharsForTx; \r
 \r
 static volatile short sTHREEmpty;\r
 \r
@@ -158,7 +158,7 @@ unsigned long ulBaudRateCount;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime )\r
 {\r
        /* Get the next character from the buffer.  Return false if no characters\r
        are available, or arrive before xBlockTime expires. */\r
@@ -173,7 +173,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedC
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime )\r
 {\r
 signed portBASE_TYPE xReturn;\r
 \r