diff options
| author | rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2014-02-11 12:04:59 +0000 |
|---|---|---|
| committer | rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2014-02-11 12:04:59 +0000 |
| commit | 012a7c9b61ece5aec5c3a98e728e59fdcc9329ae (patch) | |
| tree | 602a4c29560a57b40068e082bdd770d46aba2b2b /FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c | |
| parent | 284b2ecc28ff3da5a1bde899ace6304998ca5ec7 (diff) | |
| download | freertos-012a7c9b61ece5aec5c3a98e728e59fdcc9329ae.tar.gz | |
Update the demo directory to use the version 8 type naming conventions.
git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2202 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
Diffstat (limited to 'FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c')
| -rw-r--r-- | FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c b/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c index d835777e2..3ebc9b2fd 100644 --- a/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c +++ b/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c @@ -88,17 +88,17 @@ #define vInterruptOff() AT91F_US_DisableIt( serCOM0, AT91C_US_TXRDY )
/* Misc constants. */
-#define serINVALID_QUEUE ( ( xQueueHandle ) 0 )
+#define serINVALID_QUEUE ( ( QueueHandle_t ) 0 )
#define serHANDLE ( ( xComPortHandle ) 1 )
-#define serNO_BLOCK ( ( portTickType ) 0 )
+#define serNO_BLOCK ( ( TickType_t ) 0 )
#define serNO_TIMEGUARD ( ( unsigned long ) 0 )
#define serNO_PERIPHERAL_B_SETUP ( ( unsigned long ) 0 )
/* Queues used to hold received characters, and characters waiting to be
transmitted. */
-static xQueueHandle xRxedChars;
-static xQueueHandle xCharsForTx;
+static QueueHandle_t xRxedChars;
+static QueueHandle_t xCharsForTx;
/*-----------------------------------------------------------*/
@@ -160,7 +160,7 @@ extern void ( vUART_ISR )( void ); }
/*-----------------------------------------------------------*/
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime )
{
/* The port handle is not required as this driver only supports one port. */
( void ) pxPort;
@@ -202,7 +202,7 @@ signed char *pxNext; }
/*-----------------------------------------------------------*/
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime )
{
/* Place the character in the queue of characters to be transmitted. */
if( xQueueSend( xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )
|