Set up to work in both ARM and THUMB modes.

[freertos] / Demo / ARM7_LPC2129_Keil_RVDS / main.c

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index 97010137c55eb2557919f1542a73f0d223d9f6ff..b42b8273c743c925c5ec0f38581987a5ef91f4cc 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -87,20 +87,10 @@
 #include "integer.h"\r
 #include "comtest2.h"\r
 #include "serial.h"\r
-\r
-#ifdef KEIL_THUMB_INTERWORK\r
-\r
-       /* \r
-               THUMB mode allows more tasks to be created without the executable \r
-               binary exceeding the limits allowed by the evaluation version of \r
-               uVision3.\r
-       */\r
-       #include "PollQ.h"\r
-       #include "BlockQ.h"\r
-       #include "semtest.h"\r
-       #include "dynamic.h"\r
-\r
-#endif /* KEIL_THUMB_INTERWORK */\r
+#include "PollQ.h"\r
+#include "BlockQ.h"\r
+#include "semtest.h"\r
+#include "dynamic.h"\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -170,15 +160,10 @@ int main( void )
        vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
        vStartLEDFlashTasks( mainLED_TASK_PRIORITY );\r
-\r
-       #ifdef KEIL_THUMB_INTERWORK\r
-               /* When using THUMB mode we can start more tasks without the executable\r
-               exceeding the size limit imposed by the evaluation version of uVision3. */\r
-               vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
-               vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
-               vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
-               vStartDynamicPriorityTasks();\r
-       #endif\r
+       vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
+       vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
+       vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
+       vStartDynamicPriorityTasks();\r
 \r
        /* Start the check task - which is defined in this file.  This is the task\r
        that periodically checks to see that all the other tasks are executing \r
@@ -267,32 +252,25 @@ portLONG lReturn = pdPASS;
                lReturn = pdFAIL;\r
        }\r
 \r
-       #ifdef KEIL_THUMB_INTERWORK\r
+       if( xArePollingQueuesStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
-               /* When using THUMB mode we can start more tasks without the executable\r
-               exceeding the size limit imposed by the evaluation version of uVision3. */\r
-       \r
-               if( xArePollingQueuesStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
-       \r
-               if( xAreBlockingQueuesStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
-       \r
-               if( xAreSemaphoreTasksStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
+       if( xAreBlockingQueuesStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
-               if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
+       if( xAreSemaphoreTasksStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
-       #endif\r
+       if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
        return lReturn;\r
 }\r