Ensure demo app files are using FreeRTOS V8 names - a few were missed previously.

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

diff --git a/FreeRTOS/Demo/Common/Minimal/QPeek.c b/FreeRTOS/Demo/Common/Minimal/QPeek.c
index ae9f968f970b0df5c459e0c2af6b234ece1f34d4..c5863c444c3ce4c7b8198eeae1308d48624424fe 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/QPeek.c
+++ b/FreeRTOS/Demo/Common/Minimal/QPeek.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.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
@@ -106,22 +106,22 @@ static void prvHighestPriorityPeekTask( void *pvParameters );
 \r
 /* Flag that will be latched to pdTRUE should any unexpected behaviour be\r
 detected in any of the tasks. */\r
-static volatile portBASE_TYPE xErrorDetected = pdFALSE;\r
+static volatile BaseType_t xErrorDetected = pdFALSE;\r
 \r
 /* Counter that is incremented on each cycle of a test.  This is used to\r
 detect a stalled task - a test that is no longer running. */\r
-static volatile unsigned long ulLoopCounter = 0;\r
+static volatile uint32_t ulLoopCounter = 0;\r
 \r
 /* Handles to the test tasks. */\r
-xTaskHandle xMediumPriorityTask, xHighPriorityTask, xHighestPriorityTask;\r
+TaskHandle_t xMediumPriorityTask, xHighPriorityTask, xHighestPriorityTask;\r
 /*-----------------------------------------------------------*/\r
 \r
 void vStartQueuePeekTasks( void )\r
 {\r
-xQueueHandle xQueue;\r
+QueueHandle_t xQueue;\r
 \r
        /* Create the queue that we are going to use for the test/demo. */\r
-       xQueue = xQueueCreate( qpeekQUEUE_LENGTH, sizeof( unsigned long ) );\r
+       xQueue = xQueueCreate( qpeekQUEUE_LENGTH, sizeof( uint32_t ) );\r
 \r
        /* vQueueAddToRegistry() adds the queue to the queue registry, if one is\r
        in use.  The queue registry is provided as a means for kernel aware\r
@@ -143,8 +143,8 @@ xQueueHandle xQueue;
 \r
 static void prvHighestPriorityPeekTask( void *pvParameters )\r
 {\r
-xQueueHandle xQueue = ( xQueueHandle ) pvParameters;\r
-unsigned long ulValue;\r
+QueueHandle_t xQueue = ( QueueHandle_t ) pvParameters;\r
+uint32_t ulValue;\r
 \r
        #ifdef USE_STDIO\r
        {\r
@@ -252,8 +252,8 @@ unsigned long ulValue;
 \r
 static void prvHighPriorityPeekTask( void *pvParameters )\r
 {\r
-xQueueHandle xQueue = ( xQueueHandle ) pvParameters;\r
-unsigned long ulValue;\r
+QueueHandle_t xQueue = ( QueueHandle_t ) pvParameters;\r
+uint32_t ulValue;\r
 \r
        for( ;; )\r
        {\r
@@ -307,8 +307,8 @@ unsigned long ulValue;
 \r
 static void prvMediumPriorityPeekTask( void *pvParameters )\r
 {\r
-xQueueHandle xQueue = ( xQueueHandle ) pvParameters;\r
-unsigned long ulValue;\r
+QueueHandle_t xQueue = ( QueueHandle_t ) pvParameters;\r
+uint32_t ulValue;\r
 \r
        for( ;; )\r
        {\r
@@ -348,8 +348,8 @@ unsigned long ulValue;
 \r
 static void prvLowPriorityPeekTask( void *pvParameters )\r
 {\r
-xQueueHandle xQueue = ( xQueueHandle ) pvParameters;\r
-unsigned long ulValue;\r
+QueueHandle_t xQueue = ( QueueHandle_t ) pvParameters;\r
+uint32_t ulValue;\r
 \r
        for( ;; )\r
        {\r
@@ -453,9 +453,9 @@ unsigned long ulValue;
 /*-----------------------------------------------------------*/\r
 \r
 /* This is called to check that all the created tasks are still running. */\r
-portBASE_TYPE xAreQueuePeekTasksStillRunning( void )\r
+BaseType_t xAreQueuePeekTasksStillRunning( void )\r
 {\r
-static unsigned long ulLastLoopCounter = 0;\r
+static uint32_t ulLastLoopCounter = 0;\r
 \r
        /* If the demo task is still running then we expect the loopcounter to\r
        have incremented since this function was last called. */\r
@@ -469,6 +469,6 @@ static unsigned long ulLastLoopCounter = 0;
        /* Errors detected in the task itself will have latched xErrorDetected\r
        to true. */\r
 \r
-       return !xErrorDetected;\r
+       return ( BaseType_t ) !xErrorDetected;\r
 }\r
 \r