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

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

diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c
index 59a8cd0da2c8172ba45c299fbe6f04e17f499b06..ecf12fdf18eb522a0fbcacf7adf68e3f635c92a9 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c
+++ b/FreeRTOS/Demo/CORTEX_STM32F103_Keil/serial/serial.c
@@ -100,7 +100,7 @@ void vUARTInterruptHandler( void );
 /*\r
  * See the serial2.h header file.\r
  */\r
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )\r
 {\r
 xComPortHandle xReturn;\r
 USART_InitTypeDef USART_InitStructure;\r
@@ -108,8 +108,8 @@ NVIC_InitTypeDef NVIC_InitStructure;
 GPIO_InitTypeDef GPIO_InitStructure;\r
 \r
        /* Create the queues used to hold Rx/Tx characters. */\r
-       xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
-       xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
+       xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );\r
+       xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) );\r
        \r
        /* If the queue/semaphore was created correctly then setup the serial port\r
        hardware. */\r
@@ -163,7 +163,7 @@ GPIO_InitTypeDef GPIO_InitStructure;
 }\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
        /* The port handle is not required as this driver only supports one port. */\r
        ( void ) pxPort;\r
@@ -181,9 +181,9 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength )\r
+void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength )\r
 {\r
-signed portCHAR *pxNext;\r
+signed char *pxNext;\r
 \r
        /* A couple of parameters that this port does not use. */\r
        ( void ) usStringLength;\r
@@ -196,7 +196,7 @@ signed portCHAR *pxNext;
        ( void ) pxPort;\r
 \r
        /* Send each character in the string, one at a time. */\r
-       pxNext = ( signed portCHAR * ) pcString;\r
+       pxNext = ( signed char * ) pcString;\r
        while( *pxNext )\r
        {\r
                xSerialPutChar( pxPort, *pxNext, serNO_BLOCK );\r
@@ -205,7 +205,7 @@ signed portCHAR *pxNext;
 }\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
 signed portBASE_TYPE xReturn;\r
 \r
@@ -232,7 +232,7 @@ void vSerialClose( xComPortHandle xPort )
 void vUARTInterruptHandler( void )\r
 {\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
-portCHAR cChar;\r
+char cChar;\r
 \r
        if( USART_GetITStatus( USART1, USART_IT_TXE ) == SET )\r
        {\r