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

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

diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c
index 321a1ef5897b693d18c9bdd8486493d051cbe537..fbcc02509c09ee872bebb14acc5143a49cd26be0 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c
+++ b/FreeRTOS/Demo/CORTEX_LM3S102_GCC/main.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.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
 \r
@@ -118,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
@@ -139,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
@@ -198,7 +199,7 @@ static void vCommsRxTask( void * pvParameters );
  * The co-routine that periodically initiates the transmission of the string on\r
  * the UART.\r
  */\r
-static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex );\r
+static void vSerialTxCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex );\r
 \r
 /* \r
  * Writes a string the the LCD.\r
@@ -243,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
@@ -427,9 +428,9 @@ static char cRxedChar, cExpectedChar;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )\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