Update FreeRTOS

1 files changed, 1022 insertions, 157 deletions

diff --git a/src/FreeRTOS/Source/tasks.c b/src/FreeRTOS/Source/tasks.c
index 7f03fa9..11ca0e9 100644
--- a/src/FreeRTOS/Source/tasks.c
+++ b/src/FreeRTOS/Source/tasks.c
@@ -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

@@ -84,6 +88,8 @@ header files above, but not in this file, in order to generate the correct
 privileged Vs unprivileged linkage and placement. */

 #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE /*lint !e961 !e750. */

 

+/* Set configUSE_STATS_FORMATTING_FUNCTIONS to 2 to include the stats formatting

+functions but without including stdio.h here. */

 #if ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 )

 	/* At the bottom of this file are two optional functions that can be used

 	to generate human readable text from the raw data generated by the

@@ -93,8 +99,8 @@ privileged Vs unprivileged linkage and placement. */
 #endif /* configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) */

 

 /* Sanity check the configuration. */

-#if configUSE_TICKLESS_IDLE != 0

-	#if INCLUDE_vTaskSuspend != 1

+#if( configUSE_TICKLESS_IDLE != 0 )

+	#if( INCLUDE_vTaskSuspend != 1 )

 		#error INCLUDE_vTaskSuspend must be set to 1 if configUSE_TICKLESS_IDLE is not set to 0

 	#endif /* INCLUDE_vTaskSuspend */

 #endif /* configUSE_TICKLESS_IDLE */

@@ -112,6 +118,14 @@ privileged Vs unprivileged linkage and placement. */
 	#define taskYIELD_IF_USING_PREEMPTION() portYIELD_WITHIN_API()

 #endif

 

+/* Value that can be assigned to the eNotifyState member of the TCB. */

+typedef enum

+{

+	eNotWaitingNotification = 0,

+	eWaitingNotification,

+	eNotified

+} eNotifyValue;

+

 /*

  * Task control block.  A task control block (TCB) is allocated for each task,

  * and stores task state information, including a pointer to the task's context

@@ -123,6 +137,7 @@ typedef struct tskTaskControlBlock
 

 	#if ( portUSING_MPU_WRAPPERS == 1 )

 		xMPU_SETTINGS	xMPUSettings;		/*< The MPU settings are defined as part of the port layer.  THIS MUST BE THE SECOND MEMBER OF THE TCB STRUCT. */

+		BaseType_t		xUsingStaticallyAllocatedStack; /* Set to pdTRUE if the stack is a statically allocated array, and pdFALSE if the stack is dynamically allocated. */

 	#endif

 

 	ListItem_t			xGenericListItem;	/*< The list that the state list item of a task is reference from denotes the state of that task (Ready, Blocked, Suspended ). */

@@ -153,6 +168,10 @@ typedef struct tskTaskControlBlock
 		TaskHookFunction_t pxTaskTag;

 	#endif

 

+	#if( configNUM_THREAD_LOCAL_STORAGE_POINTERS > 0 )

+		void *pvThreadLocalStoragePointers[ configNUM_THREAD_LOCAL_STORAGE_POINTERS ];

+	#endif

+

 	#if ( configGENERATE_RUN_TIME_STATS == 1 )

 		uint32_t		ulRunTimeCounter;	/*< Stores the amount of time the task has spent in the Running state. */

 	#endif

@@ -168,6 +187,11 @@ typedef struct tskTaskControlBlock
 		struct 	_reent xNewLib_reent;

 	#endif

 

+	#if ( configUSE_TASK_NOTIFICATIONS == 1 )

+		volatile uint32_t ulNotifiedValue;

+		volatile eNotifyValue eNotifyState;

+	#endif

+

 } tskTCB;

 

 /* The old tskTCB name is maintained above then typedefed to the new TCB_t name

@@ -223,11 +247,11 @@ PRIVILEGED_DATA static volatile UBaseType_t uxPendedTicks 			= ( UBaseType_t ) 0
 PRIVILEGED_DATA static volatile BaseType_t xYieldPending 			= pdFALSE;

 PRIVILEGED_DATA static volatile BaseType_t xNumOfOverflows 			= ( BaseType_t ) 0;

 PRIVILEGED_DATA static UBaseType_t uxTaskNumber 					= ( UBaseType_t ) 0U;

-PRIVILEGED_DATA static volatile TickType_t xNextTaskUnblockTime		= portMAX_DELAY;

+PRIVILEGED_DATA static volatile TickType_t xNextTaskUnblockTime		= ( TickType_t ) 0U; /* Initialised to portMAX_DELAY before the scheduler starts. */

 

 /* Context switches are held pending while the scheduler is suspended.  Also,

-interrupts must not manipulate the xStateListItem of a TCB, or any of the

-lists the xStateListItem can be referenced from, if the scheduler is suspended.

+interrupts must not manipulate the xGenericListItem of a TCB, or any of the

+lists the xGenericListItem can be referenced from, if the scheduler is suspended.

 If an interrupt needs to unblock a task while the scheduler is suspended then it

 moves the task's event list item into the xPendingReadyList, ready for the

 kernel to move the task from the pending ready list into the real ready list

@@ -328,12 +352,12 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended	= ( UBaseType_t
 	/* A port optimised version is provided, call it only if the TCB being reset

 	is being referenced from a ready list.  If it is referenced from a delayed

 	or suspended list then it won't be in a ready list. */

-	#define taskRESET_READY_PRIORITY( uxPriority )													\

-	{																								\

-		if( listCURRENT_LIST_LENGTH( &( pxReadyTasksLists[ ( uxPriority ) ] ) ) == 0 )				\

-		{																							\

-			portRESET_READY_PRIORITY( ( uxPriority ), ( uxTopReadyPriority ) );						\

-		}																							\

+	#define taskRESET_READY_PRIORITY( uxPriority )														\

+	{																									\

+		if( listCURRENT_LIST_LENGTH( &( pxReadyTasksLists[ ( uxPriority ) ] ) ) == ( UBaseType_t ) 0 )	\

+		{																								\

+			portRESET_READY_PRIORITY( ( uxPriority ), ( uxTopReadyPriority ) );							\

+		}																								\

 	}

 

 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */

@@ -363,7 +387,7 @@ count overflows. */
  * the task.  It is inserted at the end of the list.

  */

 #define prvAddTaskToReadyList( pxTCB )																\

-	traceMOVED_TASK_TO_READY_STATE( pxTCB )															\

+	traceMOVED_TASK_TO_READY_STATE( pxTCB );														\

 	taskRECORD_READY_PRIORITY( ( pxTCB )->uxPriority );												\

 	vListInsertEnd( &( pxReadyTasksLists[ ( pxTCB )->uxPriority ] ), &( ( pxTCB )->xGenericListItem ) )

 /*-----------------------------------------------------------*/

@@ -412,7 +436,9 @@ static void prvInitialiseTCBVariables( TCB_t * const pxTCB, const char * const p
  * currently in the Suspended state, or pdFALSE if the task referenced by xTask

  * is in any other state.

  */

-static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask ) PRIVILEGED_FUNCTION;

+#if ( INCLUDE_vTaskSuspend == 1 )

+	static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask ) PRIVILEGED_FUNCTION;

+#endif /* INCLUDE_vTaskSuspend */

 

 /*

  * Utility to ready all the lists used by the scheduler.  This is called

@@ -511,15 +537,25 @@ static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t *
  */

 static void prvResetNextTaskUnblockTime( void );

 

+#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )

+

+	/*

+	 * Helper function used to pad task names with spaces when printing out

+	 * human readable tables of task information.

+	 */

+	static char *prvWriteNameToBuffer( char *pcBuffer, const char *pcTaskName );

+

