Update version number to 8.1.1 for patch release that re-enables mutexes to be given...

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

diff --git a/FreeRTOS/Demo/Common/Full/PollQ.c b/FreeRTOS/Demo/Common/Full/PollQ.c
index 2344c763b777eba6763c80604ee7db410f6d85b8..f57c93ae3eba0f6b2990a9ae3510ed8e375b796a 100644 (file)
--- a/FreeRTOS/Demo/Common/Full/PollQ.c
+++ b/FreeRTOS/Demo/Common/Full/PollQ.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.1 - Copyright (C) 2014 Real Time Engineers Ltd. \r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -94,7 +94,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
@@ -122,7 +122,7 @@ static volatile short sPollingConsumerCount = 0, sPollingProducerCount = 0;
 \r
 void vStartPolledQueueTasks( unsigned portBASE_TYPE uxPriority )\r
 {\r
-static xQueueHandle xPolledQueue;\r
+static QueueHandle_t xPolledQueue;\r
 const unsigned portBASE_TYPE uxQueueSize = 10;\r
 \r
        /* Create the queue used by the producer and consumer. */\r
@@ -137,8 +137,8 @@ const unsigned portBASE_TYPE uxQueueSize = 10;
 static void vPolledQueueProducer( void *pvParameters )\r
 {\r
 unsigned short usValue = 0, usLoop;\r
-xQueueHandle *pxQueue;\r
-const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS;\r
+QueueHandle_t *pxQueue;\r
+const TickType_t xDelay = ( TickType_t ) 200 / portTICK_PERIOD_MS;\r
 const unsigned short usNumToProduce = 3;\r
 const char * const pcTaskStartMsg = "Polled queue producer started.\r\n";\r
 const char * const pcTaskErrorMsg = "Could not post on polled queue.\r\n";\r
@@ -148,14 +148,14 @@ short sError = pdFALSE;
        vPrintDisplayMessage( &pcTaskStartMsg );\r
 \r
        /* The queue being used is passed in as the parameter. */\r
-       pxQueue = ( xQueueHandle * ) pvParameters;\r
+       pxQueue = ( QueueHandle_t * ) pvParameters;\r
 \r
        for( ;; )\r
        {               \r
                for( usLoop = 0; usLoop < usNumToProduce; ++usLoop )\r
                {\r
                        /* Send an incrementing number on the queue without blocking. */\r
-                       if( xQueueSendToBack( *pxQueue, ( void * ) &usValue, ( portTickType ) 0 ) != pdPASS )\r
+                       if( xQueueSendToBack( *pxQueue, ( void * ) &usValue, ( TickType_t ) 0 ) != pdPASS )\r
                        {\r
                                /* We should never find the queue full - this is an error. */\r
                                vPrintDisplayMessage( &pcTaskErrorMsg );\r
@@ -185,8 +185,8 @@ short sError = pdFALSE;
 static void vPolledQueueConsumer( void *pvParameters )\r
 {\r
 unsigned short usData, usExpectedValue = 0;\r
-xQueueHandle *pxQueue;\r
-const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS;\r
+QueueHandle_t *pxQueue;\r
+const TickType_t xDelay = ( TickType_t ) 200 / portTICK_PERIOD_MS;\r
 const char * const pcTaskStartMsg = "Polled queue consumer started.\r\n";\r
 const char * const pcTaskErrorMsg = "Incorrect value received on polled queue.\r\n";\r
 short sError = pdFALSE;\r
@@ -195,14 +195,14 @@ short sError = pdFALSE;
        vPrintDisplayMessage( &pcTaskStartMsg );\r
 \r
        /* The queue being used is passed in as the parameter. */\r
-       pxQueue = ( xQueueHandle * ) pvParameters;\r
+       pxQueue = ( QueueHandle_t * ) pvParameters;\r
 \r
        for( ;; )\r
        {               \r
                /* Loop until the queue is empty. */\r
                while( uxQueueMessagesWaiting( *pxQueue ) )\r
                {\r
-                       if( xQueueReceive( *pxQueue, &usData, ( portTickType ) 0 ) == pdPASS )\r
+                       if( xQueueReceive( *pxQueue, &usData, ( TickType_t ) 0 ) == pdPASS )\r
                        {\r
                                if( usData != usExpectedValue )\r
                                {\r