Update the demo directory to use the version 8 type naming conventions.

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

diff --git a/FreeRTOS/Demo/Flshlite/serial/serial.c b/FreeRTOS/Demo/Flshlite/serial/serial.c
index 6ee4054fbbb341c400a6a81483246cd015193a94..589e75261a669f4cb9311760108ace3e0a2508d2 100644 (file)
--- a/FreeRTOS/Demo/Flshlite/serial/serial.c
+++ b/FreeRTOS/Demo/Flshlite/serial/serial.c
@@ -95,7 +95,7 @@ Changes from V1.2.5
 \r
 Changes from V2.0.0\r
 \r
-       + Use portTickType in place of unsigned pdLONG for delay periods.\r
+       + Use TickType_t in place of unsigned pdLONG for delay periods.\r
        + Slightly more efficient vSerialSendString() implementation.\r
        + cQueueReieveFromISR() used in place of xQueueReceive() in ISR.\r
 */\r
@@ -140,7 +140,7 @@ Changes from V2.0.0
 #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
@@ -235,12 +235,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
@@ -255,8 +255,8 @@ typedef xComPort * xComPortHandle;
 /* 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
@@ -385,7 +385,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
@@ -400,7 +400,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
@@ -415,7 +415,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