+#endif

 /*-----------------------------------------------------------*/

 

 BaseType_t xTaskGenericCreate( TaskFunction_t pxTaskCode, const char * const pcName, const uint16_t usStackDepth, void * const pvParameters, UBaseType_t uxPriority, TaskHandle_t * const pxCreatedTask, StackType_t * const puxStackBuffer, const MemoryRegion_t * const xRegions ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */

 {

 BaseType_t xReturn;

 TCB_t * pxNewTCB;

+StackType_t *pxTopOfStack;

 

 	configASSERT( pxTaskCode );

-	configASSERT( ( ( uxPriority & ( ~portPRIVILEGE_BIT ) ) < configMAX_PRIORITIES ) );

+	configASSERT( ( ( uxPriority & ( UBaseType_t ) ( ~portPRIVILEGE_BIT ) ) < ( UBaseType_t ) configMAX_PRIORITIES ) );

 

 	/* Allocate the memory required by the TCB and stack for the new task,

 	checking that the allocation was successful. */

@@ -527,8 +563,6 @@ TCB_t * pxNewTCB;
 

 	if( pxNewTCB != NULL )

 	{

-		StackType_t *pxTopOfStack;

-

 		#if( portUSING_MPU_WRAPPERS == 1 )

 			/* Should the task be created in privileged mode? */

 			BaseType_t xRunPrivileged;

@@ -541,6 +575,20 @@ TCB_t * pxNewTCB;
 				xRunPrivileged = pdFALSE;

 			}

 			uxPriority &= ~portPRIVILEGE_BIT;

+

+			if( puxStackBuffer != NULL )

+			{

+				/* The application provided its own stack.  Note this so no

+				attempt is made to delete the stack should that task be

+				deleted. */

+				pxNewTCB->xUsingStaticallyAllocatedStack = pdTRUE;

+			}

+			else

+			{

+				/* The stack was allocated dynamically.  Note this so it can be

+				deleted again if the task is deleted. */

+				pxNewTCB->xUsingStaticallyAllocatedStack = pdFALSE;

+			}

 		#endif /* portUSING_MPU_WRAPPERS == 1 */

 

 		/* Calculate the top of stack address.  This depends on whether the

@@ -550,17 +598,17 @@ TCB_t * pxNewTCB;
 		#if( portSTACK_GROWTH < 0 )

 		{

 			pxTopOfStack = pxNewTCB->pxStack + ( usStackDepth - ( uint16_t ) 1 );

-			pxTopOfStack = ( StackType_t * ) ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack ) & ( ( portPOINTER_SIZE_TYPE ) ~portBYTE_ALIGNMENT_MASK  ) ); /*lint !e923 MISRA exception.  Avoiding casts between pointers and integers is not practical.  Size differences accounted for using portPOINTER_SIZE_TYPE type. */

+			pxTopOfStack = ( StackType_t * ) ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) ); /*lint !e923 MISRA exception.  Avoiding casts between pointers and integers is not practical.  Size differences accounted for using portPOINTER_SIZE_TYPE type. */

 

 			/* Check the alignment of the calculated top of stack is correct. */

