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

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

diff --git a/FreeRTOS/Demo/PC/serial/serial.c b/FreeRTOS/Demo/PC/serial/serial.c
index 75976217a799fdef99e5b8dd5da0a8a328203c7e..28996feaea6cf86b8393ef7593d41ea9ea1378ae 100644 (file)
--- a/FreeRTOS/Demo/PC/serial/serial.c
+++ b/FreeRTOS/Demo/PC/serial/serial.c
@@ -6,7 +6,8 @@
 */\r
 \r
 /*\r
-    FreeRTOS V7.5.0 - 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
@@ -30,10 +31,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
@@ -219,8 +220,8 @@ typedef struct xCOM_PORT
        unsigned char ucInterruptEnableMast;\r
 \r
        /* Read/Write buffers. */\r
-       xQueueHandle xRxedChars; \r
-       xQueueHandle xCharsForTx;\r
+       QueueHandle_t xRxedChars; \r
+       QueueHandle_t xCharsForTx;\r
 \r
        /* This lot are set up to minimise CPU time where accessing the comm\r
        * port's registers.\r
@@ -242,7 +243,7 @@ typedef struct xCOM_PORT
 \r
        /* This semaphore does nothing useful except test a feature of the\r
        scheduler. */\r
-       xSemaphoreHandle xTestSem;\r
+       SemaphoreHandle_t xTestSem;\r
 \r
 } xComPort;\r
 \r
@@ -257,8 +258,8 @@ xComPort *xPortStatus[ serMAX_IRQs ] = { NULL, NULL, NULL, NULL, NULL, NULL, NUL
 /* These prototypes are repeated here so we don't have to include the serial header.  This allows\r
 the xComPortHandle structure details to be private to this file. */\r
 xComPortHandle xSerialPortInit( eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits, unsigned portBASE_TYPE uxBufferLength );\r
-portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime );\r
-portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime );\r
+portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, TickType_t xBlockTime );\r
+portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, TickType_t xBlockTime );\r
 portBASE_TYPE xSerialWaitForSemaphore( xComPortHandle xPort );\r
 \r
 static void prvSetupPortHardware( xComPort *pxPort, eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits );\r
@@ -606,7 +607,7 @@ extern void vComTestUnsuspendTask( void );
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime )\r
+portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, TickType_t xBlockTime )\r
 {\r
        /* Get the next character from the buffer, note that this routine is only \r
        called having checked that the is (at least) one to get */\r
@@ -621,7 +622,7 @@ portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickT
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime )\r
+portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, TickType_t xBlockTime )\r
 {\r
        if( xQueueSend( pxPort->xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )\r
        {\r
@@ -637,7 +638,7 @@ portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType
 void vSerialPutString( xComPortHandle pxPort, const char * const pcString, unsigned short usStringLength )\r
 {\r
 char * pcNextChar;\r
-const portTickType xNoBlock = ( portTickType ) 0;\r
+const TickType_t xNoBlock = ( TickType_t ) 0;\r
 \r
        /* Stop warnings. */\r
        ( void ) usStringLength;\r
@@ -653,7 +654,7 @@ const portTickType xNoBlock = ( portTickType ) 0;
 \r
 portBASE_TYPE xSerialWaitForSemaphore( xComPortHandle xPort )\r
 {\r
-const portTickType xBlockTime = ( portTickType ) 0xffff;\r
+const TickType_t xBlockTime = ( TickType_t ) 0xffff;\r
 \r
        /* This function does nothing interesting, but test the \r
        semaphore from ISR mechanism. */\r