Update version number to V8.0.0 (without the release candidate number).

[freertos] / FreeRTOS / Demo / CORTUS_APS3_GCC / Demo / RegTest.c

diff --git a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c
index ebc1684916d67e4f768379f9d65b33097c5035dd..280deb87356715b1c8168a4effc609ce2ce53296 100644 (file)
--- a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c
+++ b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.0 - 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
 \r
@@ -77,33 +78,15 @@
 static void vRegTest1( void *pvParameters );\r
 static void vRegTest2( void *pvParameters );\r
 \r
-/*\r
- * A task that tests the management of the Interrupt Controller (IC) during a\r
- * context switch.  The state of the IC current mask level must be maintained\r
- * across context switches.  Also, yields must be able to be performed when the\r
- * interrupt controller mask is not zero.  This task tests both these\r
- * requirements.\r
- */\r
-static void prvICCheck1Task( void *pvParameters );\r
-\r
 /* Counters used to ensure the tasks are still running. */\r
-static volatile unsigned long ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL, ulICTestCounter = 0UL;\r
+static volatile unsigned long ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL;\r
 \r
-/* Handle to the task that checks the interrupt controller behaviour.  This is\r
-used by the traceTASK_SWITCHED_OUT() macro, which is defined in\r
-FreeRTOSConfig.h and can be removed - it is just for the purpose of this test. */\r
-xTaskHandle xICTestTask = NULL;\r
-\r
-/* Variable that gets set to pdTRUE by traceTASK_SWITCHED_OUT each time\r
-is switched out. */\r
-volatile unsigned long ulTaskSwitchedOut;\r
 /*-----------------------------------------------------------*/\r
 \r
 void vStartRegTestTasks( void )\r
 {\r
-       xTaskCreate( vRegTest1, ( signed char * ) "RTest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
-       xTaskCreate( vRegTest2, ( signed char * ) "RTest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
-       xTaskCreate( prvICCheck1Task, ( signed char * ) "ICCheck", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, &xICTestTask );\r
+       xTaskCreate( vRegTest1, "RTest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
+       xTaskCreate( vRegTest2, "RTest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -232,61 +215,9 @@ static void vRegTest2( void *pvParameters )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvICCheck1Task( void *pvParameters )\r
-{\r
-long lICCheckStatus = pdPASS;\r
-\r
-       for( ;; )\r
-       {\r
-               /* At this point the interrupt mask should be zero. */\r
-               if( ic->cpl != 0 )\r
-               {\r
-                       lICCheckStatus = pdFAIL;\r
-               }\r
-\r
-               /* If we yield here, it should still be 0 when the task next runs.\r
-               ulTaskSwitchedOut is just used to check that a switch does actually\r
-               happen. */\r
-               ulTaskSwitchedOut = pdFALSE;\r
-               taskYIELD();\r
-               if( ( ulTaskSwitchedOut != pdTRUE ) || ( ic->cpl != 0 ) )\r
-               {\r
-                       lICCheckStatus = pdFAIL;\r
-               }\r
-\r
-               /* Set the interrupt mask to portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 1,\r
-               before checking it is as expected. */\r
-               taskENTER_CRITICAL();\r
-               if( ic->cpl != ( portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 1 ) )\r
-               {\r
-                       lICCheckStatus = pdFAIL;\r
-               }\r
-\r
-               /* If we yield here, it should still be\r
-               portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 10 when the task next runs.  */\r
-               ulTaskSwitchedOut = pdFALSE;\r
-               taskYIELD();\r
-               if( ( ulTaskSwitchedOut != pdTRUE ) || ( ic->cpl != ( portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 1 ) ) )\r
-               {\r
-                       lICCheckStatus = pdFAIL;\r
-               }\r
-\r
-               /* Return the interrupt mask to its default state. */\r
-               taskEXIT_CRITICAL();\r
-\r
-               /* Just increment a loop counter so the check task knows if this task\r
-               is still running or not. */\r
-               if( lICCheckStatus == pdPASS )\r
-               {\r
-                       ulICTestCounter++;\r
-               }\r
-       }\r
-}\r
-/*-----------------------------------------------------------*/\r
-\r
 portBASE_TYPE xAreRegTestTasksStillRunning( void )\r
 {\r
-static unsigned long ulLastCounter1 = 0UL, ulLastCounter2 = 0UL, ulLastICTestCounter = 0UL;\r
+static unsigned long ulLastCounter1 = 0UL, ulLastCounter2 = 0UL;\r
 long lReturn;\r
 \r
        /* Check that both loop counters are still incrementing, indicating that\r
@@ -299,10 +230,6 @@ long lReturn;
        {\r
                lReturn = pdFAIL;\r
        }\r
-       else if( ulLastICTestCounter == ulICTestCounter )\r
-       {\r
-               lReturn = pdFAIL;\r
-       }\r
        else\r
        {\r
                lReturn = pdPASS;\r
@@ -310,21 +237,6 @@ long lReturn;
 \r
        ulLastCounter1 = ulRegTest1Counter;\r
        ulLastCounter2 = ulRegTest2Counter;\r
-       ulLastICTestCounter = ulICTestCounter;\r
 \r
        return lReturn;\r
 }\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r