-			configASSERT( ( ( ( uint32_t ) pxTopOfStack & ( uint32_t ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );

+			configASSERT( ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack & ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );

 		}

 		#else /* portSTACK_GROWTH */

 		{

 			pxTopOfStack = pxNewTCB->pxStack;

 

 			/* Check the alignment of the stack buffer is correct. */

-			configASSERT( ( ( ( uint32_t ) pxNewTCB->pxStack & ( uint32_t ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );

+			configASSERT( ( ( ( portPOINTER_SIZE_TYPE ) pxNewTCB->pxStack & ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );

 

 			/* If we want to use stack checking on architectures that use

 			a positive stack growth direction then we also need to store the

@@ -991,7 +1039,7 @@ TCB_t * pxNewTCB;
 				}

 			#endif

 

-			else

+			else /*lint !e525 Negative indentation is intended to make use of pre-processor clearer. */

 			{

 				/* If the task is not in any other state, it must be in the

 				Ready (including pending ready) state. */

@@ -1000,7 +1048,7 @@ TCB_t * pxNewTCB;
 		}

 

 		return eReturn;

-	}

+	} /*lint !e818 xTask cannot be a pointer to const because it is a typedef. */

 

 #endif /* INCLUDE_eTaskGetState */

 /*-----------------------------------------------------------*/

@@ -1014,8 +1062,8 @@ TCB_t * pxNewTCB;
 

 		taskENTER_CRITICAL();

 		{

-			/* If null is passed in here then we are changing the

-			priority of the calling function. */

+			/* If null is passed in here then it is the priority of the that

+			called uxTaskPriorityGet() that is being queried. */

 			pxTCB = prvGetTCBFromHandle( xTask );

 			uxReturn = pxTCB->uxPriority;

 		}

@@ -1027,6 +1075,46 @@ TCB_t * pxNewTCB;
 #endif /* INCLUDE_uxTaskPriorityGet */

 /*-----------------------------------------------------------*/

 

+#if ( INCLUDE_uxTaskPriorityGet == 1 )

+

+	UBaseType_t uxTaskPriorityGetFromISR( TaskHandle_t xTask )

+	{

+	TCB_t *pxTCB;

+	UBaseType_t uxReturn, uxSavedInterruptState;

+

+		/* RTOS ports that support interrupt nesting have the concept of a

+		maximum	system call (or maximum API call) interrupt priority.

+		Interrupts that are	above the maximum system call priority are keep

+		permanently enabled, even when the RTOS kernel is in a critical section,

+		but cannot make any calls to FreeRTOS API functions.  If configASSERT()

+		is defined in FreeRTOSConfig.h then

+		portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion

+		failure if a FreeRTOS API function is called from an interrupt that has

+		been assigned a priority above the configured maximum system call

+		priority.  Only FreeRTOS functions that end in FromISR can be called

+		from interrupts	that have been assigned a priority at or (logically)

+		below the maximum system call interrupt priority.  FreeRTOS maintains a

+		separate interrupt safe API to ensure interrupt entry is as fast and as

+		simple as possible.  More information (albeit Cortex-M specific) is

+		provided on the following link:

+		http://www.freertos.org/RTOS-Cortex-M3-M4.html */

+		portASSERT_IF_INTERRUPT_PRIORITY_INVALID();

+

+		uxSavedInterruptState = portSET_INTERRUPT_MASK_FROM_ISR();

+		{

+			/* If null is passed in here then it is the priority of the calling

+			task that is being queried. */

+			pxTCB = prvGetTCBFromHandle( xTask );

+			uxReturn = pxTCB->uxPriority;

+		}

+		portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptState );

+

+		return uxReturn;

+	}

+

+#endif /* INCLUDE_uxTaskPriorityGet */

+/*-----------------------------------------------------------*/

+

 #if ( INCLUDE_vTaskPrioritySet == 1 )

 

 	void vTaskPrioritySet( TaskHandle_t xTask, UBaseType_t uxNewPriority )

@@ -1500,6 +1588,7 @@ BaseType_t xReturn;
 		}

 		#endif /* configUSE_NEWLIB_REENTRANT */

 

+		xNextTaskUnblockTime = portMAX_DELAY;

 		xSchedulerRunning = pdTRUE;

 		xTickCount = ( TickType_t ) 0U;

 

@@ -1610,8 +1699,8 @@ BaseType_t xAlreadyYielded = pdFALSE;
 					( void ) uxListRemove( &( pxTCB->xGenericListItem ) );

 					prvAddTaskToReadyList( pxTCB );

 

-					/* If we have moved a task that has a priority higher than

-					the current task then we should yield. */

+					/* If the moved task has a priority higher than the current

+					task then a yield must be performed. */

 					if( pxTCB->uxPriority >= pxCurrentTCB->uxPriority )

 					{

 						xYieldPending = pdTRUE;

@@ -1677,11 +1766,11 @@ TickType_t xTaskGetTickCount( void )
 TickType_t xTicks;

 

 	/* Critical section required if running on a 16 bit processor. */

-	taskENTER_CRITICAL();

+	portTICK_TYPE_ENTER_CRITICAL();

 	{

 		xTicks = xTickCount;

 	}

-	taskEXIT_CRITICAL();

+	portTICK_TYPE_EXIT_CRITICAL();

 

 	return xTicks;

 }

@@ -1708,11 +1797,11 @@ UBaseType_t uxSavedInterruptStatus;
 	link: http://www.freertos.org/RTOS-Cortex-M3-M4.html */

 	portASSERT_IF_INTERRUPT_PRIORITY_INVALID();

 

-	uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();

+	uxSavedInterruptStatus = portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR();

 	{

 		xReturn = xTickCount;

 	}

-	portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );

+	portTICK_TYPE_CLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );

 

 	return xReturn;

 }

@@ -1728,7 +1817,7 @@ UBaseType_t uxTaskGetNumberOfTasks( void )
 

 #if ( INCLUDE_pcTaskGetTaskName == 1 )

 

-	char *pcTaskGetTaskName( TaskHandle_t xTaskToQuery )

+	char *pcTaskGetTaskName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */

 	{

 	TCB_t *pxTCB;

 

@@ -1880,7 +1969,7 @@ BaseType_t xSwitchRequired = pdFALSE;
 			/* See if this tick has made a timeout expire.  Tasks are stored in

 			the	queue in the order of their wake time - meaning once one task

 			has been found whose block time has not expired there is no need to

-			look any further	down the list. */

+			look any further down the list. */

 			if( xConstTickCount >= xNextTaskUnblockTime )

 			{

 				for( ;; )

@@ -2152,8 +2241,7 @@ void vTaskSwitchContext( void )
 		#endif /* configGENERATE_RUN_TIME_STATS */

 

 		/* Check for stack overflow, if configured. */

-		taskFIRST_CHECK_FOR_STACK_OVERFLOW();

-		taskSECOND_CHECK_FOR_STACK_OVERFLOW();

+		taskCHECK_FOR_STACK_OVERFLOW();

 

 		/* Select a new task to run using either the generic C or port

 		optimised asm code. */

@@ -2298,7 +2386,7 @@ TickType_t xTimeToWake;
 

 #if configUSE_TIMERS == 1

 

-	void vTaskPlaceOnEventListRestricted( List_t * const pxEventList, const TickType_t xTicksToWait )

+	void vTaskPlaceOnEventListRestricted( List_t * const pxEventList, const TickType_t xTicksToWait, const BaseType_t xWaitIndefinitely )

 	{

 	TickType_t xTimeToWake;

 

@@ -2307,7 +2395,7 @@ TickType_t xTimeToWake;
 		/* This function should not be called by application code hence the

 		'Restricted' in its name.  It is not part of the public API.  It is

 		designed for use by kernel code, and has special calling requirements -

-		it should be called from a critical section. */

+		it should be called with the scheduler suspended. */

 

 

 		/* Place the event list item of the TCB in the appropriate event list.

@@ -2318,7 +2406,8 @@ TickType_t xTimeToWake;
 

 		/* We must remove this task from the ready list before adding it to the

 		blocked list as the same list item is used for both lists.  This

-		function is called form a critical section. */

+		function is called with the scheduler locked so interrupts will not

+		access the lists at the same time. */

 		if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )

 		{

 			/* The current task must be in a ready list, so there is no need to

@@ -2330,12 +2419,44 @@ TickType_t xTimeToWake;
 			mtCOVERAGE_TEST_MARKER();

 		}

 

-		/* Calculate the time at which the task should be woken if the event does

-		not occur.  This may overflow but this doesn't matter. */

-		xTimeToWake = xTickCount + xTicksToWait;

+		/* If vTaskSuspend() is available then the suspended task list is also

+		available and a task that is blocking indefinitely can enter the

+		suspended state (it is not really suspended as it will re-enter the

+		Ready state when the event it is waiting indefinitely for occurs).

+		Blocking indefinitely is useful when using tickless idle mode as when

+		all tasks are blocked indefinitely all timers can be turned off. */

+		#if( INCLUDE_vTaskSuspend == 1 )

+		{

+			if( xWaitIndefinitely == pdTRUE )

+			{

+				/* Add the task to the suspended task list instead of a delayed

+				task list to ensure the task is not woken by a timing event.  It

+				will block indefinitely. */

+				vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );

+			}

+			else

+			{

+				/* Calculate the time at which the task should be woken if the

+				event does not occur.  This may overflow but this doesn't

+				matter. */

+				xTimeToWake = xTickCount + xTicksToWait;

+				traceTASK_DELAY_UNTIL();

+				prvAddCurrentTaskToDelayedList( xTimeToWake );

+			}

+		}

+		#else

+		{

+			/* Calculate the time at which the task should be woken if the event

+			does not occur.  This may overflow but this doesn't matter. */

+			xTimeToWake = xTickCount + xTicksToWait;

+			traceTASK_DELAY_UNTIL();

+			prvAddCurrentTaskToDelayedList( xTimeToWake );

 

-		traceTASK_DELAY_UNTIL();

-		prvAddCurrentTaskToDelayedList( xTimeToWake );

+			/* Remove compiler warnings when INCLUDE_vTaskSuspend() is not

+			defined. */

+			( void ) xWaitIndefinitely;

+		}

+		#endif

 	}

 

 #endif /* configUSE_TIMERS */

@@ -2391,6 +2512,20 @@ BaseType_t xReturn;
 		xReturn = pdFALSE;

 	}

 

+	#if( configUSE_TICKLESS_IDLE != 0 )

+	{

+		/* If a task is blocked on a kernel object then xNextTaskUnblockTime

+		might be set to the blocked task's time out time.  If the task is

+		unblocked for a reason other than a timeout xNextTaskUnblockTime is

+		normally left unchanged, because it is automatically reset to a new

+		value when the tick count equals xNextTaskUnblockTime.  However if

+		tickless idling is used it might be more important to enter sleep mode

+		at the earliest possible time - so reset xNextTaskUnblockTime here to

+		ensure it is updated at the earliest possible time. */

+		prvResetNextTaskUnblockTime();

+	}

+	#endif

+

 	return xReturn;

 }

 /*-----------------------------------------------------------*/

@@ -2655,10 +2790,12 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
 }

 /*-----------------------------------------------------------*/

 

-#if configUSE_TICKLESS_IDLE != 0

+#if( configUSE_TICKLESS_IDLE != 0 )

 

 	eSleepModeStatus eTaskConfirmSleepModeStatus( void )

 	{

+	/* The idle task exists in addition to the application tasks. */

+	const UBaseType_t uxNonApplicationTasks = 1;

 	eSleepModeStatus eReturn = eStandardSleep;

 

 		if( listCURRENT_LIST_LENGTH( &xPendingReadyList ) != 0 )

@@ -2673,29 +2810,23 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
 		}

 		else

 		{

-			#if configUSE_TIMERS == 0

+			/* If all the tasks are in the suspended list (which might mean they

+			have an infinite block time rather than actually being suspended)

+			then it is safe to turn all clocks off and just wait for external

+			interrupts. */

+			if( listCURRENT_LIST_LENGTH( &xSuspendedTaskList ) == ( uxCurrentNumberOfTasks - uxNonApplicationTasks ) )

 			{

-				/* The idle task exists in addition to the application tasks. */

-				const UBaseType_t uxNonApplicationTasks = 1;

-

-				/* If timers are not being used and all the tasks are in the

-				suspended list (which might mean they have an infinite block

-				time rather than actually being suspended) then it is safe to

-				turn all clocks off and just wait for external interrupts. */

-				if( listCURRENT_LIST_LENGTH( &xSuspendedTaskList ) == ( uxCurrentNumberOfTasks - uxNonApplicationTasks ) )

-				{

-					eReturn = eNoTasksWaitingTimeout;

-				}

-				else

-				{

-					mtCOVERAGE_TEST_MARKER();

-				}

+				eReturn = eNoTasksWaitingTimeout;

+			}

+			else

+			{

+				mtCOVERAGE_TEST_MARKER();

 			}

-			#endif /* configUSE_TIMERS */

 		}

 

 		return eReturn;

 	}

