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

[freertos] / FreeRTOS / Demo / MB96340_Softune / FreeRTOS_96348hs_SK16FX100PMC / Src / serial / serial.c

diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
index 2c29cde9fc7eb9729aafc77834044ffb140fc91c..16e16c7d18ee0ce4b4172e5d791ddae0d89d6041 100644 (file)
--- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
+++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.5.3 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.0.0:rc1 - 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
@@ -80,24 +80,24 @@
 #include "serial.h"\r
 \r
 /* The queue used to hold received characters. */\r
-static xQueueHandle                    xRxedChars;\r
+static QueueHandle_t                   xRxedChars;\r
 \r
 /* The queue used to hold characters waiting transmission. */\r
-static xQueueHandle                    xCharsForTx;\r
+static QueueHandle_t                   xCharsForTx;\r
 \r
-static volatile portSHORT      sTHREEmpty;\r
+static volatile short  sTHREEmpty;\r
 \r
-static volatile portSHORT      queueFail = pdFALSE;\r
+static volatile short  queueFail = pdFALSE;\r
 \r
 /*-----------------------------------------------------------*/\r
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
 {\r
        /* Initialise the hardware. */\r
        portENTER_CRITICAL();\r
        {\r
                /* Create the queues used by the com test task. */\r
-               xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed portCHAR) );\r
-               xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed portCHAR) );\r
+               xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed char) );\r
+               xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed char) );\r
 \r
                if( xRxedChars == 0 )\r
                {\r
@@ -129,7 +129,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime )\r
 {\r
        /* Get the next character from the buffer.  Return false if no characters\r
        are available, or arrive before xBlockTime expires. */\r
@@ -144,7 +144,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime )\r
 {\r
 signed portBASE_TYPE   xReturn;\r
 \r
@@ -199,7 +199,7 @@ signed portBASE_TYPE        xReturn;
  */\r
 __interrupt void UART0_RxISR( void )\r
 {\r
-volatile signed portCHAR       cChar;\r
+volatile signed char   cChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* Get the character from the UART and post it on the queue of Rxed \r
@@ -223,7 +223,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
  */\r
 __interrupt void UART0_TxISR( void )\r
 {\r
-signed portCHAR                        cChar;\r
+signed char                    cChar;\r
 signed portBASE_TYPE   xTaskWoken = pdFALSE;\r
 \r
        /* The previous character has been transmitted.  See if there are any\r