X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_LM3S102_GCC%2FDemo2%2Fmain.c;h=5479df2d217e8cea7939968abfece34d79e13124;hb=3d511cabadf346c67f0f56e15e999c02ca0393ed;hp=addac91e8abfa6e38a3ff1185c5084eddac5cae0;hpb=138156046589085d022b309a15ce5e35ae3269fd;p=freertos

diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c
index addac91e8..5479df2d2 100644
--- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c
+++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/Demo2/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. 
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
 
-    >>! NOTE: The modification to the GPL is included to allow you to distribute
-    >>! a combined work that includes FreeRTOS without being obliged to provide
-    >>! the source code for proprietary components outside of the FreeRTOS
-    >>! kernel.
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<
+    >>!   obliged to provide the source code for proprietary components     !<<
+    >>!   outside of the FreeRTOS kernel.                                   !<<
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -119,10 +119,10 @@
 #include "DriverLib.h"
 
 /* The time to delay between writing each character to the LCD. */
-#define mainCHAR_WRITE_DELAY		( 2 / portTICK_RATE_MS )
+#define mainCHAR_WRITE_DELAY		( 2 / portTICK_PERIOD_MS )
 
 /* The time to delay between writing each string to the LCD. */
-#define mainSTRING_WRITE_DELAY		( 400 / portTICK_RATE_MS )
+#define mainSTRING_WRITE_DELAY		( 400 / portTICK_PERIOD_MS )
 
 /* The number of flash co-routines to create. */
 #define mainNUM_FLASH_CO_ROUTINES	( 5 )
@@ -144,9 +144,9 @@ string on UART 0. */
 
 /* The time between transmissions of the string on UART 0.   This is pseudo
 random in order to generate a bit or randomness to when the interrupts occur.*/
-#define mainMIN_TX_DELAY			( 40 / portTICK_RATE_MS )
-#define mainMAX_TX_DELAY			( ( portTickType ) 0x7f )
-#define mainOFFSET_TIME				( ( portTickType ) 3 )
+#define mainMIN_TX_DELAY			( 40 / portTICK_PERIOD_MS )
+#define mainMAX_TX_DELAY			( ( TickType_t ) 0x7f )
+#define mainOFFSET_TIME				( ( TickType_t ) 3 )
 
 /* The time the Comms Rx task should wait to receive a character.  This should
 be slightly longer than the time between transmissions.  If we do not receive
@@ -248,7 +248,7 @@ static char cNextChar;
 
 /* The queue used to transmit characters from the interrupt to the Comms Rx
 task. */
-static xQueueHandle xCommsQueue;
+static QueueHandle_t xCommsQueue;
 
 /*-----------------------------------------------------------*/
 
@@ -438,7 +438,7 @@ portBASE_TYPE xResult;
 
 static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
 {
-portTickType xDelayPeriod;
+TickType_t xDelayPeriod;
 static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES;
 
 	/* Co-routine MUST start with a call to crSTART. */