+

 #endif /* configUSE_TICKLESS_IDLE */

 /*-----------------------------------------------------------*/

 

@@ -2784,6 +2915,22 @@ UBaseType_t x;
 	}

 	#endif /* portUSING_MPU_WRAPPERS */

 

+	#if( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )

+	{

+		for( x = 0; x < ( UBaseType_t ) configNUM_THREAD_LOCAL_STORAGE_POINTERS; x++ )

+		{

+			pxTCB->pvThreadLocalStoragePointers[ x ] = NULL;

+		}

+	}

+	#endif

+

+	#if ( configUSE_TASK_NOTIFICATIONS == 1 )

+	{

+		pxTCB->ulNotifiedValue = 0;

+		pxTCB->eNotifyState = eNotWaitingNotification;

+	}

+	#endif

+

 	#if ( configUSE_NEWLIB_REENTRANT == 1 )

 	{

 		/* Initialise this task's Newlib reent structure. */

@@ -2793,13 +2940,53 @@ UBaseType_t x;
 }

 /*-----------------------------------------------------------*/

 

+#if ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )

+

+	void vTaskSetThreadLocalStoragePointer( TaskHandle_t xTaskToSet, BaseType_t xIndex, void *pvValue )

+	{

+	TCB_t *pxTCB;

+

+		if( xIndex < configNUM_THREAD_LOCAL_STORAGE_POINTERS )

+		{

+			pxTCB = prvGetTCBFromHandle( xTaskToSet );

+			pxTCB->pvThreadLocalStoragePointers[ xIndex ] = pvValue;

+		}

+	}

+

+#endif /* configNUM_THREAD_LOCAL_STORAGE_POINTERS */

+/*-----------------------------------------------------------*/

+

+#if ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )

+

+	void *pvTaskGetThreadLocalStoragePointer( TaskHandle_t xTaskToQuery, BaseType_t xIndex )

+	{

+	void *pvReturn = NULL;

+	TCB_t *pxTCB;

+

+		if( xIndex < configNUM_THREAD_LOCAL_STORAGE_POINTERS )

+		{

+			pxTCB = prvGetTCBFromHandle( xTaskToQuery );

+			pvReturn = pxTCB->pvThreadLocalStoragePointers[ xIndex ];

+		}

+		else

+		{

+			pvReturn = NULL;

+		}

+

+		return pvReturn;

+	}

+

+#endif /* configNUM_THREAD_LOCAL_STORAGE_POINTERS */

+/*-----------------------------------------------------------*/

+

 #if ( portUSING_MPU_WRAPPERS == 1 )

 

 	void vTaskAllocateMPURegions( TaskHandle_t xTaskToModify, const MemoryRegion_t * const xRegions )

 	{

 	TCB_t *pxTCB;

 

-		/* If null is passed in here then we are deleting ourselves. */

+		/* If null is passed in here then we are modifying the MPU settings of

+		the calling task. */

 		pxTCB = prvGetTCBFromHandle( xTaskToModify );

 

         vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), xRegions, NULL, 0 );

@@ -2915,34 +3102,72 @@ static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t *
 {

 TCB_t *pxNewTCB;

 

-	/* Allocate space for the TCB.  Where the memory comes from depends on

-	the implementation of the port malloc function. */

-	pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );

-

-	if( pxNewTCB != NULL )

+	/* If the stack grows down then allocate the stack then the TCB so the stack

+	does not grow into the TCB.  Likewise if the stack grows up then allocate

+	the TCB then the stack. */

+	#if( portSTACK_GROWTH > 0 )

 	{

-		/* Allocate space for the stack used by the task being created.

-		The base of the stack memory stored in the TCB so the task can

-		be deleted later if required. */

-		pxNewTCB->pxStack = ( StackType_t * ) pvPortMallocAligned( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ), puxStackBuffer ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */

+		/* Allocate space for the TCB.  Where the memory comes from depends on

+		the implementation of the port malloc function. */

+		pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );

 

-		if( pxNewTCB->pxStack == NULL )

+		if( pxNewTCB != NULL )

 		{

-			/* Could not allocate the stack.  Delete the allocated TCB. */

-			vPortFree( pxNewTCB );

-			pxNewTCB = NULL;

+			/* Allocate space for the stack used by the task being created.

+			The base of the stack memory stored in the TCB so the task can

+			be deleted later if required. */

+			pxNewTCB->pxStack = ( StackType_t * ) pvPortMallocAligned( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ), puxStackBuffer ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */

+

+			if( pxNewTCB->pxStack == NULL )

+			{

+				/* Could not allocate the stack.  Delete the allocated TCB. */

+				vPortFree( pxNewTCB );

+				pxNewTCB = NULL;

+			}

 		}

-		else

+	}

+	#else /* portSTACK_GROWTH */

+	{

+	StackType_t *pxStack;

+

+		/* Allocate space for the stack used by the task being created. */

+		pxStack = ( StackType_t * ) pvPortMallocAligned( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ), puxStackBuffer ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */

+

+		if( pxStack != NULL )

 		{

-			/* Avoid dependency on memset() if it is not required. */

-			#if( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) )

+			/* Allocate space for the TCB.  Where the memory comes from depends

+			on the implementation of the port malloc function. */

+			pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );

+

+			if( pxNewTCB != NULL )

 			{

-				/* Just to help debugging. */

-				( void ) memset( pxNewTCB->pxStack, ( int ) tskSTACK_FILL_BYTE, ( size_t ) usStackDepth * sizeof( StackType_t ) );

+				/* Store the stack location in the TCB. */

+				pxNewTCB->pxStack = pxStack;

 			}

-			#endif /* ( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) ) ) */

+			else

+			{

+				/* The stack cannot be used as the TCB was not created.  Free it

+				again. */

+				vPortFree( pxStack );

+			}

+		}

+		else

+		{

+			pxNewTCB = NULL;

 		}

 	}

+	#endif /* portSTACK_GROWTH */

+

+	if( pxNewTCB != NULL )

+	{

+		/* Avoid dependency on memset() if it is not required. */

+		#if( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) )

+		{

+			/* Just to help debugging. */

+			( void ) memset( pxNewTCB->pxStack, ( int ) tskSTACK_FILL_BYTE, ( size_t ) usStackDepth * sizeof( StackType_t ) );

+		}

+		#endif /* ( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) ) ) */

+	}

 

 	return pxNewTCB;

 }

@@ -3039,13 +3264,13 @@ TCB_t *pxNewTCB;
 	{

 	uint32_t ulCount = 0U;

 

-		while( *pucStackByte == tskSTACK_FILL_BYTE )

+		while( *pucStackByte == ( uint8_t ) tskSTACK_FILL_BYTE )

 		{

 			pucStackByte -= portSTACK_GROWTH;

 			ulCount++;

 		}

 

-		ulCount /= ( uint32_t ) sizeof( StackType_t );

+		ulCount /= ( uint32_t ) sizeof( StackType_t ); /*lint !e961 Casting is not redundant on smaller architectures. */

 

 		return ( uint16_t ) ulCount;

 	}

@@ -3097,7 +3322,22 @@ TCB_t *pxNewTCB;
 			_reclaim_reent( &( pxTCB->xNewLib_reent ) );

 		}

 		#endif /* configUSE_NEWLIB_REENTRANT */

-		vPortFreeAligned( pxTCB->pxStack );

+

+		#if( portUSING_MPU_WRAPPERS == 1 )

+		{

+			/* Only free the stack if it was allocated dynamically in the first

+			place. */

+			if( pxTCB->xUsingStaticallyAllocatedStack == pdFALSE )

+			{

+				vPortFreeAligned( pxTCB->pxStack );

+			}

+		}

+		#else

