Added GCC project to the CEC1302 demo.

[freertos] / FreeRTOS / Demo / CORTEX_M4F_CEC1302_Keil / main_full / main_full.c

diff --git a/FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/main_full/main_full.c b/FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/main_full/main_full.c
index 2e18a2d1936d5241ba66ba03c7231577b74e179f..a2deb7adc959fa8c0baaed422388a9773dff9733 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/main_full/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/main_full/main_full.c
@@ -121,11 +121,9 @@
 #include "flop.h"\r
 #include "semtest.h"\r
 #include "dynamic.h"\r
-#include "BlockQ.h"\r
 #include "blocktim.h"\r
 #include "countsem.h"\r
 #include "GenQTest.h"\r
-#include "recmutex.h"\r
 #include "death.h"\r
 #include "TimerDemo.h"\r
 #include "IntQueue.h"\r
@@ -142,15 +140,15 @@
 /* A block time of zero simply means "don't block". */\r
 #define mainDONT_BLOCK                                         ( 0UL )\r
 \r
-/* The period after which the check timer will expire, in ms, provided no errors\r
-have been reported by any of the standard demo tasks.  ms are converted to the\r
-equivalent in ticks using the portTICK_PERIOD_MS constant. */\r
-#define mainNO_ERROR_CHECK_TASK_PERIOD         ( 3000UL / portTICK_PERIOD_MS )\r
+/* The period of the check task, in ms, provided no errors have been reported by\r
+any of the standard demo tasks.  ms are converted to the equivalent in ticks\r
+using the pdMS_TO_TICKS() macro constant. */\r
+#define mainNO_ERROR_CHECK_TASK_PERIOD         pdMS_TO_TICKS( 3000UL )\r
 \r
-/* The period at which the check timer will expire, in ms, if an error has been\r
-reported in one of the standard demo tasks.  ms are converted to the equivalent\r
-in ticks using the portTICK_PERIOD_MS constant. */\r
-#define mainERROR_CHECK_TASK_PERIOD            ( 200UL / portTICK_PERIOD_MS )\r
+/* The period of the check task, in ms, if an error has been reported in one of\r
+the standard demo tasks.  ms are converted to the equivalent in ticks using the\r
+pdMS_TO_TICKS() macro. */\r
+#define mainERROR_CHECK_TASK_PERIOD            pdMS_TO_TICKS( 200UL )\r
 \r
 /* Parameters that are passed into the register check tasks solely for the\r
 purpose of ensuring parameters are passed into tasks correctly. */\r
@@ -216,11 +214,9 @@ void main_full( void )
        functionality, but do demonstrate how to use the FreeRTOS API and test the\r
        kernel port. */\r
        vStartDynamicPriorityTasks();\r
-       vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
        vCreateBlockTimeTasks();\r
        vStartCountingSemaphoreTasks();\r
        vStartGenericQueueTasks( tskIDLE_PRIORITY );\r
-       vStartRecursiveMutexTasks();\r
        vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
        vStartMathTasks( mainFLOP_TASK_PRIORITY );\r
        vStartTimerDemoTask( mainTIMER_TEST_PERIOD );\r
@@ -296,11 +292,6 @@ unsigned long ulErrorFound = pdFALSE;
                        ulErrorFound = 1UL << 2UL;\r
                }\r
 \r
-               if( xAreBlockingQueuesStillRunning() != pdTRUE )\r
-               {\r
-                       ulErrorFound = 1UL << 3UL;\r
-               }\r
-\r
                if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )\r
                {\r
                        ulErrorFound = 1UL << 4UL;\r
@@ -311,11 +302,6 @@ unsigned long ulErrorFound = pdFALSE;
                        ulErrorFound = 1UL << 5UL;\r
                }\r
 \r
-               if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )\r
-               {\r
-                       ulErrorFound = 1UL << 6UL;\r
-               }\r
-\r
                if( xIsCreateTaskStillRunning() != pdTRUE )\r
                {\r
                        ulErrorFound = 1UL << 7UL;\r
@@ -375,7 +361,7 @@ unsigned long ulErrorFound = pdFALSE;
                }\r
 \r
                configASSERT( ulErrorFound == pdFALSE );\r
-               \r
+\r
                /* Just testing the xPortIsInsideInterrupt() functionality. */\r
                configASSERT( xPortIsInsideInterrupt() == pdFALSE );\r
        }\r
@@ -394,7 +380,7 @@ static void prvRegTestTaskEntry1( void *pvParameters )
        }\r
 \r
        /* The following line will only execute if the task parameter is found to\r
-       be incorrect.  The check timer will detect that the regtest loop counter is\r
+       be incorrect.  The check task will detect that the regtest loop counter is\r
        not being incremented and flag an error. */\r
        vTaskDelete( NULL );\r
 }\r
@@ -412,7 +398,7 @@ static void prvRegTestTaskEntry2( void *pvParameters )
        }\r
 \r
        /* The following line will only execute if the task parameter is found to\r
-       be incorrect.  The check timer will detect that the regtest loop counter is\r
+       be incorrect.  The check task will detect that the regtest loop counter is\r
        not being incremented and flag an error. */\r
        vTaskDelete( NULL );\r
 }\r