***IMMINENT RELEASE NOTICE***

[freertos] / FreeRTOS / Demo / ColdFire_MCF52221_CodeWarrior / sources / main.c

diff --git a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c
index 9634c1994952fc836fd180ceb9e7dbdcdb86b614..c9ab5df94050adfdb0cf0c116196d00671272a01 100644 (file)
--- a/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c
+++ b/FreeRTOS/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.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
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -107,17 +107,17 @@
 \r
 /* The time between cycles of the 'check' functionality - as described at the\r
 top of this file. */\r
-#define mainNO_ERROR_PERIOD                                    ( ( portTickType ) 5000 / portTICK_RATE_MS )\r
+#define mainNO_ERROR_PERIOD                                    ( ( TickType_t ) 5000 / portTICK_PERIOD_MS )\r
 \r
 /* The rate at which the LED controlled by the 'check' task will flash should an\r
 error have been detected. */\r
-#define mainERROR_PERIOD                                       ( ( portTickType ) 500 / portTICK_RATE_MS )\r
+#define mainERROR_PERIOD                                       ( ( TickType_t ) 500 / portTICK_PERIOD_MS )\r
 \r
 /* The LED controlled by the 'check' task. */\r
 #define mainCHECK_LED                                          ( 3 )\r
 \r
 /* ComTest constants - there is no free LED for the comtest tasks. */\r
-#define mainCOM_TEST_BAUD_RATE                         ( ( unsigned portLONG ) 19200 )\r
+#define mainCOM_TEST_BAUD_RATE                         ( ( unsigned long ) 19200 )\r
 #define mainCOM_TEST_LED                                       ( 5 )\r
 \r
 /* Task priorities. */\r
@@ -157,7 +157,7 @@ static void vRegTest2Task( void *pvParameters );
 /*-----------------------------------------------------------*/\r
 \r
 /* Counters used to detect errors within the reg test tasks. */\r
-static volatile unsigned portLONG ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222;\r
+static volatile unsigned long ulRegTest1Counter = 0x11111111, ulRegTest2Counter = 0x22222222;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -177,12 +177,12 @@ int main( void )
        vStartFlashCoRoutines( mainNUM_FLASH_CO_ROUTINES );\r
 \r
        /* Create the check task. */\r
-       xTaskCreate( prvCheckTask, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+       xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
 \r
 \r
        /* Start the reg test tasks - defined in this file. */\r
-       xTaskCreate( vRegTest1Task, ( signed portCHAR * ) "Reg1", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest1Counter, tskIDLE_PRIORITY, NULL );\r
-       xTaskCreate( vRegTest2Task, ( signed portCHAR * ) "Reg2", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest2Counter, tskIDLE_PRIORITY, NULL );\r
+       xTaskCreate( vRegTest1Task, "Reg1", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest1Counter, tskIDLE_PRIORITY, NULL );\r
+       xTaskCreate( vRegTest2Task, "Reg2", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest2Counter, tskIDLE_PRIORITY, NULL );\r
 \r
        /* Start the scheduler. */\r
        vTaskStartScheduler();\r
@@ -197,8 +197,8 @@ int main( void )
 \r
 static void prvCheckTask( void *pvParameters )\r
 {\r
-unsigned portLONG ulTicksToWait = mainNO_ERROR_PERIOD, ulError = 0, ulLastRegTest1Count = 0, ulLastRegTest2Count = 0;\r
-portTickType xLastExecutionTime;\r
+unsigned long ulTicksToWait = mainNO_ERROR_PERIOD, ulError = 0, ulLastRegTest1Count = 0, ulLastRegTest2Count = 0;\r
+TickType_t xLastExecutionTime;\r
 volatile unsigned portBASE_TYPE uxUnusedStack;\r
 \r
        ( void ) pvParameters;\r
@@ -232,7 +232,7 @@ volatile unsigned portBASE_TYPE uxUnusedStack;
            {\r
                ulError |= 0x20UL;\r
            }\r
-           \r
+\r
            if( xAreComTestTasksStillRunning() != pdTRUE )\r
            {\r
                ulError |= 0x40UL;\r
@@ -260,7 +260,7 @@ volatile unsigned portBASE_TYPE uxUnusedStack;
 \r
                /* Toggle the LED each itteration. */\r
                vParTestToggleLED( mainCHECK_LED );\r
-               \r
+\r
                /* For demo only - how much unused stack does this task have? */\r
                uxUnusedStack = uxTaskGetStackHighWaterMark( NULL );\r
        }\r
@@ -276,7 +276,7 @@ void prvSetupHardware( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName )\r
+void vApplicationStackOverflowHook( TaskHandle_t *pxTask, signed char *pcTaskName )\r
 {\r
        /* This will get called if a stack overflow is detected during the context\r
        switch.  Set configCHECK_FOR_STACK_OVERFLOWS to 2 to also check for stack\r