+		{

+			vPortFreeAligned( pxTCB->pxStack );

+		}

+		#endif

+

 		vPortFree( pxTCB );

 	}

 

@@ -3110,9 +3350,8 @@ TCB_t *pxTCB;
 

 	if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE )

 	{

-		/* The new current delayed list is empty.  Set

-		xNextTaskUnblockTime to the maximum possible value so it is

-		extremely unlikely that the

+		/* The new current delayed list is empty.  Set xNextTaskUnblockTime to

+		the maximum possible value so it is	extremely unlikely that the

 		if( xTickCount >= xNextTaskUnblockTime ) test will pass until

 		there is an item in the delayed list. */

 		xNextTaskUnblockTime = portMAX_DELAY;

@@ -3184,6 +3423,9 @@ TCB_t *pxTCB;
 		locked then the mutex holder might now be NULL. */

 		if( pxMutexHolder != NULL )

 		{

+			/* If the holder of the mutex has a priority below the priority of

+			the task attempting to obtain the mutex then it will temporarily

+			inherit the priority of the task attempting to obtain the mutex. */

 			if( pxTCB->uxPriority < pxCurrentTCB->uxPriority )

 			{

 				/* Adjust the mutex holder state to account for its new

@@ -3198,8 +3440,8 @@ TCB_t *pxTCB;
 					mtCOVERAGE_TEST_MARKER();

 				}

 

-				/* If the task being modified is in the ready state it will need to

-				be moved into a new list. */

+				/* If the task being modified is in the ready state it will need

+				to be moved into a new list. */

 				if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxTCB->uxPriority ] ), &( pxTCB->xGenericListItem ) ) != pdFALSE )

 				{

 					if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )

@@ -3246,13 +3488,27 @@ TCB_t *pxTCB;
 

 		if( pxMutexHolder != NULL )

 		{

+			/* A task can only have an inherited priority if it holds the mutex.

+			If the mutex is held by a task then it cannot be given from an

+			interrupt, and if a mutex is given by the holding task then it must

+			be the running state task. */

+			configASSERT( pxTCB == pxCurrentTCB );

+

+			configASSERT( pxTCB->uxMutexesHeld );

+			( pxTCB->uxMutexesHeld )--;

+

+			/* Has the holder of the mutex inherited the priority of another

+			task? */

 			if( pxTCB->uxPriority != pxTCB->uxBasePriority )

 			{

 				/* Only disinherit if no other mutexes are held. */

-				if( pxTCB->uxMutexesHeld == 0 )

+				if( pxTCB->uxMutexesHeld == ( UBaseType_t ) 0 )

 				{

-					/* The holding task must be the running task to be able to give

-					the mutex back.  Remove the holding task from the ready list. */

+					/* A task can only have an inherited priority if it holds

+					the mutex.  If the mutex is held by a task then it cannot be

+					given from an interrupt, and if a mutex is given by the

+					holding	task then it must be the running state task.  Remove

+					the	holding task from the ready	list. */

 					if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )

 					{

 						taskRESET_READY_PRIORITY( pxTCB->uxPriority );

@@ -3262,8 +3518,8 @@ TCB_t *pxTCB;
 						mtCOVERAGE_TEST_MARKER();

 					}

 

-					/* Disinherit the priority before adding the task into the new

-					ready list. */

+					/* Disinherit the priority before adding the task into the

+					new	ready list. */

 					traceTASK_PRIORITY_DISINHERIT( pxTCB, pxTCB->uxBasePriority );

 					pxTCB->uxPriority = pxTCB->uxBasePriority;

 

@@ -3276,7 +3532,11 @@ TCB_t *pxTCB;
 					/* Return true to indicate that a context switch is required.

 					This is only actually required in the corner case whereby

 					multiple mutexes were held and the mutexes were given back

-					in an order different to that in which they were taken. */

+					in an order different to that in which they were taken.

+					If a context switch did not occur when the first mutex was

+					returned, even if a task was waiting on it, then a context

+					switch should occur when the last mutex is returned whether

+					a task is waiting on it or not. */

 					xReturn = pdTRUE;

 				}

 				else

@@ -3320,7 +3580,6 @@ TCB_t *pxTCB;
 			{

 				portASSERT_IF_IN_ISR();

 			}

-

 		}

 		else

 		{

@@ -3364,7 +3623,33 @@ TCB_t *pxTCB;
 #endif /* portCRITICAL_NESTING_IN_TCB */

 /*-----------------------------------------------------------*/

 

-#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) )

+#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )

+

+	static char *prvWriteNameToBuffer( char *pcBuffer, const char *pcTaskName )

+	{

+	size_t x;

+

+		/* Start by copying the entire string. */

+		strcpy( pcBuffer, pcTaskName );

+

+		/* Pad the end of the string with spaces to ensure columns line up when

+		printed out. */

+		for( x = strlen( pcBuffer ); x < ( size_t ) ( configMAX_TASK_NAME_LEN - 1 ); x++ )

+		{

+			pcBuffer[ x ] = ' ';

+		}

+

+		/* Terminate. */

+		pcBuffer[ x ] = 0x00;

+

+		/* Return the new end of string. */

+		return &( pcBuffer[ x ] );

+	}

+

+#endif /* ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) */

+/*-----------------------------------------------------------*/

+

+#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )

 

 	void vTaskList( char * pcWriteBuffer )

 	{

@@ -3417,25 +3702,30 @@ TCB_t *pxTCB;
 			{

 				switch( pxTaskStatusArray[ x ].eCurrentState )

 				{

-				case eReady:		cStatus = tskREADY_CHAR;

-									break;

+					case eReady:		cStatus = tskREADY_CHAR;

+										break;

 

-				case eBlocked:		cStatus = tskBLOCKED_CHAR;

-									break;

+					case eBlocked:		cStatus = tskBLOCKED_CHAR;

+										break;

 

-				case eSuspended:	cStatus = tskSUSPENDED_CHAR;

-									break;

+					case eSuspended:	cStatus = tskSUSPENDED_CHAR;

+										break;

 

-				case eDeleted:		cStatus = tskDELETED_CHAR;

-									break;

+					case eDeleted:		cStatus = tskDELETED_CHAR;

+										break;

 

-				default:			/* Should not get here, but it is included

-									to prevent static checking errors. */

-									cStatus = 0x00;

-									break;

+					default:			/* Should not get here, but it is included

+										to prevent static checking errors. */

+										cStatus = 0x00;

+										break;

 				}

 

-				sprintf( pcWriteBuffer, "%s\t\t%c\t%u\t%u\t%u\r\n", pxTaskStatusArray[ x ].pcTaskName, cStatus, ( unsigned int ) pxTaskStatusArray[ x ].uxCurrentPriority, ( unsigned int ) pxTaskStatusArray[ x ].usStackHighWaterMark, ( unsigned int ) pxTaskStatusArray[ x ].xTaskNumber );

+				/* Write the task name to the string, padding with spaces so it

+				can be printed in tabular form more easily. */

+				pcWriteBuffer = prvWriteNameToBuffer( pcWriteBuffer, pxTaskStatusArray[ x ].pcTaskName );

+

+				/* Write the rest of the string. */

+				sprintf( pcWriteBuffer, "\t%c\t%u\t%u\t%u\r\n", cStatus, ( unsigned int ) pxTaskStatusArray[ x ].uxCurrentPriority, ( unsigned int ) pxTaskStatusArray[ x ].usStackHighWaterMark, ( unsigned int ) pxTaskStatusArray[ x ].xTaskNumber );

 				pcWriteBuffer += strlen( pcWriteBuffer );

 			}

 

@@ -3448,10 +3738,10 @@ TCB_t *pxTCB;
 		}

 	}

 

-#endif /* ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) ) */

+#endif /* ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) ) */

 /*----------------------------------------------------------*/

 

-#if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) )

