Get the trace utility and co-routines working.

[freertos] / Demo / MB91460_Softune / SRC / main.c

diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c
index 9ec92d97c9754c078e7243e7716b5a455e2110c2..ddb26fdb54e737ad069d911c8d0ffbb1d29caa05 100644 (file)
--- a/Demo/MB91460_Softune/SRC/main.c
+++ b/Demo/MB91460_Softune/SRC/main.c
@@ -83,7 +83,6 @@
 #include "flash.h"\r
 #include "integer.h"\r
 #include "comtest2.h"\r
-#include "PollQ.h"\r
 #include "semtest.h"\r
 #include "BlockQ.h"\r
 #include "dynamic.h"\r
@@ -94,14 +93,14 @@
 #include "death.h"\r
 #include "taskutility.h"\r
 #include "partest.h"\r
+#include "crflash.h"\r
        \r
 /* Demo task priorities. */\r
 #define mainWATCHDOG_TASK_PRIORITY             ( tskIDLE_PRIORITY + 5 )\r
 #define mainCHECK_TASK_PRIORITY                        ( tskIDLE_PRIORITY + 4 )\r
-#define mainUTILITY_TASK_PRIORITY              ( tskIDLE_PRIORITY + 3 )\r
+#define mainUTILITY_TASK_PRIORITY              ( tskIDLE_PRIORITY )\r
 #define mainSEM_TEST_PRIORITY                  ( tskIDLE_PRIORITY + 3 )\r
 #define mainCOM_TEST_PRIORITY                  ( tskIDLE_PRIORITY + 2 )\r
-#define mainQUEUE_POLL_PRIORITY                        ( tskIDLE_PRIORITY + 2 )\r
 #define mainQUEUE_BLOCK_PRIORITY               ( tskIDLE_PRIORITY + 2 )\r
 #define mainDEATH_PRIORITY                             ( tskIDLE_PRIORITY + 1 )\r
 #define mainLED_TASK_PRIORITY                  ( tskIDLE_PRIORITY + 1 )\r
@@ -130,6 +129,9 @@ LCD represent LEDs]*/
 /* The number of interrupt levels to use. */\r
 #define mainINTERRUPT_LEVELS   ( 31 )\r
 \r
+/* The number of 'flash' co-routines to create - each toggles a different LED. */\r
+#define mainNUM_FLASH_CO_ROUTINES      ( 8 )\r
+\r
 /*---------------------------------------------------------------------------*/\r
 \r
 /* \r
@@ -176,7 +178,6 @@ void main(void)
        vStartLEDFlashTasks( mainLED_TASK_PRIORITY );   \r
        vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED - 1 );\r
-       vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
        vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
        vStartBlockingQueueTasks ( mainQUEUE_BLOCK_PRIORITY );  \r
        vStartDynamicPriorityTasks();   \r
@@ -184,6 +185,7 @@ void main(void)
        vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );\r
        vStartQueuePeekTasks();\r
        vCreateBlockTimeTasks();\r
+       vStartFlashCoRoutines( mainNUM_FLASH_CO_ROUTINES );\r
 \r
        /* Start the 'Check' task which is defined in this file. */\r
        xTaskCreate( prvErrorChecks, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );    \r
@@ -264,11 +266,6 @@ portBASE_TYPE lReturn = pdPASS;
                lReturn = pdFAIL;\r
        }\r
 \r
-       if( xArePollingQueuesStillRunning() != pdTRUE )\r
-       {\r
-               lReturn = pdFAIL;\r
-       }\r
-\r
        if( xAreComTestTasksStillRunning() != pdTRUE )\r
        {\r
                lReturn = pdFAIL;\r
@@ -353,6 +350,8 @@ static void prvSetupHardware( void )
                #if WATCHDOG == WTC_IN_IDLE\r
                        Kick_Watchdog();\r
                #endif\r
+\r
+               vCoRoutineSchedule();\r
        }\r
 #else\r
        #if WATCHDOG == WTC_IN_IDLE\r