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

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

diff --git a/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c b/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
index d00bfb64faf132204e68a0c6bcdec2ed3bf11fcc..3f92012effd4ce6d9a4e0b1c038087cfd6fb8262 100644 (file)
--- a/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
+++ b/FreeRTOS/Demo/ARM7_LPC2129_Keil_RVDS/serial/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
@@ -99,9 +100,9 @@
 #define serU1VIC_ENABLE                                        ( ( unsigned long ) 0x0020 )\r
 \r
 /* Misc. */\r
-#define serINVALID_QUEUE                               ( ( xQueueHandle ) 0 )\r
+#define serINVALID_QUEUE                               ( ( QueueHandle_t ) 0 )\r
 #define serHANDLE                                              ( ( xComPortHandle ) 1 )\r
-#define serNO_BLOCK                                            ( ( portTickType ) 0 )\r
+#define serNO_BLOCK                                            ( ( TickType_t ) 0 )\r
 \r
 /* Constant to access the VIC. */\r
 #define serCLEAR_VIC_INTERRUPT                 ( ( unsigned long ) 0 )\r
@@ -130,8 +131,8 @@ void vUART_ISRHandler( void );
 \r
 /* Queues used to hold received characters, and characters waiting to be\r
 transmitted. */\r
-static xQueueHandle xRxedChars; \r
-static xQueueHandle xCharsForTx; \r
+static QueueHandle_t xRxedChars; \r
+static QueueHandle_t xCharsForTx; \r
 \r
 /* Communication flag between the interrupt service routine and serial API. */\r
 static volatile long lTHREEmpty;\r
@@ -196,7 +197,7 @@ xComPortHandle xReturn = serHANDLE;
 }\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 UART0. */\r
        ( void ) pxPort;\r
@@ -235,7 +236,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