+#if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )

 

 	void vTaskGetRunTimeStats( char *pcWriteBuffer )

 	{

@@ -3519,17 +3809,22 @@ TCB_t *pxTCB;
 					ulTotalRunTimeDiv100 has already been divided by 100. */

 					ulStatsAsPercentage = pxTaskStatusArray[ x ].ulRunTimeCounter / ulTotalTime;

 

+					/* Write the task name to the string, padding with

+					spaces so it can be printed in tabular form more

+					easily. */

+					pcWriteBuffer = prvWriteNameToBuffer( pcWriteBuffer, pxTaskStatusArray[ x ].pcTaskName );

+

 					if( ulStatsAsPercentage > 0UL )

 					{

 						#ifdef portLU_PRINTF_SPECIFIER_REQUIRED

 						{

-							sprintf( pcWriteBuffer, "%s\t\t%lu\t\t%lu%%\r\n", pxTaskStatusArray[ x ].pcTaskName, pxTaskStatusArray[ x ].ulRunTimeCounter, ulStatsAsPercentage );

+							sprintf( pcWriteBuffer, "\t%lu\t\t%lu%%\r\n", pxTaskStatusArray[ x ].ulRunTimeCounter, ulStatsAsPercentage );

 						}

 						#else

 						{

 							/* sizeof( int ) == sizeof( long ) so a smaller

 							printf() library can be used. */

-							sprintf( pcWriteBuffer, "%s\t\t%u\t\t%u%%\r\n", pxTaskStatusArray[ x ].pcTaskName, ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter, ( unsigned int ) ulStatsAsPercentage );

+							sprintf( pcWriteBuffer, "\t%u\t\t%u%%\r\n", ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter, ( unsigned int ) ulStatsAsPercentage );

 						}

 						#endif

 					}

@@ -3539,13 +3834,13 @@ TCB_t *pxTCB;
 						consumed less than 1% of the total run time. */

 						#ifdef portLU_PRINTF_SPECIFIER_REQUIRED

 						{

-							sprintf( pcWriteBuffer, "%s\t\t%lu\t\t<1%%\r\n", pxTaskStatusArray[ x ].pcTaskName, pxTaskStatusArray[ x ].ulRunTimeCounter );

+							sprintf( pcWriteBuffer, "\t%lu\t\t<1%%\r\n", pxTaskStatusArray[ x ].ulRunTimeCounter );

 						}

 						#else

 						{

 							/* sizeof( int ) == sizeof( long ) so a smaller

 							printf() library can be used. */

-							sprintf( pcWriteBuffer, "%s\t\t%u\t\t<1%%\r\n", pxTaskStatusArray[ x ].pcTaskName, ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter );

+							sprintf( pcWriteBuffer, "\t%u\t\t<1%%\r\n", ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter );

 						}

 						#endif

 					}

@@ -3567,7 +3862,7 @@ TCB_t *pxTCB;
 		}

 	}

 

-#endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) ) */

+#endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) ) */

 /*-----------------------------------------------------------*/

 

 TickType_t uxTaskResetEventItemValue( void )

@@ -3584,27 +3879,597 @@ TickType_t uxReturn;
 }

 /*-----------------------------------------------------------*/

 

-void vTaskIncrementMutexHeldCount( void )

-{

-	/* If xSemaphoreCreateMutex() is called before any tasks have been created

-	then pxCurrentTCB will be NULL. */

-	if( pxCurrentTCB != NULL )

+#if ( configUSE_MUTEXES == 1 )

+

+	void *pvTaskIncrementMutexHeldCount( void )

 	{

-		( pxCurrentTCB->uxMutexesHeld )++;

+		/* If xSemaphoreCreateMutex() is called before any tasks have been created

+		then pxCurrentTCB will be NULL. */

+		if( pxCurrentTCB != NULL )

+		{

+			( pxCurrentTCB->uxMutexesHeld )++;

+		}

+

+		return pxCurrentTCB;

 	}

-}

+

+#endif /* configUSE_MUTEXES */

 /*-----------------------------------------------------------*/

 

-void vTaskDecrementMutexHeldCount( void )

-{

-	/* If xSemaphoreCreateMutex() is called before any tasks have been created

-	then pxCurrentTCB will be NULL. */

-	if( pxCurrentTCB != NULL )

+#if( configUSE_TASK_NOTIFICATIONS == 1 )

+

+	uint32_t ulTaskNotifyTake( BaseType_t xClearCountOnExit, TickType_t xTicksToWait )

 	{

-		configASSERT( pxCurrentTCB->uxMutexesHeld );

-		( pxCurrentTCB->uxMutexesHeld )--;

+	TickType_t xTimeToWake;

+	uint32_t ulReturn;

+

+		taskENTER_CRITICAL();

+		{

+			/* Only block if the notification count is not already non-zero. */

+			if( pxCurrentTCB->ulNotifiedValue == 0UL )

+			{

+				/* Mark this task as waiting for a notification. */

+				pxCurrentTCB->eNotifyState = eWaitingNotification;

+

+				if( xTicksToWait > ( TickType_t ) 0 )

+				{

+					/* The task is going to block.  First it must be removed

+					from the ready list. */

+					if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )

+					{

+						/* The current task must be in a ready list, so there is

+						no need to check, and the port reset macro can be called

+						directly. */

+						portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );

+					}

+					else

+					{

+						mtCOVERAGE_TEST_MARKER();

+					}

+

+					#if ( INCLUDE_vTaskSuspend == 1 )

+					{

+						if( xTicksToWait == portMAX_DELAY )

+						{

+							/* Add the task to the suspended task list instead

+							of a delayed task list to ensure the task is not

+							woken by a timing event.  It will block

+							indefinitely. */

+							vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );

+						}

+						else

+						{

+							/* Calculate the time at which the task should be

+							woken if no notification events occur.  This may

+							overflow but this doesn't matter, the scheduler will

+							handle it. */

+							xTimeToWake = xTickCount + xTicksToWait;

+							prvAddCurrentTaskToDelayedList( xTimeToWake );

+						}

+					}

+					#else /* INCLUDE_vTaskSuspend */

+					{

+							/* Calculate the time at which the task should be

+							woken if the event does not occur.  This may

+							overflow but this doesn't matter, the scheduler will

+							handle it. */

+							xTimeToWake = xTickCount + xTicksToWait;

+							prvAddCurrentTaskToDelayedList( xTimeToWake );

+					}

+					#endif /* INCLUDE_vTaskSuspend */

+

+					traceTASK_NOTIFY_TAKE_BLOCK();

+

+					/* All ports are written to allow a yield in a critical

+					section (some will yield immediately, others wait until the

+					critical section exits) - but it is not something that

+					application code should ever do. */

+					portYIELD_WITHIN_API();

+				}

+				else

+				{

+					mtCOVERAGE_TEST_MARKER();

+				}

+			}

+			else

+			{

+				mtCOVERAGE_TEST_MARKER();

+			}

+		}

+		taskEXIT_CRITICAL();

+

+		taskENTER_CRITICAL();

+		{

+			traceTASK_NOTIFY_TAKE();

+			ulReturn = pxCurrentTCB->ulNotifiedValue;

+

+			if( ulReturn != 0UL )

+			{

+				if( xClearCountOnExit != pdFALSE )

+				{

+					pxCurrentTCB->ulNotifiedValue = 0UL;

+				}

+				else

+				{

+					( pxCurrentTCB->ulNotifiedValue )--;

+				}

+			}

+			else

+			{

+				mtCOVERAGE_TEST_MARKER();

+			}

+

+			pxCurrentTCB->eNotifyState = eNotWaitingNotification;

+		}

+		taskEXIT_CRITICAL();

+

+		return ulReturn;

 	}

-}

+

+#endif /* configUSE_TASK_NOTIFICATIONS */

+/*-----------------------------------------------------------*/

+

+#if( configUSE_TASK_NOTIFICATIONS == 1 )

+

