Replace use of legacy portTYPE macros from old demos and standard demo files.

[freertos] / FreeRTOS / Demo / ColdFire_MCF5282_Eclipse / RTOSDemo / serial / serial.c

diff --git a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
index 58f234630d3daa99a2c00a7adf876e1d5b6532b4..756469a416f3a477da6b1be743c2b0b015d19371 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
+++ b/FreeRTOS/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
@@ -82,16 +82,16 @@ 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_OUTPUT           ( ( unsigned portCHAR ) 0x04 )\r
-#define serRX_INPUT                    ( ( unsigned portCHAR ) 0x08 )\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_OUTPUT           ( ( unsigned char ) 0x04 )\r
+#define serRX_INPUT                    ( ( unsigned char ) 0x08 )\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
@@ -108,13 +108,13 @@ void __attribute__( ( interrupt ) ) __cs3_isr_interrupt_78( void );
 \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
@@ -133,8 +133,8 @@ const unsigned portLONG ulBaudRateDivisor = ( configCPU_CLOCK_HZ / ( 32UL * ulWa
        MCF_UART1_UMR2 = ser1STOP_BIT;\r
        MCF_UART1_UCSR = serSYSTEM_CLOCK;\r
 \r
-       MCF_UART1_UBG1 = ( unsigned portCHAR ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );\r
-       MCF_UART1_UBG2 = ( unsigned portCHAR ) ( ulBaudRateDivisor & 0xffUL );\r
+       MCF_UART1_UBG1 = ( unsigned char ) ( ( ulBaudRateDivisor >> 8UL ) & 0xffUL );\r
+       MCF_UART1_UBG2 = ( unsigned char ) ( ulBaudRateDivisor & 0xffUL );\r
 \r
        /* Turn it on. */\r
        MCF_UART1_UCR = serTX_ENABLE | serRX_ENABLE;\r
@@ -152,7 +152,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
@@ -170,7 +170,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
@@ -201,7 +201,7 @@ void vSerialClose( xComPortHandle xPort )
 \r
 void __cs3_isr_interrupt_78( void )\r
 {\r
-unsigned portCHAR ucChar;\r
+unsigned char ucChar;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE, xDoneSomething = pdTRUE;\r
 \r
        while( xDoneSomething != pdFALSE )\r