]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Demo/Common/Minimal/crflash.c
Update version number to 8.1.1 for patch release that re-enables mutexes to be given...
[freertos] / FreeRTOS / Demo / Common / Minimal / crflash.c
index 447c5479a427bce4bdae43f6c398fab32d2bdf61..ec0b7ce78d1389f90fd36da3ca6058c15caac803 100644 (file)
@@ -1,48 +1,41 @@
 /*\r
-    FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.1 - Copyright (C) 2014 Real Time Engineers Ltd. \r
+    All rights reserved\r
 \r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT \r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r
     ***************************************************************************\r
      *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that has become a de facto standard.             *\r
      *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
+     *    Help yourself get started quickly and support the FreeRTOS         *\r
+     *    project by purchasing a FreeRTOS tutorial book, reference          *\r
+     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *\r
      *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *    Thank you!                                                         *\r
      *                                                                       *\r
     ***************************************************************************\r
 \r
-\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     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
-    >>>NOTE<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public\r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\r
+    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+\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
+    FOR A PARTICULAR PURPOSE.  Full license text is available from the following\r
+    link: http://www.freertos.org/a00114.html\r
 \r
     1 tab == 4 spaces!\r
-    \r
+\r
     ***************************************************************************\r
      *                                                                       *\r
      *    Having a problem?  Start by reading the FAQ "My application does   *\r
      *                                                                       *\r
     ***************************************************************************\r
 \r
-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license \r
-    and contact details.  \r
-    \r
+    http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
+    license and Real Time Engineers Ltd. contact details.\r
+\r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
-    including FreeRTOS+Trace - an indispensable productivity tool.\r
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
+    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and middleware.\r
 \r
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\r
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+    engineered and independently SIL3 certified version for use in safety and\r
+    mission critical applications that require provable dependability.\r
+\r
+    1 tab == 4 spaces!\r
 */\r
 \r
 /*\r
@@ -121,28 +118,28 @@ created. */
 /*\r
  * The 'fixed delay' co-routine as described at the top of the file.\r
  */\r
-static void prvFixedDelayCoRoutine( xCoRoutineHandle 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( xCoRoutineHandle 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
@@ -150,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
@@ -166,21 +163,21 @@ unsigned portBASE_TYPE uxIndex;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFixedDelayCoRoutine( xCoRoutineHandle 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
@@ -207,12 +204,12 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFlashCoRoutine( xCoRoutineHandle 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
@@ -240,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