+	BaseType_t xTaskNotifyWait( uint32_t ulBitsToClearOnEntry, uint32_t ulBitsToClearOnExit, uint32_t *pulNotificationValue, TickType_t xTicksToWait )

+	{

+	TickType_t xTimeToWake;

+	BaseType_t xReturn;

+

+		taskENTER_CRITICAL();

+		{

+			/* Only block if a notification is not already pending. */

+			if( pxCurrentTCB->eNotifyState != eNotified )

+			{

+				/* Clear bits in the task's notification value as bits may get

+				set	by the notifying task or interrupt.  This can be used to

+				clear the value to zero. */

+				pxCurrentTCB->ulNotifiedValue &= ~ulBitsToClearOnEntry;

+

+				/* Mark this task as waiting for a notification. */

+				pxCurrentTCB->eNotifyState = eWaitingNotification;

+

+				if( xTicksToWait > ( TickType_t ) 0 )

+				{

+					/* The task is going to block.  First it must be removed

+					from the	ready list. */

+					if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )

+					{

+						/* The current task must be in a ready list, so there is

+						no need to check, and the port reset macro can be called

+						directly. */

+						portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );

+					}

+					else

+					{

+						mtCOVERAGE_TEST_MARKER();

+					}

+

+					#if ( INCLUDE_vTaskSuspend == 1 )

+					{

+						if( xTicksToWait == portMAX_DELAY )

+						{

+							/* Add the task to the suspended task list instead

+							of a delayed task list to ensure the task is not

+							woken by a timing event.  It will block

+							indefinitely. */

+							vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );

+						}

+						else

+						{

+							/* Calculate the time at which the task should be

+							woken if no notification events occur.  This may

+							overflow but this doesn't matter, the scheduler will

+							handle it. */

+							xTimeToWake = xTickCount + xTicksToWait;

+							prvAddCurrentTaskToDelayedList( xTimeToWake );

+						}

+					}

+					#else /* INCLUDE_vTaskSuspend */

+					{

+							/* Calculate the time at which the task should be

+							woken if the event does not occur.  This may

+							overflow but this doesn't matter, the scheduler will

+							handle it. */

+							xTimeToWake = xTickCount + xTicksToWait;

+							prvAddCurrentTaskToDelayedList( xTimeToWake );

+					}

+					#endif /* INCLUDE_vTaskSuspend */

+

+					traceTASK_NOTIFY_WAIT_BLOCK();

+

+					/* All ports are written to allow a yield in a critical

+					section (some will yield immediately, others wait until the

+					critical section exits) - but it is not something that

+					application code should ever do. */

+					portYIELD_WITHIN_API();

+				}

+				else

+				{

+					mtCOVERAGE_TEST_MARKER();

+				}

+			}

+			else

+			{

+				mtCOVERAGE_TEST_MARKER();

+			}

+		}

+		taskEXIT_CRITICAL();

+

+		taskENTER_CRITICAL();

+		{

+			traceTASK_NOTIFY_WAIT();

+

+			if( pulNotificationValue != NULL )

+			{

+				/* Output the current notification value, which may or may not

+				have changed. */

+				*pulNotificationValue = pxCurrentTCB->ulNotifiedValue;

+			}

+

+			/* If eNotifyValue is set then either the task never entered the

+			blocked state (because a notification was already pending) or the

+			task unblocked because of a notification.  Otherwise the task

+			unblocked because of a timeout. */

+			if( pxCurrentTCB->eNotifyState == eWaitingNotification )

+			{

+				/* A notification was not received. */

+				xReturn = pdFALSE;

+			}

+			else

+			{

+				/* A notification was already pending or a notification was

+				received while the task was waiting. */

+				pxCurrentTCB->ulNotifiedValue &= ~ulBitsToClearOnExit;

+				xReturn = pdTRUE;

+			}

+

+			pxCurrentTCB->eNotifyState = eNotWaitingNotification;

+		}

+		taskEXIT_CRITICAL();

+

+		return xReturn;

+	}

+

+#endif /* configUSE_TASK_NOTIFICATIONS */

+/*-----------------------------------------------------------*/

+

+#if( configUSE_TASK_NOTIFICATIONS == 1 )

+

+	BaseType_t xTaskGenericNotify( TaskHandle_t xTaskToNotify, uint32_t ulValue, eNotifyAction eAction, uint32_t *pulPreviousNotificationValue )

+	{

+	TCB_t * pxTCB;

+	eNotifyValue eOriginalNotifyState;

+	BaseType_t xReturn = pdPASS;

+

+		configASSERT( xTaskToNotify );

+		pxTCB = ( TCB_t * ) xTaskToNotify;

+

+		taskENTER_CRITICAL();

+		{

+			if( pulPreviousNotificationValue != NULL )

+			{

+				*pulPreviousNotificationValue = pxTCB->ulNotifiedValue;

+			}

+

+			eOriginalNotifyState = pxTCB->eNotifyState;

+

+			pxTCB->eNotifyState = eNotified;

+

+			switch( eAction )

+			{

+				case eSetBits	:

+					pxTCB->ulNotifiedValue |= ulValue;

+					break;

+

+				case eIncrement	:

+					( pxTCB->ulNotifiedValue )++;

+					break;

+

+				case eSetValueWithOverwrite	:

+					pxTCB->ulNotifiedValue = ulValue;

+					break;

+

+				case eSetValueWithoutOverwrite :

+					if( eOriginalNotifyState != eNotified )

+					{

+						pxTCB->ulNotifiedValue = ulValue;

+					}

+					else

+					{

+						/* The value could not be written to the task. */

+						xReturn = pdFAIL;

+					}

+					break;

+

+				case eNoAction:

+					/* The task is being notified without its notify value being

+					updated. */

+					break;

+			}

+

+			traceTASK_NOTIFY();

+

+			/* If the task is in the blocked state specifically to wait for a

+			notification then unblock it now. */

+			if( eOriginalNotifyState == eWaitingNotification )

+			{

+				( void ) uxListRemove( &( pxTCB->xGenericListItem ) );

+				prvAddTaskToReadyList( pxTCB );

+

+				/* The task should not have been on an event list. */

+				configASSERT( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) == NULL );

+

+				#if( configUSE_TICKLESS_IDLE != 0 )

+				{

+					/* If a task is blocked waiting for a notification then

+					xNextTaskUnblockTime might be set to the blocked task's time

+					out time.  If the task is unblocked for a reason other than

+					a timeout xNextTaskUnblockTime is normally left unchanged,

+					because it will automatically get reset to a new value when

+					the tick count equals xNextTaskUnblockTime.  However if

+					tickless idling is used it might be more important to enter

+					sleep mode at the earliest possible time - so reset

+					xNextTaskUnblockTime here to ensure it is updated at the

+					earliest possible time. */

+					prvResetNextTaskUnblockTime();

+				}

+				#endif

+

+				if( pxTCB->uxPriority > pxCurrentTCB->uxPriority )

+				{

+					/* The notified task has a priority above the currently

+					executing task so a yield is required. */

+					taskYIELD_IF_USING_PREEMPTION();

+				}

+				else

+				{

+					mtCOVERAGE_TEST_MARKER();

+				}

+			}

+			else

+			{

+				mtCOVERAGE_TEST_MARKER();

+			}

+		}

+		taskEXIT_CRITICAL();

+

+		return xReturn;

+	}

+

+#endif /* configUSE_TASK_NOTIFICATIONS */

+/*-----------------------------------------------------------*/

+

+#if( configUSE_TASK_NOTIFICATIONS == 1 )

+

+	BaseType_t xTaskGenericNotifyFromISR( TaskHandle_t xTaskToNotify, uint32_t ulValue, eNotifyAction eAction, uint32_t *pulPreviousNotificationValue, BaseType_t *pxHigherPriorityTaskWoken )

