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

[freertos] / FreeRTOS / Demo / Common / Minimal / crflash.c

diff --git a/FreeRTOS/Demo/Common/Minimal/crflash.c b/FreeRTOS/Demo/Common/Minimal/crflash.c
index 69f22dd8807099098eb6fd46b4a495e8997cde0d..ec0b7ce78d1389f90fd36da3ca6058c15caac803 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/crflash.c
+++ b/FreeRTOS/Demo/Common/Minimal/crflash.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
@@ -118,28 +118,28 @@ created. */
 /*\r
  * The 'fixed delay' co-routine as described at the top of the file.\r
  */\r
-static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex );\r
+static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex );\r
 \r
 /*\r
  * The 'flash' co-routine as described at the top of the file.\r
  */\r
-static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex );\r
+static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex );\r
 \r
 /* The queue used to pass data between the 'fixed delay' co-routines and the\r
 'flash' co-routine. */\r
-static xQueueHandle xFlashQueue;\r
+static QueueHandle_t xFlashQueue;\r
 \r
 /* This will be set to pdFALSE if we detect an error. */\r
-static portBASE_TYPE xCoRoutineFlashStatus = pdPASS;\r
+static BaseType_t xCoRoutineFlashStatus = pdPASS;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
  * See the header file for details.\r
  */\r
-void vStartFlashCoRoutines( unsigned portBASE_TYPE uxNumberToCreate )\r
+void vStartFlashCoRoutines( UBaseType_t uxNumberToCreate )\r
 {\r
-unsigned portBASE_TYPE uxIndex;\r
+UBaseType_t uxIndex;\r
 \r
        if( uxNumberToCreate > crfMAX_FLASH_TASKS )\r
        {\r
@@ -147,7 +147,7 @@ unsigned portBASE_TYPE uxIndex;
        }\r
 \r
        /* Create the queue used to pass data between the co-routines. */\r
-       xFlashQueue = xQueueCreate( crfQUEUE_LENGTH, sizeof( unsigned portBASE_TYPE ) );\r
+       xFlashQueue = xQueueCreate( crfQUEUE_LENGTH, sizeof( UBaseType_t ) );\r
 \r
        if( xFlashQueue )\r
        {\r
@@ -163,21 +163,21 @@ unsigned portBASE_TYPE uxIndex;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )\r
+static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex )\r
 {\r
 /* Even though this is a co-routine the xResult variable does not need to be\r
 static as we do not need it to maintain its state between blocks. */\r
-signed portBASE_TYPE xResult;\r
+BaseType_t xResult;\r
 /* The uxIndex parameter of the co-routine function is used as an index into\r
 the xFlashRates array to obtain the delay period to use. */\r
-static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_RATE_MS,\r
-                                                                                                                               200 / portTICK_RATE_MS,\r
-                                                                                                                               250 / portTICK_RATE_MS,\r
-                                                                                                                               300 / portTICK_RATE_MS,\r
-                                                                                                                               350 / portTICK_RATE_MS,\r
-                                                                                                                               400 / portTICK_RATE_MS,\r
-                                                                                                                               450 / portTICK_RATE_MS,\r
-                                                                                                                               500  / portTICK_RATE_MS };\r
+static const TickType_t xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_PERIOD_MS,\r
+                                                                                                                               200 / portTICK_PERIOD_MS,\r
+                                                                                                                               250 / portTICK_PERIOD_MS,\r
+                                                                                                                               300 / portTICK_PERIOD_MS,\r
+                                                                                                                               350 / portTICK_PERIOD_MS,\r
+                                                                                                                               400 / portTICK_PERIOD_MS,\r
+                                                                                                                               450 / portTICK_PERIOD_MS,\r
+                                                                                                                               500  / portTICK_PERIOD_MS };\r
 \r
        /* Co-routines MUST start with a call to crSTART. */\r
        crSTART( xHandle );\r
@@ -204,12 +204,12 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )\r
+static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, UBaseType_t uxIndex )\r
 {\r
 /* Even though this is a co-routine the variable do not need to be\r
 static as we do not need it to maintain their state between blocks. */\r
-signed portBASE_TYPE xResult;\r
-unsigned portBASE_TYPE uxLEDToFlash;\r
+BaseType_t xResult;\r
+UBaseType_t uxLEDToFlash;\r
 \r
        /* Co-routines MUST start with a call to crSTART. */\r
        crSTART( xHandle );\r
@@ -237,7 +237,7 @@ unsigned portBASE_TYPE uxLEDToFlash;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xAreFlashCoRoutinesStillRunning( void )\r
+BaseType_t xAreFlashCoRoutinesStillRunning( void )\r
 {\r
        /* Return pdPASS or pdFAIL depending on whether an error has been detected\r
        or not. */\r