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

[freertos] / FreeRTOS / Demo / CORTEX_LM3S102_Rowley / Demo1 / main.c

diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
index 42124ac032eae7e627d252bcd9f9184ee5092bb0..1f52470bcb771b0a8b4e3f84373ca7477cae8b95 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
+++ b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - 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
@@ -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
@@ -119,10 +119,10 @@
 #include "DriverLib.h"\r
 \r
 /* The time to delay between writing each character to the LCD. */\r
-#define mainCHAR_WRITE_DELAY           ( 2 / portTICK_RATE_MS )\r
+#define mainCHAR_WRITE_DELAY           ( 2 / portTICK_PERIOD_MS )\r
 \r
 /* The time to delay between writing each string to the LCD. */\r
-#define mainSTRING_WRITE_DELAY         ( 400 / portTICK_RATE_MS )\r
+#define mainSTRING_WRITE_DELAY         ( 400 / portTICK_PERIOD_MS )\r
 \r
 /* The number of flash co-routines to create. */\r
 #define mainNUM_FLASH_CO_ROUTINES      ( 5 )\r
@@ -140,9 +140,9 @@ string on UART 0. */
 \r
 /* The time between transmissions of the string on UART 0.   This is pseudo\r
 random in order to generate a bit or randomness to when the interrupts occur.*/\r
-#define mainMIN_TX_DELAY                       ( 40 / portTICK_RATE_MS )\r
-#define mainMAX_TX_DELAY                       ( ( portTickType ) 0x7f )\r
-#define mainOFFSET_TIME                                ( ( portTickType ) 3 )\r
+#define mainMIN_TX_DELAY                       ( 40 / portTICK_PERIOD_MS )\r
+#define mainMAX_TX_DELAY                       ( ( TickType_t ) 0x7f )\r
+#define mainOFFSET_TIME                                ( ( TickType_t ) 3 )\r
 \r
 /* The time the Comms Rx task should wait to receive a character.  This should\r
 be slightly longer than the time between transmissions.  If we do not receive\r
@@ -244,7 +244,7 @@ static char cNextChar;
 \r
 /* The queue used to transmit characters from the interrupt to the Comms Rx\r
 task. */\r
-static xQueueHandle xCommsQueue;\r
+static QueueHandle_t xCommsQueue;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -431,7 +431,7 @@ static char cRxedChar, cExpectedChar;
 \r
 static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )\r
 {\r
-portTickType xDelayPeriod;\r
+TickType_t xDelayPeriod;\r
 static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES;\r
 \r
        /* Co-routine MUST start with a call to crSTART. */\r