Correct an err in queue.c introduced when previously updating behaviour when queue...

[freertos] / FreeRTOS / Demo / CORTEX_A9_Zynq_ZC702 / RTOSDemo / src / Full_Demo / main_full.c

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c
index 9c13342698e65fcd96b2fad33ac990e2ffe97790..3200bf6a64a795cd1d56a669b84047f4f33eeb87 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c
@@ -114,6 +114,7 @@
 #include "StreamBufferDemo.h"\r
 #include "StreamBufferInterrupt.h"\r
 #include "MessageBufferAMP.h"\r
+#include "QueueSet.h"\r
 \r
 \r
 /* Priorities for the demo application tasks. */\r
@@ -233,6 +234,12 @@ void main_full( void )
        vStartStreamBufferInterruptDemo();\r
        vStartMessageBufferAMPTasks( mainMESSAGE_BUFFER_STACK_SIZE );\r
 \r
+       #if( configUSE_QUEUE_SETS == 1 )\r
+       {\r
+               vStartQueueSetTasks();\r
+       }\r
+       #endif\r
+\r
        /* Start the tasks that implements the command console on the UART, as\r
        described above. */\r
        vUARTCommandConsoleStart( mainUART_COMMAND_CONSOLE_STACK_SIZE, mainUART_COMMAND_CONSOLE_TASK_PRIORITY );\r
@@ -403,17 +410,26 @@ unsigned long ulErrorFound = pdFALSE;
                        ulErrorFound |= 1UL << 20UL;\r
                }\r
 \r
+               #if( configUSE_QUEUE_SETS == 1 )\r
+               {\r
+                       if( xAreQueueSetTasksStillRunning() != pdPASS )\r
+                       {\r
+                               ulErrorFound |= 1UL << 21UL;\r
+                       }\r
+               }\r
+               #endif\r
+\r
                /* Check that the register test 1 task is still running. */\r
                if( ulLastRegTest1Value == ulRegTest1LoopCounter )\r
                {\r
-                       ulErrorFound |= 1UL << 21UL;\r
+                       ulErrorFound |= 1UL << 22UL;\r
                }\r
                ulLastRegTest1Value = ulRegTest1LoopCounter;\r
 \r
                /* Check that the register test 2 task is still running. */\r
                if( ulLastRegTest2Value == ulRegTest2LoopCounter )\r
                {\r
-                       ulErrorFound |= 1UL << 22UL;\r
+                       ulErrorFound |= 1UL << 23UL;\r
                }\r
                ulLastRegTest2Value = ulRegTest2LoopCounter;\r
 \r