X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=FreeRTOS%2FDemo%2Fmsp430_IAR%2Fserial%2Fserial.c;h=e1e434b2e23a5e052c72ca11096bf3c0ab9c4f3a;hb=4441dfe80ba8985120b03011669248c16341c033;hp=420294dfcf4516000d6a5261d7dfb58fde8740c6;hpb=b64f63efd1feb40e0ee2d41e041dacc305a7ad82;p=freertos diff --git a/FreeRTOS/Demo/msp430_IAR/serial/serial.c b/FreeRTOS/Demo/msp430_IAR/serial/serial.c index 420294dfc..e1e434b2e 100644 --- a/FreeRTOS/Demo/msp430_IAR/serial/serial.c +++ b/FreeRTOS/Demo/msp430_IAR/serial/serial.c @@ -84,16 +84,16 @@ #define serTX_AND_RX ( ( unsigned char ) 0x03 ) /* Misc. constants. */ -#define serNO_BLOCK ( ( portTickType ) 0 ) +#define serNO_BLOCK ( ( TickType_t ) 0 ) /* Enable the UART Tx interrupt. */ #define vInterruptOn() IFG2 |= UTXIFG1 /* The queue used to hold received characters. */ -static xQueueHandle xRxedChars; +static QueueHandle_t xRxedChars; /* The queue used to hold characters waiting transmission. */ -static xQueueHandle xCharsForTx; +static QueueHandle_t xCharsForTx; static volatile short sTHREEmpty; @@ -153,7 +153,7 @@ unsigned long ulBaudRateCount; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime ) { /* Get the next character from the buffer. Return false if no characters are available, or arrive before xBlockTime expires. */ @@ -168,7 +168,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedC } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime ) { signed portBASE_TYPE xReturn;