Update the demo directory to use the version 8 type naming conventions.

[freertos] / FreeRTOS / Demo / RX600_RX62N-RSK_GNURX / RTOSDemo / main-full.c

diff --git a/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/main-full.c b/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/main-full.c
index d27d11148b7681765db9b171fe1c7867d2a69bf7..f16feb40a4deb5cdd9627860c4fd24c34f0503cc 100644 (file)
--- a/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/main-full.c
+++ b/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/main-full.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.0.0:rc1 - 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
@@ -181,12 +181,12 @@ stack than most of the other tasks. */
 /* The rate at which mainCHECK_LED will toggle when all the tasks are running\r
 without error.  Controlled by the check task as described at the top of this\r
 file. */\r
-#define mainNO_ERROR_CYCLE_TIME                ( 5000 / portTICK_RATE_MS )\r
+#define mainNO_ERROR_CYCLE_TIME                ( 5000 / portTICK_PERIOD_MS )\r
 \r
 /* The rate at which mainCHECK_LED will toggle when an error has been reported\r
 by at least one task.  Controlled by the check task as described at the top of\r
 this file. */\r
-#define mainERROR_CYCLE_TIME           ( 200 / portTICK_RATE_MS )\r
+#define mainERROR_CYCLE_TIME           ( 200 / portTICK_PERIOD_MS )\r
 \r
 \r
 /*\r
@@ -219,7 +219,7 @@ void vApplicationIdleHook( void );
  * it is possible that the stack overflow will have corrupted these - in which\r
  * case pxCurrentTCB can be inspected to find the same information.\r
  */\r
-void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName );\r
+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName );\r
 \r
 /*\r
  * The reg test tasks as described at the top of this file.\r
@@ -272,14 +272,14 @@ extern void HardwareSetup( void );
        vParTestInitialise();\r
 \r
        /* Start the reg test tasks which test the context switching mechanism. */\r
-       xTaskCreate( prvRegTest1Task, ( signed char * ) "RegTst1", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_1_PARAMETER, tskIDLE_PRIORITY, NULL );\r
-       xTaskCreate( prvRegTest2Task, ( signed char * ) "RegTst2", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_2_PARAMETER, tskIDLE_PRIORITY, NULL );\r
+       xTaskCreate( prvRegTest1Task, "RegTst1", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_1_PARAMETER, tskIDLE_PRIORITY, NULL );\r
+       xTaskCreate( prvRegTest2Task, "RegTst2", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_2_PARAMETER, tskIDLE_PRIORITY, NULL );\r
 \r
        /* The web server task. */\r
-       xTaskCreate( vuIP_Task, ( signed char * ) "uIP", mainuIP_STACK_SIZE, NULL, mainuIP_TASK_PRIORITY, NULL );\r
+       xTaskCreate( vuIP_Task, "uIP", mainuIP_STACK_SIZE, NULL, mainuIP_TASK_PRIORITY, NULL );\r
 \r
        /* Start the check task as described at the top of this file. */\r
-       xTaskCreate( prvCheckTask, ( signed char * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+       xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
 \r
        /* Create the standard demo tasks. */\r
        vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
@@ -314,7 +314,7 @@ extern void HardwareSetup( void );
 static void prvCheckTask( void *pvParameters )\r
 {\r
 static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL;\r
-portTickType xNextWakeTime, xCycleFrequency = mainNO_ERROR_CYCLE_TIME;\r
+TickType_t xNextWakeTime, xCycleFrequency = mainNO_ERROR_CYCLE_TIME;\r
 extern void vSetupHighFrequencyTimer( void );\r
 \r
        /* If this is being executed then the kernel has been started.  Start the high\r
@@ -448,7 +448,7 @@ void vApplicationMallocFailedHook( void )
 \r
 /* This function is explained by the comments above its prototype at the top\r
 of this file. */\r
-void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName )\r
+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )\r
 {\r
        for( ;; );\r
 }\r