Update FreeRTOS

1 files changed, 61 insertions, 36 deletions

diff --git a/src/FreeRTOS/Source/include/timers.h b/src/FreeRTOS/Source/include/timers.h
index 1d60213..3c6c6bf 100644
--- a/src/FreeRTOS/Source/include/timers.h
+++ b/src/FreeRTOS/Source/include/timers.h
@@ -1,60 +1,64 @@
 /*

-    FreeRTOS V8.0.1 - Copyright (C) 2014 Real Time Engineers Ltd.

+    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.

     All rights reserved

 

     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.

 

-    ***************************************************************************

-     *                                                                       *

-     *    FreeRTOS provides completely free yet professionally developed,    *

-     *    robust, strictly quality controlled, supported, and cross          *

-     *    platform software that has become a de facto standard.             *

-     *                                                                       *

-     *    Help yourself get started quickly and support the FreeRTOS         *

-     *    project by purchasing a FreeRTOS tutorial book, reference          *

-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *

-     *                                                                       *

-     *    Thank you!                                                         *

-     *                                                                       *

-    ***************************************************************************

-

     This file is part of the FreeRTOS distribution.

 

     FreeRTOS is free software; you can redistribute it and/or modify it under

     the terms of the GNU General Public License (version 2) as published by the

-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.

+    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.                                   !<<

+    ***************************************************************************

 

     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY

     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following

+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following

     link: http://www.freertos.org/a00114.html

 

-    1 tab == 4 spaces!

-

     ***************************************************************************

      *                                                                       *

-     *    Having a problem?  Start by reading the FAQ "My application does   *

-     *    not run, what could be wrong?"                                     *

+     *    FreeRTOS provides completely free yet professionally developed,    *

+     *    robust, strictly quality controlled, supported, and cross          *

+     *    platform software that is more than just the market leader, it     *

+     *    is the industry's de facto standard.                               *

      *                                                                       *

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *

+     *    Help yourself get started quickly while simultaneously helping     *

+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *

+     *    tutorial book, reference manual, or both:                          *

+     *    http://www.FreeRTOS.org/Documentation                              *

      *                                                                       *

     ***************************************************************************

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

-    license and Real Time Engineers Ltd. contact details.

+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading

+    the FAQ page "My application does not run, what could be wrong?".  Have you

+    defined configASSERT()?

+

+    http://www.FreeRTOS.org/support - In return for receiving this top quality

+    embedded software for free we request you assist our global community by

+    participating in the support forum.

+

+    http://www.FreeRTOS.org/training - Investing in training allows your team to

+    be as productive as possible as early as possible.  Now you can receive

+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers

+    Ltd, and the world's leading authority on the world's leading RTOS.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, a DOS

     compatible FAT file system, and our tiny thread aware UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS

-    licenses offer ticketed support, indemnification and middleware.

+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.

+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.

+

+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High

+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS

+    licenses offer ticketed support, indemnification and commercial middleware.

 

     http://www.SafeRTOS.com - High Integrity Systems also provide a safety

     engineered and independently SIL3 certified version for use in safety and

@@ -74,7 +78,7 @@
 /*lint -e537 This headers are only multiply included if the application code

 happens to also be including task.h. */

 #include "task.h"

-/*lint +e956 */

+/*lint +e537 */

 

 #ifdef __cplusplus

 extern "C" {

@@ -261,11 +265,11 @@ TimerHandle_t xTimerCreate( const char * const pcTimerName, const TickType_t xTi
  * Returns the ID assigned to the timer.

  *

  * IDs are assigned to timers using the pvTimerID parameter of the call to

- * xTimerCreated() that was used to create the timer.

+ * xTimerCreated() that was used to create the timer, and by calling the

+ * vTimerSetTimerID() API function.

  *

  * If the same callback function is assigned to multiple timers then the timer

- * ID can be used within the callback function to identify which timer actually

- * expired.

+ * ID can be used as time specific (timer local) storage.

  *

  * @param xTimer The timer being queried.

  *

@@ -275,7 +279,28 @@ TimerHandle_t xTimerCreate( const char * const pcTimerName, const TickType_t xTi
  *

  * See the xTimerCreate() API function example usage scenario.

  */

-void *pvTimerGetTimerID( TimerHandle_t xTimer ) PRIVILEGED_FUNCTION;

+void *pvTimerGetTimerID( const TimerHandle_t xTimer ) PRIVILEGED_FUNCTION;

+

+/**

+ * void vTimerSetTimerID( TimerHandle_t xTimer, void *pvNewID );

+ *

+ * Sets the ID assigned to the timer.

+ *

+ * IDs are assigned to timers using the pvTimerID parameter of the call to

+ * xTimerCreated() that was used to create the timer.

+ *

+ * If the same callback function is assigned to multiple timers then the timer

+ * ID can be used as time specific (timer local) storage.

+ *

+ * @param xTimer The timer being updated.

+ *

+ * @param pvNewID The ID to assign to the timer.

+ *

+ * Example usage:

+ *

+ * See the xTimerCreate() API function example usage scenario.

+ */

+void vTimerSetTimerID( TimerHandle_t xTimer, void *pvNewID ) PRIVILEGED_FUNCTION;

 

 /**

  * BaseType_t xTimerIsTimerActive( TimerHandle_t xTimer );

@@ -323,7 +348,7 @@ BaseType_t xTimerIsTimerActive( TimerHandle_t xTimer ) PRIVILEGED_FUNCTION;
  * Simply returns the handle of the timer service/daemon task.  It it not valid

  * to call xTimerGetTimerDaemonTaskHandle() before the scheduler has been started.

  */

-TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );

+TaskHandle_t xTimerGetTimerDaemonTaskHandle( void ) PRIVILEGED_FUNCTION;

 

 /**

  * BaseType_t xTimerStart( TimerHandle_t xTimer, TickType_t xTicksToWait );

@@ -1058,7 +1083,7 @@ TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );
  *	}

  * @endverbatim

  */

-BaseType_t xTimerPendFunctionCallFromISR( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, BaseType_t *pxHigherPriorityTaskWoken );

+BaseType_t xTimerPendFunctionCallFromISR( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, BaseType_t *pxHigherPriorityTaskWoken ) PRIVILEGED_FUNCTION;

 

  /**

   * BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend,

@@ -1092,7 +1117,7 @@ BaseType_t xTimerPendFunctionCallFromISR( PendedFunction_t xFunctionToPend, void
   * timer daemon task, otherwise pdFALSE is returned.

   *

   */

-BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, TickType_t xTicksToWait );

+BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, TickType_t xTicksToWait ) PRIVILEGED_FUNCTION;

 

 /**

  * const char * const pcTimerGetTimerName( TimerHandle_t xTimer );

@@ -1103,7 +1128,7 @@ BaseType_t xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvPar
  *

  * @return The name assigned to the timer specified by the xTimer parameter.

  */

-const char * pcTimerGetTimerName( TimerHandle_t xTimer );

+const char * pcTimerGetTimerName( TimerHandle_t xTimer ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */

 

 /*

  * Functions beyond this part are not part of the public API and are intended