Change version numbers ready for V8.0.0 release candidate 1 tag.

[freertos] / FreeRTOS / Demo / ColdFire_MCF52221_CodeWarrior / sources / serial / serial.c

diff --git a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c
index db478661e591586e850e054a3a702575667e4a67..4bf71606eed6f725a8664f89c2984346a790eb28 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c
+++ b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/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
@@ -82,14 +82,14 @@ an example of an efficient driver. */
 #include "serial.h"\r
 \r
 /* Hardware definitions. */\r
-#define serNO_PARITY           ( ( unsigned portCHAR ) 0x02 << 3 )\r
-#define ser8DATA_BITS          ( ( unsigned portCHAR ) 0x03 )\r
-#define ser1STOP_BIT           ( ( unsigned portCHAR ) 0x07 )\r
-#define serSYSTEM_CLOCK                ( ( unsigned portCHAR ) 0xdd )\r
-#define serTX_ENABLE           ( ( unsigned portCHAR ) 0x04 )\r
-#define serRX_ENABLE           ( ( unsigned portCHAR ) 0x01 )\r
-#define serTX_INT                      ( ( unsigned portCHAR ) 0x01 )\r
-#define serRX_INT                      ( ( unsigned portCHAR ) 0x02 )\r
+#define serNO_PARITY           ( ( unsigned char ) 0x02 << 3 )\r
+#define ser8DATA_BITS          ( ( unsigned char ) 0x03 )\r
+#define ser1STOP_BIT           ( ( unsigned char ) 0x07 )\r
+#define serSYSTEM_CLOCK                ( ( unsigned char ) 0xdd )\r
+#define serTX_ENABLE           ( ( unsigned char ) 0x04 )\r
+#define serRX_ENABLE           ( ( unsigned char ) 0x01 )\r
+#define serTX_INT                      ( ( unsigned char ) 0x01 )\r
+#define serRX_INT                      ( ( unsigned char ) 0x02 )\r
 \r
 \r
 /* The queues used to communicate between tasks and ISR's. */\r
@@ -101,13 +101,13 @@ static portBASE_TYPE xTxHasEnded = pdTRUE;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
 {\r
-const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) );\r
+const unsigned long ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWantedBaud ) );\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
        xTxHasEnded = pdTRUE;\r
 \r
@@ -127,8 +127,8 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa
        MCF_UART0_UMR2 = ser1STOP_BIT;\r
        MCF_UART0_UCSR = serSYSTEM_CLOCK;\r
 \r
-       MCF_UART0_UBG1 = ( unsigned portCHAR ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );\r
-       MCF_UART0_UBG2 = ( unsigned portCHAR ) ( ulBaudRateDivisor & 0xffUL );\r
+       MCF_UART0_UBG1 = ( unsigned char ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );\r
+       MCF_UART0_UBG2 = ( unsigned char ) ( ulBaudRateDivisor & 0xffUL );\r
 \r
        /* Turn it on. */\r
        MCF_UART0_UCR = serTX_ENABLE | serRX_ENABLE;\r
@@ -146,7 +146,7 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )\r
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )\r
 {\r
        /* Only one port is supported. */\r
        ( void ) pxPort;\r
@@ -164,7 +164,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, portTickType xBlockTime )\r
 {\r
        /* Only one port is supported. */\r
        ( void ) pxPort;\r
@@ -195,7 +195,7 @@ void vSerialClose( xComPortHandle xPort )
 \r
 __declspec(interrupt:0) void vUART0InterruptHandler( void )\r
 {\r
-unsigned portCHAR ucChar;\r
+unsigned char ucChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, xDoneSomething = pdTRUE;\r
 \r
        while( xDoneSomething != pdFALSE )\r