Update version number to 8.1.1 for patch release that re-enables mutexes to be given...

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

diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c
index 7bce90afe7dc97e3340021def4169c764a473976..26e8d75b6657223b62c8256a88064e71b361518c 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c
+++ b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.1 - 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
@@ -131,10 +131,10 @@ static volatile portBASE_TYPE uxDelay = 250;
 \r
 /* The queue used to communicate between the I2C interrupt and the I2C \r
 co-routine. */\r
-static xQueueHandle xADCQueue;\r
+static QueueHandle_t xADCQueue;\r
 \r
 /* The queue used to synchronise the flash co-routines. */\r
-static xQueueHandle xDelayQueue;\r
+static QueueHandle_t xDelayQueue;\r
 \r
 /*\r
  * Sets up the PLL, I2C and GPIO used by the demo.\r
@@ -156,7 +156,7 @@ unsigned portBASE_TYPE uxCoRoutine;
 \r
        /* Create the queue used to communicate between the ISR and I2C co-routine.\r
        This can only ever contain one value. */\r
-       xADCQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( portTickType ) );\r
+       xADCQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( TickType_t ) );\r
 \r
        /* Create the queue used to synchronise the flash co-routines.  The queue\r
        is used to trigger three tasks, but is for synchronisation only and does\r
@@ -207,7 +207,7 @@ static void prvSetupHardware( void )
 \r
 static void vI2CCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )\r
 {\r
-portTickType xADCResult;\r
+TickType_t xADCResult;\r
 static portBASE_TYPE xResult = 0, xMilliSecs, xLED;\r
 \r
        crSTART( xHandle );\r
@@ -225,7 +225,7 @@ static portBASE_TYPE xResult = 0, xMilliSecs, xLED;
                /* Scale the result to give a useful range of values for a visual \r
                demo. */\r
                xADCResult >>= 2;\r
-               xMilliSecs = xADCResult / portTICK_RATE_MS;\r
+               xMilliSecs = xADCResult / portTICK_PERIOD_MS;\r
 \r
                /* The delay is split between the four co-routines so they remain in\r
                synch. */\r
@@ -275,7 +275,7 @@ portBASE_TYPE xResult, xNothing;
 \r
 void vI2C_ISR(void)\r
 {\r
-static portTickType xReading;\r
+static TickType_t xReading;\r
 \r
        /* Clear the interrupt. */\r
        I2CMasterIntClear( I2C_MASTER_BASE );\r