+	{

+	TCB_t * pxTCB;

+	eNotifyValue eOriginalNotifyState;

+	BaseType_t xReturn = pdPASS;

+	UBaseType_t uxSavedInterruptStatus;

+

+		configASSERT( xTaskToNotify );

+

+		/* RTOS ports that support interrupt nesting have the concept of a

+		maximum	system call (or maximum API call) interrupt priority.

+		Interrupts that are	above the maximum system call priority are keep

+		permanently enabled, even when the RTOS kernel is in a critical section,

+		but cannot make any calls to FreeRTOS API functions.  If configASSERT()

+		is defined in FreeRTOSConfig.h then

+		portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion

+		failure if a FreeRTOS API function is called from an interrupt that has

+		been assigned a priority above the configured maximum system call

+		priority.  Only FreeRTOS functions that end in FromISR can be called

+		from interrupts	that have been assigned a priority at or (logically)

+		below the maximum system call interrupt priority.  FreeRTOS maintains a

+		separate interrupt safe API to ensure interrupt entry is as fast and as

+		simple as possible.  More information (albeit Cortex-M specific) is

+		provided on the following link:

+		http://www.freertos.org/RTOS-Cortex-M3-M4.html */

+		portASSERT_IF_INTERRUPT_PRIORITY_INVALID();

+

+		pxTCB = ( TCB_t * ) xTaskToNotify;

+

+		uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();

+		{

+			if( pulPreviousNotificationValue != NULL )

+			{

+				*pulPreviousNotificationValue = pxTCB->ulNotifiedValue;

+			}

+

+			eOriginalNotifyState = pxTCB->eNotifyState;

+			pxTCB->eNotifyState = eNotified;

+

+			switch( eAction )

+			{

+				case eSetBits	:

+					pxTCB->ulNotifiedValue |= ulValue;

+					break;

+

+				case eIncrement	:

+					( pxTCB->ulNotifiedValue )++;

+					break;

+

+				case eSetValueWithOverwrite	:

+					pxTCB->ulNotifiedValue = ulValue;

+					break;

+

+				case eSetValueWithoutOverwrite :

+					if( eOriginalNotifyState != eNotified )

+					{

+						pxTCB->ulNotifiedValue = ulValue;

+					}

+					else

+					{

+						/* The value could not be written to the task. */

+						xReturn = pdFAIL;

+					}

+					break;

+

+				case eNoAction :

+					/* The task is being notified without its notify value being

+					updated. */

+					break;

+			}

+

+			traceTASK_NOTIFY_FROM_ISR();

+

+			/* If the task is in the blocked state specifically to wait for a

+			notification then unblock it now. */

+			if( eOriginalNotifyState == eWaitingNotification )

+			{

+				/* The task should not have been on an event list. */

+				configASSERT( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) == NULL );

+

+				if( uxSchedulerSuspended == ( UBaseType_t ) pdFALSE )

+				{

+					( void ) uxListRemove( &( pxTCB->xGenericListItem ) );

+					prvAddTaskToReadyList( pxTCB );

+				}

+				else

+				{

+					/* The delayed and ready lists cannot be accessed, so hold

+					this task pending until the scheduler is resumed. */

+					vListInsertEnd( &( xPendingReadyList ), &( pxTCB->xEventListItem ) );

+				}

+

+				if( pxTCB->uxPriority > pxCurrentTCB->uxPriority )

+				{

+					/* The notified task has a priority above the currently

+					executing task so a yield is required. */

+					if( pxHigherPriorityTaskWoken != NULL )

+					{

+						*pxHigherPriorityTaskWoken = pdTRUE;

+					}

+				}

+				else

+				{

+					mtCOVERAGE_TEST_MARKER();

+				}

+			}

+		}

+		portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );

+

+		return xReturn;

+	}

+

+#endif /* configUSE_TASK_NOTIFICATIONS */

+/*-----------------------------------------------------------*/

+

+#if( configUSE_TASK_NOTIFICATIONS == 1 )

+

+	void vTaskNotifyGiveFromISR( TaskHandle_t xTaskToNotify, BaseType_t *pxHigherPriorityTaskWoken )

+	{

+	TCB_t * pxTCB;

+	eNotifyValue eOriginalNotifyState;

+	UBaseType_t uxSavedInterruptStatus;

+

+		configASSERT( xTaskToNotify );

+

+		/* RTOS ports that support interrupt nesting have the concept of a

+		maximum	system call (or maximum API call) interrupt priority.

+		Interrupts that are	above the maximum system call priority are keep

+		permanently enabled, even when the RTOS kernel is in a critical section,

+		but cannot make any calls to FreeRTOS API functions.  If configASSERT()

+		is defined in FreeRTOSConfig.h then

+		portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion

+		failure if a FreeRTOS API function is called from an interrupt that has

+		been assigned a priority above the configured maximum system call

+		priority.  Only FreeRTOS functions that end in FromISR can be called

+		from interrupts	that have been assigned a priority at or (logically)

+		below the maximum system call interrupt priority.  FreeRTOS maintains a

+		separate interrupt safe API to ensure interrupt entry is as fast and as

+		simple as possible.  More information (albeit Cortex-M specific) is

+		provided on the following link:

+		http://www.freertos.org/RTOS-Cortex-M3-M4.html */

+		portASSERT_IF_INTERRUPT_PRIORITY_INVALID();

+

+		pxTCB = ( TCB_t * ) xTaskToNotify;

+

+		uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();

+		{

+			eOriginalNotifyState = pxTCB->eNotifyState;

+			pxTCB->eNotifyState = eNotified;

+

+			/* 'Giving' is equivalent to incrementing a count in a counting

+			semaphore. */

+			( pxTCB->ulNotifiedValue )++;

+

+			traceTASK_NOTIFY_GIVE_FROM_ISR();

+

+			/* If the task is in the blocked state specifically to wait for a

+			notification then unblock it now. */

+			if( eOriginalNotifyState == eWaitingNotification )

+			{

+				/* The task should not have been on an event list. */

+				configASSERT( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) == NULL );

+

+				if( uxSchedulerSuspended == ( UBaseType_t ) pdFALSE )

+				{

+					( void ) uxListRemove( &( pxTCB->xGenericListItem ) );

+					prvAddTaskToReadyList( pxTCB );

+				}

+				else

+				{

+					/* The delayed and ready lists cannot be accessed, so hold

+					this task pending until the scheduler is resumed. */

+					vListInsertEnd( &( xPendingReadyList ), &( pxTCB->xEventListItem ) );

+				}

+

+				if( pxTCB->uxPriority > pxCurrentTCB->uxPriority )

+				{

+					/* The notified task has a priority above the currently

+					executing task so a yield is required. */

+					if( pxHigherPriorityTaskWoken != NULL )

+					{

+						*pxHigherPriorityTaskWoken = pdTRUE;

+					}

+				}

+				else

+				{

+					mtCOVERAGE_TEST_MARKER();

+				}

+			}

+		}

+		portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );

+	}

+

+#endif /* configUSE_TASK_NOTIFICATIONS */

+

+/*-----------------------------------------------------------*/

+

+#if( configUSE_TASK_NOTIFICATIONS == 1 )

+

+	BaseType_t xTaskNotifyStateClear( TaskHandle_t xTask )

+	{

+	TCB_t *pxTCB;

+	BaseType_t xReturn;

+

+		pxTCB = ( TCB_t * ) xTask;

+

+		/* If null is passed in here then it is the calling task that is having

+		its notification state cleared. */

+		pxTCB = prvGetTCBFromHandle( pxTCB );

+

+		taskENTER_CRITICAL();

+		{

+			if( pxTCB->eNotifyState == eNotified )

+			{

+				pxTCB->eNotifyState = eNotWaitingNotification;

+				xReturn = pdPASS;

+			}

+			else

+			{

+				xReturn = pdFAIL;

+			}

+		}

+		taskEXIT_CRITICAL();

+

+		return xReturn;

+	}

+

+#endif /* configUSE_TASK_NOTIFICATIONS */

 

 #ifdef FREERTOS_MODULE_TEST

 	#include "tasks_test_access_functions.h"