Update the demo directory to use the version 8 type naming conventions.

[freertos] / FreeRTOS / Demo / Common / Minimal / PollQ.c

diff --git a/FreeRTOS/Demo/Common/Minimal/PollQ.c b/FreeRTOS/Demo/Common/Minimal/PollQ.c
index 18ce9e7d7b8a7769156d74868c378b6a6dc350a7..b0767755472e98f11e47a961a67cada95d8b2491 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/PollQ.c
+++ b/FreeRTOS/Demo/Common/Minimal/PollQ.c
@@ -90,7 +90,7 @@
 Changes from V2.0.0\r
 \r
        + Delay periods are now specified using variables and constants of\r
-         portTickType rather than unsigned long.\r
+         TickType_t rather than unsigned long.\r
 */\r
 \r
 #include <stdlib.h>\r
@@ -105,9 +105,9 @@ Changes from V2.0.0
 \r
 #define pollqSTACK_SIZE                        configMINIMAL_STACK_SIZE\r
 #define pollqQUEUE_SIZE                        ( 10 )\r
-#define pollqPRODUCER_DELAY            ( ( portTickType ) 200 / portTICK_RATE_MS )\r
-#define pollqCONSUMER_DELAY            ( pollqPRODUCER_DELAY - ( portTickType ) ( 20 / portTICK_RATE_MS ) )\r
-#define pollqNO_DELAY                  ( ( portTickType ) 0 )\r
+#define pollqPRODUCER_DELAY            ( ( TickType_t ) 200 / portTICK_PERIOD_MS )\r
+#define pollqCONSUMER_DELAY            ( pollqPRODUCER_DELAY - ( TickType_t ) ( 20 / portTICK_PERIOD_MS ) )\r
+#define pollqNO_DELAY                  ( ( TickType_t ) 0 )\r
 #define pollqVALUES_TO_PRODUCE ( ( signed portBASE_TYPE ) 3 )\r
 #define pollqINITIAL_VALUE             ( ( signed portBASE_TYPE ) 0 )\r
 \r
@@ -125,7 +125,7 @@ static volatile signed portBASE_TYPE xPollingConsumerCount = pollqINITIAL_VALUE,
 \r
 void vStartPolledQueueTasks( unsigned portBASE_TYPE uxPriority )\r
 {\r
-static xQueueHandle xPolledQueue;\r
+static QueueHandle_t xPolledQueue;\r
 \r
        /* Create the queue used by the producer and consumer. */\r
        xPolledQueue = xQueueCreate( pollqQUEUE_SIZE, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );\r
@@ -139,8 +139,8 @@ static xQueueHandle xPolledQueue;
        vQueueAddToRegistry( xPolledQueue, "Poll_Test_Queue" );\r
 \r
        /* Spawn the producer and consumer. */\r
-       xTaskCreate( vPolledQueueConsumer, "QConsNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( xTaskHandle * ) NULL );\r
-       xTaskCreate( vPolledQueueProducer, "QProdNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( xTaskHandle * ) NULL );\r
+       xTaskCreate( vPolledQueueConsumer, "QConsNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( TaskHandle_t * ) NULL );\r
+       xTaskCreate( vPolledQueueProducer, "QProdNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( TaskHandle_t * ) NULL );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -154,7 +154,7 @@ signed portBASE_TYPE xError = pdFALSE, xLoop;
                for( xLoop = 0; xLoop < pollqVALUES_TO_PRODUCE; xLoop++ )\r
                {\r
                        /* Send an incrementing number on the queue without blocking. */\r
-                       if( xQueueSend( *( ( xQueueHandle * ) pvParameters ), ( void * ) &usValue, pollqNO_DELAY ) != pdPASS )\r
+                       if( xQueueSend( *( ( QueueHandle_t * ) pvParameters ), ( void * ) &usValue, pollqNO_DELAY ) != pdPASS )\r
                        {\r
                                /* We should never find the queue full so if we get here there\r
                                has been an error. */\r
@@ -191,9 +191,9 @@ signed portBASE_TYPE xError = pdFALSE;
        for( ;; )\r
        {               \r
                /* Loop until the queue is empty. */\r
-               while( uxQueueMessagesWaiting( *( ( xQueueHandle * ) pvParameters ) ) )\r
+               while( uxQueueMessagesWaiting( *( ( QueueHandle_t * ) pvParameters ) ) )\r
                {\r
-                       if( xQueueReceive( *( ( xQueueHandle * ) pvParameters ), &usData, pollqNO_DELAY ) == pdPASS )\r
+                       if( xQueueReceive( *( ( QueueHandle_t * ) pvParameters ), &usData, pollqNO_DELAY ) == pdPASS )\r
                        {\r
                                if( usData != usExpectedValue )\r
                                {\r