Update version number to 8.1.1 for patch release that re-enables mutexes to be given...

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

diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c
index 30b1323fb81181ebc4e0e3e4cd82c73b3b5ed53a..edaf89ea09c227bafe9ddc0a7445de9b7c511302 100644 (file)
--- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c
+++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.1 - 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
@@ -103,7 +104,7 @@
 #define serCLEAR_ALL_STATUS_BITS       ( ( unsigned short ) 0x00 )\r
 #define serINTERRUPT_PRIORITY          ( ( unsigned short ) 0x01 ) /*< Just below the scheduler priority. */\r
 \r
-#define serDONT_BLOCK                          ( ( portTickType ) 0 )\r
+#define serDONT_BLOCK                          ( ( TickType_t ) 0 )\r
 \r
 typedef enum\r
 { \r
@@ -175,12 +176,12 @@ typedef struct xCOM_PORT
        unsigned short usIRQVector;\r
 \r
        /* Queues used for communications with com test task. */\r
-       xQueueHandle xRxedChars; \r
-       xQueueHandle xCharsForTx;\r
+       QueueHandle_t xRxedChars; \r
+       QueueHandle_t xCharsForTx;\r
 \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
@@ -200,8 +201,8 @@ static unsigned long prvBaud( eBaud eWantedBaud );
 /* 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
 void vSerialClose( xComPortHandle xPort );\r
 short sSerialWaitForSemaphore( xComPortHandle xPort );\r
 /*-----------------------------------------------------------*/\r
@@ -358,7 +359,7 @@ char *pcNextChar;
 }\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
@@ -373,7 +374,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
@@ -388,7 +389,7 @@ portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType
 \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