Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

[freertos] / FreeRTOS / Demo / PIC32MX_MPLAB / lcd.c

diff --git a/FreeRTOS/Demo/PIC32MX_MPLAB/lcd.c b/FreeRTOS/Demo/PIC32MX_MPLAB/lcd.c
index 4681661f46a99b4e8dd6d5bfc45af7b00a0b52cc..6adf8bb69f23482149199c47e414546a9d41c162 100644 (file)
--- a/FreeRTOS/Demo/PIC32MX_MPLAB/lcd.c
+++ b/FreeRTOS/Demo/PIC32MX_MPLAB/lcd.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.2 - 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
@@ -23,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
@@ -105,8 +106,8 @@ static void prvLCDClear( void );
 \r
 /* Brief delay to permit the LCD to catch up with commands. */\r
 #define lcdVERY_SHORT_DELAY    ( 1 )\r
-#define lcdSHORT_DELAY         ( 4 / portTICK_RATE_MS )\r
-#define lcdLONG_DELAY          ( 15 / portTICK_RATE_MS )\r
+#define lcdSHORT_DELAY         ( 8 / portTICK_PERIOD_MS )\r
+#define lcdLONG_DELAY          ( 15 / portTICK_PERIOD_MS )\r
 \r
 /* LCD specific definitions. */\r
 #define LCD_CLEAR_DISPLAY_CMD                  0x01\r
@@ -129,7 +130,7 @@ static void prvLCDClear( void );
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to send messages to the LCD task. */\r
-xQueueHandle xLCDQueue;\r
+QueueHandle_t xLCDQueue;\r
 \r
 /* LCD access functions. */\r
 static void prvLCDCommand( char cCommand );\r
@@ -137,7 +138,7 @@ static void prvLCDData( char cChar );
 \r
 /*-----------------------------------------------------------*/\r
 \r
-xQueueHandle xStartLCDTask( void )\r
+QueueHandle_t xStartLCDTask( void )\r
 {\r
        /* Create the queue used by the LCD task.  Messages for display on the LCD\r
        are received via this queue. */\r
@@ -145,7 +146,7 @@ xQueueHandle xStartLCDTask( void )
 \r
        /* Start the task that will write to the LCD.  The LCD hardware is\r
        initialised from within the task itself so delays can be used. */\r
-       xTaskCreate( vLCDTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL );\r
+       xTaskCreate( vLCDTask, "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL );\r
 \r
        return xLCDQueue;\r
 }\r