Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

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

diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c
index 17aa702c97914671d86ebf9e8080e0d6187ea389..4a092dadaaf0d56a99c5ba7ebe33567a7257334d 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/serial.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.2 - 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
 \r
@@ -23,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
@@ -127,15 +128,15 @@
 /*-----------------------------------------------------------*/\r
 \r
 /* Misc defines. */\r
-#define serINVALID_QUEUE                               ( ( xQueueHandle ) 0 )\r
-#define serNO_BLOCK                                            ( ( portTickType ) 0 )\r
-#define serTX_BLOCK_TIME                               ( 40 / portTICK_RATE_MS )\r
+#define serINVALID_QUEUE                               ( ( QueueHandle_t ) 0 )\r
+#define serNO_BLOCK                                            ( ( TickType_t ) 0 )\r
+#define serTX_BLOCK_TIME                               ( 40 / portTICK_PERIOD_MS )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to hold received characters. */\r
-static xQueueHandle xRxedChars = NULL;\r
-static xQueueHandle xCharsForTx = NULL;\r
+static QueueHandle_t xRxedChars = NULL;\r
+static QueueHandle_t xCharsForTx = NULL;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -194,7 +195,7 @@ xComPortHandle xReturn = ( xComPortHandle ) 0;
 }\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
        /* The port handle is not required as this driver only supports one port. */\r
        ( void ) pxPort;\r
@@ -212,7 +213,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedC
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned portSHORT usStringLength )\r
+void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength )\r
 {\r
 signed char *pxNext;\r
 \r
@@ -232,7 +233,7 @@ signed char *pxNext;
 }\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