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

[freertos] / FreeRTOS / Demo / ARM7_LPC2368_Rowley / main.c

diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/main.c b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/main.c
index 14d588a650f003521e4596d65428afa9053c9977..7071e6618ecb01262371c873f5f2d6d73c309b1c 100644 (file)
--- a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/main.c
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/main.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
@@ -85,7 +85,7 @@
 \r
 /* Demo application definitions. */\r
 #define mainQUEUE_SIZE                                         ( 3 )\r
-#define mainCHECK_DELAY                                                ( ( portTickType ) 5000 / portTICK_RATE_MS )\r
+#define mainCHECK_DELAY                                                ( ( TickType_t ) 5000 / portTICK_PERIOD_MS )\r
 #define mainBASIC_WEB_STACK_SIZE            ( configMINIMAL_STACK_SIZE * 2 )\r
 \r
 /* Task priorities. */\r
@@ -109,22 +109,22 @@
  */\r
 static void vCheckTask( void *pvParameters );\r
 \r
-/* \r
+/*\r
  * The task that handles the uIP stack.  All TCP/IP processing is performed in\r
  * this task.\r
  */\r
 extern void vuIP_Task( void *pvParameters );\r
 \r
 /*\r
- * The LCD is written two by more than one task so is controlled by a \r
- * 'gatekeeper' task.  This is the only task that is actually permitted to \r
+ * The LCD is written two by more than one task so is controlled by a\r
+ * 'gatekeeper' task.  This is the only task that is actually permitted to\r
  * access the LCD directly.  Other tasks wanting to display a message send\r
  * the message to the gatekeeper.\r
  */\r
 static void vLCDTask( void *pvParameters );\r
 \r
 /* The queue used to send messages to the LCD task. */\r
-xQueueHandle xLCDQueue;\r
+QueueHandle_t xLCDQueue;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -138,7 +138,7 @@ int main (void)
        xLCDQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( xLCDMessage ) );\r
 \r
        /* Create the lwIP task.  This uses the lwIP RTOS abstraction layer.*/\r
-    xTaskCreate( vuIP_Task, ( signed char * ) "uIP", mainBASIC_WEB_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );\r
+    xTaskCreate( vuIP_Task, "uIP", mainBASIC_WEB_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );\r
 \r
        /* Start the standard demo tasks - these serve no useful purpose other than\r
        to demonstrate the FreeRTOS API being used and to test the port. */\r
@@ -150,8 +150,8 @@ int main (void)
     vStartIntegerMathTasks( mainINTEGER_TASK_PRIORITY );\r
 \r
        /* Start the tasks defined within this file/specific to this demo. */\r
-    xTaskCreate( vCheckTask, ( signed char * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
-       xTaskCreate( vLCDTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );\r
+    xTaskCreate( vCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+       xTaskCreate( vLCDTask, "LCD", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );\r
 \r
        /* The suicide tasks must be created last as they need to know how many\r
        tasks were running prior to their creation in order to ascertain whether\r
@@ -163,14 +163,14 @@ int main (void)
 \r
     /* Will only get here if there was insufficient memory to create the idle\r
     task. */\r
-       return 0; \r
+       return 0;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 static void vCheckTask( void *pvParameters )\r
 {\r
 portBASE_TYPE xErrorOccurred = pdFALSE;\r
-portTickType xLastExecutionTime;\r
+TickType_t xLastExecutionTime;\r
 unsigned portBASE_TYPE uxColumn = 0;\r
 xLCDMessage xMessage;\r
 \r
@@ -238,7 +238,7 @@ xLCDMessage xMessage;
        /* Initialise the LCD and display a startup message. */\r
        LCD_init();\r
        LCD_cur_off();\r
-    LCD_cls();    \r
+    LCD_cls();\r
     LCD_gotoxy( 1, 1 );\r
     LCD_puts( ( signed char * ) "www.FreeRTOS.org" );\r
 \r
@@ -246,7 +246,7 @@ xLCDMessage xMessage;
        {\r
                /* Wait for a message to arrive that requires displaying. */\r
                while( xQueueReceive( xLCDQueue, &xMessage, portMAX_DELAY ) != pdPASS );\r
-               \r
+\r
                /* Display the message.  Print each message to a different position. */\r
                LCD_cls();\r
                LCD_gotoxy( ( xMessage.xColumn & 0x07 ) + 1, ( xMessage.xColumn & 0x01 ) + 1 );\r