]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/tasks.c
If tickless idle mode is in use then ensure prvResetNextTaskUnblockTime() is called...
[freertos] / FreeRTOS / Source / tasks.c
index bd767423c00a558f7b998244fe66dbcfa554e0dc..e62b388602fcaec3178b6791d746295fb22f4be7 100644 (file)
@@ -1,71 +1,29 @@
 /*\r
-    FreeRTOS V8.2.2 - Copyright (C) 2015 Real Time Engineers Ltd.\r
-    All rights reserved\r
-\r
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\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
-\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
-\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 on the following\r
-    link: http://www.freertos.org/a00114.html\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS provides completely free yet professionally developed,    *\r
-     *    robust, strictly quality controlled, supported, and cross          *\r
-     *    platform software that is more than just the market leader, it     *\r
-     *    is the industry's de facto standard.                               *\r
-     *                                                                       *\r
-     *    Help yourself get started quickly while simultaneously helping     *\r
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
-     *    tutorial book, reference manual, or both:                          *\r
-     *    http://www.FreeRTOS.org/Documentation                              *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
-    the FAQ page "My application does not run, what could be wrong?".  Have you\r
-    defined configASSERT()?\r
-\r
-    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
-    embedded software for free we request you assist our global community by\r
-    participating in the support forum.\r
-\r
-    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
-    be as productive as possible as early as possible.  Now you can receive\r
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
-    Ltd, and the world's leading authority on the world's leading RTOS.\r
-\r
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\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.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
-    licenses offer ticketed support, indemnification and commercial middleware.\r
-\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
+ * FreeRTOS Kernel V10.2.1\r
+ * Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
+ * this software and associated documentation files (the "Software"), to deal in\r
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in all\r
+ * copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r
 \r
 /* Standard includes. */\r
 #include <stdlib.h>\r
@@ -80,13 +38,13 @@ task.h is included from an application file. */
 #include "FreeRTOS.h"\r
 #include "task.h"\r
 #include "timers.h"\r
-#include "StackMacros.h"\r
+#include "stack_macros.h"\r
 \r
-/* Lint e961 and e750 are suppressed as a MISRA exception justified because the\r
-MPU ports require MPU_WRAPPERS_INCLUDED_FROM_API_FILE to be defined for the\r
-header files above, but not in this file, in order to generate the correct\r
-privileged Vs unprivileged linkage and placement. */\r
-#undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE /*lint !e961 !e750. */\r
+/* Lint e9021, e961 and e750 are suppressed as a MISRA exception justified\r
+because the MPU ports require MPU_WRAPPERS_INCLUDED_FROM_API_FILE to be defined\r
+for the header files above, but not in this file, in order to generate the\r
+correct privileged Vs unprivileged linkage and placement. */\r
+#undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE /*lint !e961 !e750 !e9021. */\r
 \r
 /* Set configUSE_STATS_FORMATTING_FUNCTIONS to 2 to include the stats formatting\r
 functions but without including stdio.h here. */\r
@@ -98,18 +56,6 @@ functions but without including stdio.h here. */
        #include <stdio.h>\r
 #endif /* configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) */\r
 \r
-/* Sanity check the configuration. */\r
-#if( configUSE_TICKLESS_IDLE != 0 )\r
-       #if( INCLUDE_vTaskSuspend != 1 )\r
-               #error INCLUDE_vTaskSuspend must be set to 1 if configUSE_TICKLESS_IDLE is not set to 0\r
-       #endif /* INCLUDE_vTaskSuspend */\r
-#endif /* configUSE_TICKLESS_IDLE */\r
-\r
-/*\r
- * Defines the size, in words, of the stack allocated to the idle task.\r
- */\r
-#define tskIDLE_STACK_SIZE     configMINIMAL_STACK_SIZE\r
-\r
 #if( configUSE_PREEMPTION == 0 )\r
        /* If the cooperative scheduler is being used then a yield should not be\r
        performed just because a higher priority task has been woken. */\r
@@ -118,157 +64,10 @@ functions but without including stdio.h here. */
        #define taskYIELD_IF_USING_PREEMPTION() portYIELD_WITHIN_API()\r
 #endif\r
 \r
-/* Value that can be assigned to the eNotifyState member of the TCB. */\r
-typedef enum\r
-{\r
-       eNotWaitingNotification = 0,\r
-       eWaitingNotification,\r
-       eNotified\r
-} eNotifyValue;\r
-\r
-/*\r
- * Task control block.  A task control block (TCB) is allocated for each task,\r
- * and stores task state information, including a pointer to the task's context\r
- * (the task's run time environment, including register values)\r
- */\r
-typedef struct tskTaskControlBlock\r
-{\r
-       volatile StackType_t    *pxTopOfStack;  /*< Points to the location of the last item placed on the tasks stack.  THIS MUST BE THE FIRST MEMBER OF THE TCB STRUCT. */\r
-\r
-       #if ( portUSING_MPU_WRAPPERS == 1 )\r
-               xMPU_SETTINGS   xMPUSettings;           /*< The MPU settings are defined as part of the port layer.  THIS MUST BE THE SECOND MEMBER OF THE TCB STRUCT. */\r
-               BaseType_t              xUsingStaticallyAllocatedStack; /* Set to pdTRUE if the stack is a statically allocated array, and pdFALSE if the stack is dynamically allocated. */\r
-       #endif\r
-\r
-       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 ). */\r
-       ListItem_t                      xEventListItem;         /*< Used to reference a task from an event list. */\r
-       UBaseType_t                     uxPriority;                     /*< The priority of the task.  0 is the lowest priority. */\r
-       StackType_t                     *pxStack;                       /*< Points to the start of the stack. */\r
-       char                            pcTaskName[ configMAX_TASK_NAME_LEN ];/*< Descriptive name given to the task when created.  Facilitates debugging only. */ /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
-\r
-       #if ( portSTACK_GROWTH > 0 )\r
-               StackType_t             *pxEndOfStack;          /*< Points to the end of the stack on architectures where the stack grows up from low memory. */\r
-       #endif\r
-\r
-       #if ( portCRITICAL_NESTING_IN_TCB == 1 )\r
-               UBaseType_t     uxCriticalNesting;      /*< Holds the critical section nesting depth for ports that do not maintain their own count in the port layer. */\r
-       #endif\r
-\r
-       #if ( configUSE_TRACE_FACILITY == 1 )\r
-               UBaseType_t             uxTCBNumber;            /*< Stores a number that increments each time a TCB is created.  It allows debuggers to determine when a task has been deleted and then recreated. */\r
-               UBaseType_t     uxTaskNumber;           /*< Stores a number specifically for use by third party trace code. */\r
-       #endif\r
-\r
-       #if ( configUSE_MUTEXES == 1 )\r
-               UBaseType_t     uxBasePriority;         /*< The priority last assigned to the task - used by the priority inheritance mechanism. */\r
-               UBaseType_t     uxMutexesHeld;\r
-       #endif\r
-\r
-       #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
-               TaskHookFunction_t pxTaskTag;\r
-       #endif\r
-\r
-       #if( configNUM_THREAD_LOCAL_STORAGE_POINTERS > 0 )\r
-               void *pvThreadLocalStoragePointers[ configNUM_THREAD_LOCAL_STORAGE_POINTERS ];\r
-       #endif\r
-\r
-       #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
-               uint32_t                ulRunTimeCounter;       /*< Stores the amount of time the task has spent in the Running state. */\r
-       #endif\r
-\r
-       #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
-               /* Allocate a Newlib reent structure that is specific to this task.\r
-               Note Newlib support has been included by popular demand, but is not\r
-               used by the FreeRTOS maintainers themselves.  FreeRTOS is not\r
-               responsible for resulting newlib operation.  User must be familiar with\r
-               newlib and must provide system-wide implementations of the necessary\r
-               stubs. Be warned that (at the time of writing) the current newlib design\r
-               implements a system-wide malloc() that must be provided with locks. */\r
-               struct  _reent xNewLib_reent;\r
-       #endif\r
-\r
-       #if ( configUSE_TASK_NOTIFICATIONS == 1 )\r
-               volatile uint32_t ulNotifiedValue;\r
-               volatile eNotifyValue eNotifyState;\r
-       #endif\r
-\r
-} tskTCB;\r
-\r
-/* The old tskTCB name is maintained above then typedefed to the new TCB_t name\r
-below to enable the use of older kernel aware debuggers. */\r
-typedef tskTCB TCB_t;\r
-\r
-/*\r
- * Some kernel aware debuggers require the data the debugger needs access to to\r
- * be global, rather than file scope.\r
- */\r
-#ifdef portREMOVE_STATIC_QUALIFIER\r
-       #define static\r
-#endif\r
-\r
-/*lint -e956 A manual analysis and inspection has been used to determine which\r
-static variables must be declared volatile. */\r
-\r
-PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;\r
-\r
-/* Lists for ready and blocked tasks. --------------------*/\r
-PRIVILEGED_DATA static List_t pxReadyTasksLists[ configMAX_PRIORITIES ];/*< Prioritised ready tasks. */\r
-PRIVILEGED_DATA static List_t xDelayedTaskList1;                                               /*< Delayed tasks. */\r
-PRIVILEGED_DATA static List_t xDelayedTaskList2;                                               /*< Delayed tasks (two lists are used - one for delays that have overflowed the current tick count. */\r
-PRIVILEGED_DATA static List_t * volatile pxDelayedTaskList;                            /*< Points to the delayed task list currently being used. */\r
-PRIVILEGED_DATA static List_t * volatile pxOverflowDelayedTaskList;            /*< Points to the delayed task list currently being used to hold tasks that have overflowed the current tick count. */\r
-PRIVILEGED_DATA static List_t xPendingReadyList;                                               /*< Tasks that have been readied while the scheduler was suspended.  They will be moved to the ready list when the scheduler is resumed. */\r
-\r
-#if ( INCLUDE_vTaskDelete == 1 )\r
-\r
-       PRIVILEGED_DATA static List_t xTasksWaitingTermination;                         /*< Tasks that have been deleted - but their memory not yet freed. */\r
-       PRIVILEGED_DATA static volatile UBaseType_t uxTasksDeleted = ( UBaseType_t ) 0U;\r
-\r
-#endif\r
-\r
-#if ( INCLUDE_vTaskSuspend == 1 )\r
-\r
-       PRIVILEGED_DATA static List_t xSuspendedTaskList;                                       /*< Tasks that are currently suspended. */\r
-\r
-#endif\r
-\r
-#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )\r
-\r
-       PRIVILEGED_DATA static TaskHandle_t xIdleTaskHandle = NULL;                     /*< Holds the handle of the idle task.  The idle task is created automatically when the scheduler is started. */\r
-\r
-#endif\r
-\r
-/* Other file private variables. --------------------------------*/\r
-PRIVILEGED_DATA static volatile UBaseType_t uxCurrentNumberOfTasks     = ( UBaseType_t ) 0U;\r
-PRIVILEGED_DATA static volatile TickType_t xTickCount                          = ( TickType_t ) 0U;\r
-PRIVILEGED_DATA static volatile UBaseType_t uxTopReadyPriority                 = tskIDLE_PRIORITY;\r
-PRIVILEGED_DATA static volatile BaseType_t xSchedulerRunning           = pdFALSE;\r
-PRIVILEGED_DATA static volatile UBaseType_t uxPendedTicks                      = ( UBaseType_t ) 0U;\r
-PRIVILEGED_DATA static volatile BaseType_t xYieldPending                       = pdFALSE;\r
-PRIVILEGED_DATA static volatile BaseType_t xNumOfOverflows                     = ( BaseType_t ) 0;\r
-PRIVILEGED_DATA static UBaseType_t uxTaskNumber                                        = ( UBaseType_t ) 0U;\r
-PRIVILEGED_DATA static volatile TickType_t xNextTaskUnblockTime                = ( TickType_t ) 0U; /* Initialised to portMAX_DELAY before the scheduler starts. */\r
-\r
-/* Context switches are held pending while the scheduler is suspended.  Also,\r
-interrupts must not manipulate the xGenericListItem of a TCB, or any of the\r
-lists the xGenericListItem can be referenced from, if the scheduler is suspended.\r
-If an interrupt needs to unblock a task while the scheduler is suspended then it\r
-moves the task's event list item into the xPendingReadyList, ready for the\r
-kernel to move the task from the pending ready list into the real ready list\r
-when the scheduler is unsuspended.  The pending ready list itself can only be\r
-accessed from a critical section. */\r
-PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended       = ( UBaseType_t ) pdFALSE;\r
-\r
-#if ( configGENERATE_RUN_TIME_STATS == 1 )\r
-\r
-       PRIVILEGED_DATA static uint32_t ulTaskSwitchedInTime = 0UL;     /*< Holds the value of a timer/counter the last time a task was switched in. */\r
-       PRIVILEGED_DATA static uint32_t ulTotalRunTime = 0UL;           /*< Holds the total amount of execution time as defined by the run time counter clock. */\r
-\r
-#endif\r
-\r
-/*lint +e956 */\r
-\r
-/* Debugging and trace facilities private variables and macros. ------------*/\r
+/* Values that can be assigned to the ucNotifyState member of the TCB. */\r
+#define taskNOT_WAITING_NOTIFICATION   ( ( uint8_t ) 0 )\r
+#define taskWAITING_NOTIFICATION               ( ( uint8_t ) 1 )\r
+#define taskNOTIFICATION_RECEIVED              ( ( uint8_t ) 2 )\r
 \r
 /*\r
  * The value used to fill the stack of a task when the task is created.  This\r
@@ -276,15 +75,42 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended   = ( UBaseType_t
  */\r
 #define tskSTACK_FILL_BYTE     ( 0xa5U )\r
 \r
+/* Bits used to recored how a task's stack and TCB were allocated. */\r
+#define tskDYNAMICALLY_ALLOCATED_STACK_AND_TCB                 ( ( uint8_t ) 0 )\r
+#define tskSTATICALLY_ALLOCATED_STACK_ONLY                     ( ( uint8_t ) 1 )\r
+#define tskSTATICALLY_ALLOCATED_STACK_AND_TCB          ( ( uint8_t ) 2 )\r
+\r
+/* If any of the following are set then task stacks are filled with a known\r
+value so the high water mark can be determined.  If none of the following are\r
+set then don't fill the stack so there is no unnecessary dependency on memset. */\r
+#if( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) )\r
+       #define tskSET_NEW_STACKS_TO_KNOWN_VALUE        1\r
+#else\r
+       #define tskSET_NEW_STACKS_TO_KNOWN_VALUE        0\r
+#endif\r
+\r
 /*\r
  * Macros used by vListTask to indicate which state a task is in.\r
  */\r
+#define tskRUNNING_CHAR                ( 'X' )\r
 #define tskBLOCKED_CHAR                ( 'B' )\r
 #define tskREADY_CHAR          ( 'R' )\r
 #define tskDELETED_CHAR                ( 'D' )\r
 #define tskSUSPENDED_CHAR      ( 'S' )\r
 \r
-/*-----------------------------------------------------------*/\r
+/*\r
+ * Some kernel aware debuggers require the data the debugger needs access to be\r
+ * global, rather than file scope.\r
+ */\r
+#ifdef portREMOVE_STATIC_QUALIFIER\r
+       #define static\r
+#endif\r
+\r
+/* The name allocated to the Idle task.  This can be overridden by defining\r
+configIDLE_TASK_NAME in FreeRTOSConfig.h. */\r
+#ifndef configIDLE_TASK_NAME\r
+       #define configIDLE_TASK_NAME "IDLE"\r
+#endif\r
 \r
 #if ( configUSE_PORT_OPTIMISED_TASK_SELECTION == 0 )\r
 \r
@@ -306,16 +132,19 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended  = ( UBaseType_t
 \r
        #define taskSELECT_HIGHEST_PRIORITY_TASK()                                                                                                                      \\r
        {                                                                                                                                                                                                       \\r
+       UBaseType_t uxTopPriority = uxTopReadyPriority;                                                                                                         \\r
+                                                                                                                                                                                                               \\r
                /* Find the highest priority queue that contains ready tasks. */                                                                \\r
-               while( listLIST_IS_EMPTY( &( pxReadyTasksLists[ uxTopReadyPriority ] ) ) )                                              \\r
+               while( listLIST_IS_EMPTY( &( pxReadyTasksLists[ uxTopPriority ] ) ) )                                                   \\r
                {                                                                                                                                                                                               \\r
-                       configASSERT( uxTopReadyPriority );                                                                                                                     \\r
-                       --uxTopReadyPriority;                                                                                                                                           \\r
+                       configASSERT( uxTopPriority );                                                                                                                          \\r
+                       --uxTopPriority;                                                                                                                                                        \\r
                }                                                                                                                                                                                               \\r
                                                                                                                                                                                                                \\r
                /* listGET_OWNER_OF_NEXT_ENTRY indexes through the list, so the tasks of                                                \\r
                the     same priority get an equal share of the processor time. */                                                                      \\r
-               listGET_OWNER_OF_NEXT_ENTRY( pxCurrentTCB, &( pxReadyTasksLists[ uxTopReadyPriority ] ) );              \\r
+               listGET_OWNER_OF_NEXT_ENTRY( pxCurrentTCB, &( pxReadyTasksLists[ uxTopPriority ] ) );                   \\r
+               uxTopReadyPriority = uxTopPriority;                                                                                                                             \\r
        } /* taskSELECT_HIGHEST_PRIORITY_TASK */\r
 \r
        /*-----------------------------------------------------------*/\r
@@ -341,7 +170,7 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended    = ( UBaseType_t
        {                                                                                                                                                                                               \\r
        UBaseType_t uxTopPriority;                                                                                                                                              \\r
                                                                                                                                                                                                        \\r
-               /* Find the highest priority queue that contains ready tasks. */                                                        \\r
+               /* Find the highest priority list that contains ready tasks. */                                                         \\r
                portGET_HIGHEST_PRIORITY( uxTopPriority, uxTopReadyPriority );                                                          \\r
                configASSERT( listCURRENT_LIST_LENGTH( &( pxReadyTasksLists[ uxTopPriority ] ) ) > 0 );         \\r
                listGET_OWNER_OF_NEXT_ENTRY( pxCurrentTCB, &( pxReadyTasksLists[ uxTopPriority ] ) );           \\r
@@ -389,7 +218,8 @@ count overflows. */
 #define prvAddTaskToReadyList( pxTCB )                                                                                                                         \\r
        traceMOVED_TASK_TO_READY_STATE( pxTCB );                                                                                                                \\r
        taskRECORD_READY_PRIORITY( ( pxTCB )->uxPriority );                                                                                             \\r
-       vListInsertEnd( &( pxReadyTasksLists[ ( pxTCB )->uxPriority ] ), &( ( pxTCB )->xGenericListItem ) )\r
+       vListInsertEnd( &( pxReadyTasksLists[ ( pxTCB )->uxPriority ] ), &( ( pxTCB )->xStateListItem ) ); \\r
+       tracePOST_MOVED_TASK_TO_READY_STATE( pxTCB )\r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
@@ -398,7 +228,7 @@ count overflows. */
  * task should be used in place of the parameter.  This macro simply checks to\r
  * see if the parameter is NULL and returns a pointer to the appropriate TCB.\r
  */\r
-#define prvGetTCBFromHandle( pxHandle ) ( ( ( pxHandle ) == NULL ) ? ( TCB_t * ) pxCurrentTCB : ( TCB_t * ) ( pxHandle ) )\r
+#define prvGetTCBFromHandle( pxHandle ) ( ( ( pxHandle ) == NULL ) ? pxCurrentTCB : ( pxHandle ) )\r
 \r
 /* The item value of the event list item is normally used to hold the priority\r
 of the task to which it belongs (coded to allow it to be held in reverse\r
@@ -408,28 +238,189 @@ being used for another purpose.  The following bit definition is used to inform
 the scheduler that the value should not be changed - in which case it is the\r
 responsibility of whichever module is using the value to ensure it gets set back\r
 to its original value when it is released. */\r
-#if configUSE_16_BIT_TICKS == 1\r
+#if( configUSE_16_BIT_TICKS == 1 )\r
        #define taskEVENT_LIST_ITEM_VALUE_IN_USE        0x8000U\r
 #else\r
        #define taskEVENT_LIST_ITEM_VALUE_IN_USE        0x80000000UL\r
 #endif\r
 \r
+/*\r
+ * Task control block.  A task control block (TCB) is allocated for each task,\r
+ * and stores task state information, including a pointer to the task's context\r
+ * (the task's run time environment, including register values)\r
+ */\r
+typedef struct tskTaskControlBlock                     /* The old naming convention is used to prevent breaking kernel aware debuggers. */\r
+{\r
+       volatile StackType_t    *pxTopOfStack;  /*< Points to the location of the last item placed on the tasks stack.  THIS MUST BE THE FIRST MEMBER OF THE TCB STRUCT. */\r
+\r
+       #if ( portUSING_MPU_WRAPPERS == 1 )\r
+               xMPU_SETTINGS   xMPUSettings;           /*< The MPU settings are defined as part of the port layer.  THIS MUST BE THE SECOND MEMBER OF THE TCB STRUCT. */\r
+       #endif\r
+\r
+       ListItem_t                      xStateListItem; /*< The list that the state list item of a task is reference from denotes the state of that task (Ready, Blocked, Suspended ). */\r
+       ListItem_t                      xEventListItem;         /*< Used to reference a task from an event list. */\r
+       UBaseType_t                     uxPriority;                     /*< The priority of the task.  0 is the lowest priority. */\r
+       StackType_t                     *pxStack;                       /*< Points to the start of the stack. */\r
+       char                            pcTaskName[ configMAX_TASK_NAME_LEN ];/*< Descriptive name given to the task when created.  Facilitates debugging only. */ /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+\r
+       #if ( ( portSTACK_GROWTH > 0 ) || ( configRECORD_STACK_HIGH_ADDRESS == 1 ) )\r
+               StackType_t             *pxEndOfStack;          /*< Points to the highest valid address for the stack. */\r
+       #endif\r
+\r
+       #if ( portCRITICAL_NESTING_IN_TCB == 1 )\r
+               UBaseType_t             uxCriticalNesting;      /*< Holds the critical section nesting depth for ports that do not maintain their own count in the port layer. */\r
+       #endif\r
+\r
+       #if ( configUSE_TRACE_FACILITY == 1 )\r
+               UBaseType_t             uxTCBNumber;            /*< Stores a number that increments each time a TCB is created.  It allows debuggers to determine when a task has been deleted and then recreated. */\r
+               UBaseType_t             uxTaskNumber;           /*< Stores a number specifically for use by third party trace code. */\r
+       #endif\r
+\r
+       #if ( configUSE_MUTEXES == 1 )\r
+               UBaseType_t             uxBasePriority;         /*< The priority last assigned to the task - used by the priority inheritance mechanism. */\r
+               UBaseType_t             uxMutexesHeld;\r
+       #endif\r
+\r
+       #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
+               TaskHookFunction_t pxTaskTag;\r
+       #endif\r
+\r
+       #if( configNUM_THREAD_LOCAL_STORAGE_POINTERS > 0 )\r
+               void                    *pvThreadLocalStoragePointers[ configNUM_THREAD_LOCAL_STORAGE_POINTERS ];\r
+       #endif\r
+\r
+       #if( configGENERATE_RUN_TIME_STATS == 1 )\r
+               uint32_t                ulRunTimeCounter;       /*< Stores the amount of time the task has spent in the Running state. */\r
+       #endif\r
+\r
+       #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
+               /* Allocate a Newlib reent structure that is specific to this task.\r
+               Note Newlib support has been included by popular demand, but is not\r
+               used by the FreeRTOS maintainers themselves.  FreeRTOS is not\r
+               responsible for resulting newlib operation.  User must be familiar with\r
+               newlib and must provide system-wide implementations of the necessary\r
+               stubs. Be warned that (at the time of writing) the current newlib design\r
+               implements a system-wide malloc() that must be provided with locks.\r
+\r
+               See the third party link http://www.nadler.com/embedded/newlibAndFreeRTOS.html\r
+               for additional information. */\r
+               struct  _reent xNewLib_reent;\r
+       #endif\r
+\r
+       #if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+               volatile uint32_t ulNotifiedValue;\r
+               volatile uint8_t ucNotifyState;\r
+       #endif\r
+\r
+       /* See the comments in FreeRTOS.h with the definition of\r
+       tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE. */\r
+       #if( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE != 0 ) /*lint !e731 !e9029 Macro has been consolidated for readability reasons. */\r
+               uint8_t ucStaticallyAllocated;          /*< Set to pdTRUE if the task is a statically allocated to ensure no attempt is made to free the memory. */\r
+       #endif\r
+\r
+       #if( INCLUDE_xTaskAbortDelay == 1 )\r
+               uint8_t ucDelayAborted;\r
+       #endif\r
+\r
+       #if( configUSE_POSIX_ERRNO == 1 )\r
+               int iTaskErrno;\r
+       #endif\r
+\r
+} tskTCB;\r
+\r
+/* The old tskTCB name is maintained above then typedefed to the new TCB_t name\r
+below to enable the use of older kernel aware debuggers. */\r
+typedef tskTCB TCB_t;\r
+\r
+/*lint -save -e956 A manual analysis and inspection has been used to determine\r
+which static variables must be declared volatile. */\r
+PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;\r
+\r
+/* Lists for ready and blocked tasks. --------------------\r
+xDelayedTaskList1 and xDelayedTaskList2 could be move to function scople but\r
+doing so breaks some kernel aware debuggers and debuggers that rely on removing\r
+the static qualifier. */\r
+PRIVILEGED_DATA static List_t pxReadyTasksLists[ configMAX_PRIORITIES ];/*< Prioritised ready tasks. */\r
+PRIVILEGED_DATA static List_t xDelayedTaskList1;                                               /*< Delayed tasks. */\r
+PRIVILEGED_DATA static List_t xDelayedTaskList2;                                               /*< Delayed tasks (two lists are used - one for delays that have overflowed the current tick count. */\r
+PRIVILEGED_DATA static List_t * volatile pxDelayedTaskList;                            /*< Points to the delayed task list currently being used. */\r
+PRIVILEGED_DATA static List_t * volatile pxOverflowDelayedTaskList;            /*< Points to the delayed task list currently being used to hold tasks that have overflowed the current tick count. */\r
+PRIVILEGED_DATA static List_t xPendingReadyList;                                               /*< Tasks that have been readied while the scheduler was suspended.  They will be moved to the ready list when the scheduler is resumed. */\r
+\r
+#if( INCLUDE_vTaskDelete == 1 )\r
+\r
+       PRIVILEGED_DATA static List_t xTasksWaitingTermination;                         /*< Tasks that have been deleted - but their memory not yet freed. */\r
+       PRIVILEGED_DATA static volatile UBaseType_t uxDeletedTasksWaitingCleanUp = ( UBaseType_t ) 0U;\r
+\r
+#endif\r
+\r
+#if ( INCLUDE_vTaskSuspend == 1 )\r
+\r
+       PRIVILEGED_DATA static List_t xSuspendedTaskList;                                       /*< Tasks that are currently suspended. */\r
+\r
+#endif\r
+\r
+/* Global POSIX errno. Its value is changed upon context switching to match\r
+the errno of the currently running task. */\r
+#if ( configUSE_POSIX_ERRNO == 1 )\r
+       int FreeRTOS_errno = 0;\r
+#endif\r
+\r
+/* Other file private variables. --------------------------------*/\r
+PRIVILEGED_DATA static volatile UBaseType_t uxCurrentNumberOfTasks     = ( UBaseType_t ) 0U;\r
+PRIVILEGED_DATA static volatile TickType_t xTickCount                          = ( TickType_t ) configINITIAL_TICK_COUNT;\r
+PRIVILEGED_DATA static volatile UBaseType_t uxTopReadyPriority                 = tskIDLE_PRIORITY;\r
+PRIVILEGED_DATA static volatile BaseType_t xSchedulerRunning           = pdFALSE;\r
+PRIVILEGED_DATA static volatile TickType_t xPendedTicks                        = ( TickType_t ) 0U;\r
+PRIVILEGED_DATA static volatile BaseType_t xYieldPending                       = pdFALSE;\r
+PRIVILEGED_DATA static volatile BaseType_t xNumOfOverflows                     = ( BaseType_t ) 0;\r
+PRIVILEGED_DATA static UBaseType_t uxTaskNumber                                        = ( UBaseType_t ) 0U;\r
+PRIVILEGED_DATA static volatile TickType_t xNextTaskUnblockTime                = ( TickType_t ) 0U; /* Initialised to portMAX_DELAY before the scheduler starts. */\r
+PRIVILEGED_DATA static TaskHandle_t xIdleTaskHandle                                    = NULL;                 /*< Holds the handle of the idle task.  The idle task is created automatically when the scheduler is started. */\r
+\r
+/* Context switches are held pending while the scheduler is suspended.  Also,\r
+interrupts must not manipulate the xStateListItem of a TCB, or any of the\r
+lists the xStateListItem can be referenced from, if the scheduler is suspended.\r
+If an interrupt needs to unblock a task while the scheduler is suspended then it\r
+moves the task's event list item into the xPendingReadyList, ready for the\r
+kernel to move the task from the pending ready list into the real ready list\r
+when the scheduler is unsuspended.  The pending ready list itself can only be\r
+accessed from a critical section. */\r
+PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended       = ( UBaseType_t ) pdFALSE;\r
+\r
+#if ( configGENERATE_RUN_TIME_STATS == 1 )\r
+\r
+       /* Do not move these variables to function scope as doing so prevents the\r
+       code working with debuggers that need to remove the static qualifier. */\r
+       PRIVILEGED_DATA static uint32_t ulTaskSwitchedInTime = 0UL;     /*< Holds the value of a timer/counter the last time a task was switched in. */\r
+       PRIVILEGED_DATA static uint32_t ulTotalRunTime = 0UL;           /*< Holds the total amount of execution time as defined by the run time counter clock. */\r
+\r
+#endif\r
+\r
+/*lint -restore */\r
+\r
+/*-----------------------------------------------------------*/\r
+\r
 /* Callback function prototypes. --------------------------*/\r
-#if configCHECK_FOR_STACK_OVERFLOW > 0\r
+#if(  configCHECK_FOR_STACK_OVERFLOW > 0 )\r
+\r
        extern void vApplicationStackOverflowHook( TaskHandle_t xTask, char *pcTaskName );\r
+\r
 #endif\r
 \r
-#if configUSE_TICK_HOOK > 0\r
-       extern void vApplicationTickHook( void );\r
+#if( configUSE_TICK_HOOK > 0 )\r
+\r
+       extern void vApplicationTickHook( void ); /*lint !e526 Symbol not defined as it is an application callback. */\r
+\r
 #endif\r
 \r
-/* File private functions. --------------------------------*/\r
+#if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
 \r
-/*\r
- * Utility to ready a TCB for a given task.  Mainly just copies the parameters\r
- * into the TCB structure.\r
- */\r
-static void prvInitialiseTCBVariables( TCB_t * const pxTCB, const char * const pcName, UBaseType_t uxPriority, const MemoryRegion_t * const xRegions, const uint16_t usStackDepth ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+       extern void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize ); /*lint !e526 Symbol not defined as it is an application callback. */\r
+\r
+#endif\r
+\r
+/* File private functions. --------------------------------*/\r
 \r
 /**\r
  * Utility task that simply returns pdTRUE if the task referenced by xTask is\r
@@ -437,7 +428,9 @@ static void prvInitialiseTCBVariables( TCB_t * const pxTCB, const char * const p
  * is in any other state.\r
  */\r
 #if ( INCLUDE_vTaskSuspend == 1 )\r
+\r
        static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask ) PRIVILEGED_FUNCTION;\r
+\r
 #endif /* INCLUDE_vTaskSuspend */\r
 \r
 /*\r
@@ -483,13 +476,7 @@ static void prvCheckTasksWaitingTermination( void ) PRIVILEGED_FUNCTION;
  * The currently executing task is entering the Blocked state.  Add the task to\r
  * either the current or the overflow delayed task list.\r
  */\r
-static void prvAddCurrentTaskToDelayedList( const TickType_t xTimeToWake ) PRIVILEGED_FUNCTION;\r
-\r
-/*\r
- * Allocates memory from the heap for a TCB and associated stack.  Checks the\r
- * allocation was successful.\r
- */\r
-static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t * const puxStackBuffer ) PRIVILEGED_FUNCTION;\r
+static void prvAddCurrentTaskToDelayedList( TickType_t xTicksToWait, const BaseType_t xCanBlockIndefinitely ) PRIVILEGED_FUNCTION;\r
 \r
 /*\r
  * Fills an TaskStatus_t structure with information on each task that is\r
@@ -501,7 +488,17 @@ static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t *
  */\r
 #if ( configUSE_TRACE_FACILITY == 1 )\r
 \r
-       static UBaseType_t prvListTaskWithinSingleList( TaskStatus_t *pxTaskStatusArray, List_t *pxList, eTaskState eState ) PRIVILEGED_FUNCTION;\r
+       static UBaseType_t prvListTasksWithinSingleList( TaskStatus_t *pxTaskStatusArray, List_t *pxList, eTaskState eState ) PRIVILEGED_FUNCTION;\r
+\r
+#endif\r
+\r
+/*\r
+ * Searches pxList for a task with name pcNameToQuery - returning a handle to\r
+ * the task if it is found, or NULL if the task is not found.\r
+ */\r
+#if ( INCLUDE_xTaskGetHandle == 1 )\r
+\r
+       static TCB_t *prvSearchForNameWithinSingleList( List_t *pxList, const char pcNameToQuery[] ) PRIVILEGED_FUNCTION;\r
 \r
 #endif\r
 \r
@@ -510,159 +507,608 @@ static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t *
  * This function determines the 'high water mark' of the task stack by\r
  * determining how much of the stack remains at the original preset value.\r
  */\r
-#if ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) )\r
+#if ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) )\r
+\r
+       static configSTACK_DEPTH_TYPE prvTaskCheckFreeStackSpace( const uint8_t * pucStackByte ) PRIVILEGED_FUNCTION;\r
+\r
+#endif\r
+\r
+/*\r
+ * Return the amount of time, in ticks, that will pass before the kernel will\r
+ * next move a task from the Blocked state to the Running state.\r
+ *\r
+ * This conditional compilation should use inequality to 0, not equality to 1.\r
+ * This is to ensure portSUPPRESS_TICKS_AND_SLEEP() can be called when user\r
+ * defined low power mode implementations require configUSE_TICKLESS_IDLE to be\r
+ * set to a value other than 1.\r
+ */\r
+#if ( configUSE_TICKLESS_IDLE != 0 )\r
+\r
+       static TickType_t prvGetExpectedIdleTime( void ) PRIVILEGED_FUNCTION;\r
+\r
+#endif\r
+\r
+/*\r
+ * Set xNextTaskUnblockTime to the time at which the next Blocked state task\r
+ * will exit the Blocked state.\r
+ */\r
+static void prvResetNextTaskUnblockTime( void );\r
+\r
+#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )\r
+\r
+       /*\r
+        * Helper function used to pad task names with spaces when printing out\r
+        * human readable tables of task information.\r
+        */\r
+       static char *prvWriteNameToBuffer( char *pcBuffer, const char *pcTaskName ) PRIVILEGED_FUNCTION;\r
+\r
+#endif\r
+\r
+/*\r
+ * Called after a Task_t structure has been allocated either statically or\r
+ * dynamically to fill in the structure's members.\r
+ */\r
+static void prvInitialiseNewTask(      TaskFunction_t pxTaskCode,\r
+                                                                       const char * const pcName,              /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+                                                                       const uint32_t ulStackDepth,\r
+                                                                       void * const pvParameters,\r
+                                                                       UBaseType_t uxPriority,\r
+                                                                       TaskHandle_t * const pxCreatedTask,\r
+                                                                       TCB_t *pxNewTCB,\r
+                                                                       const MemoryRegion_t * const xRegions ) PRIVILEGED_FUNCTION;\r
+\r
+/*\r
+ * Called after a new task has been created and initialised to place the task\r
+ * under the control of the scheduler.\r
+ */\r
+static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB ) PRIVILEGED_FUNCTION;\r
+\r
+/*\r
+ * freertos_tasks_c_additions_init() should only be called if the user definable\r
+ * macro FREERTOS_TASKS_C_ADDITIONS_INIT() is defined, as that is the only macro\r
+ * called by the function.\r
+ */\r
+#ifdef FREERTOS_TASKS_C_ADDITIONS_INIT\r
+\r
+       static void freertos_tasks_c_additions_init( void ) PRIVILEGED_FUNCTION;\r
+\r
+#endif\r
+\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+\r
+       TaskHandle_t xTaskCreateStatic( TaskFunction_t pxTaskCode,\r
+                                                                       const char * const pcName,              /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+                                                                       const uint32_t ulStackDepth,\r
+                                                                       void * const pvParameters,\r
+                                                                       UBaseType_t uxPriority,\r
+                                                                       StackType_t * const puxStackBuffer,\r
+                                                                       StaticTask_t * const pxTaskBuffer )\r
+       {\r
+       TCB_t *pxNewTCB;\r
+       TaskHandle_t xReturn;\r
+\r
+               configASSERT( puxStackBuffer != NULL );\r
+               configASSERT( pxTaskBuffer != NULL );\r
+\r
+               #if( configASSERT_DEFINED == 1 )\r
+               {\r
+                       /* Sanity check that the size of the structure used to declare a\r
+                       variable of type StaticTask_t equals the size of the real task\r
+                       structure. */\r
+                       volatile size_t xSize = sizeof( StaticTask_t );\r
+                       configASSERT( xSize == sizeof( TCB_t ) );\r
+                       ( void ) xSize; /* Prevent lint warning when configASSERT() is not used. */\r
+               }\r
+               #endif /* configASSERT_DEFINED */\r
+\r
+\r
+               if( ( pxTaskBuffer != NULL ) && ( puxStackBuffer != NULL ) )\r
+               {\r
+                       /* The memory used for the task's TCB and stack are passed into this\r
+                       function - use them. */\r
+                       pxNewTCB = ( TCB_t * ) pxTaskBuffer; /*lint !e740 !e9087 Unusual cast is ok as the structures are designed to have the same alignment, and the size is checked by an assert. */\r
+                       pxNewTCB->pxStack = ( StackType_t * ) puxStackBuffer;\r
+\r
+                       #if( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE != 0 ) /*lint !e731 !e9029 Macro has been consolidated for readability reasons. */\r
+                       {\r
+                               /* Tasks can be created statically or dynamically, so note this\r
+                               task was created statically in case the task is later deleted. */\r
+                               pxNewTCB->ucStaticallyAllocated = tskSTATICALLY_ALLOCATED_STACK_AND_TCB;\r
+                       }\r
+                       #endif /* tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE */\r
+\r
+                       prvInitialiseNewTask( pxTaskCode, pcName, ulStackDepth, pvParameters, uxPriority, &xReturn, pxNewTCB, NULL );\r
+                       prvAddNewTaskToReadyList( pxNewTCB );\r
+               }\r
+               else\r
+               {\r
+                       xReturn = NULL;\r
+               }\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif /* SUPPORT_STATIC_ALLOCATION */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( portUSING_MPU_WRAPPERS == 1 ) && ( configSUPPORT_STATIC_ALLOCATION == 1 ) )\r
+\r
+       BaseType_t xTaskCreateRestrictedStatic( const TaskParameters_t * const pxTaskDefinition, TaskHandle_t *pxCreatedTask )\r
+       {\r
+       TCB_t *pxNewTCB;\r
+       BaseType_t xReturn = errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY;\r
+\r
+               configASSERT( pxTaskDefinition->puxStackBuffer != NULL );\r
+               configASSERT( pxTaskDefinition->pxTaskBuffer != NULL );\r
+\r
+               if( ( pxTaskDefinition->puxStackBuffer != NULL ) && ( pxTaskDefinition->pxTaskBuffer != NULL ) )\r
+               {\r
+                       /* Allocate space for the TCB.  Where the memory comes from depends\r
+                       on the implementation of the port malloc function and whether or\r
+                       not static allocation is being used. */\r
+                       pxNewTCB = ( TCB_t * ) pxTaskDefinition->pxTaskBuffer;\r
+\r
+                       /* Store the stack location in the TCB. */\r
+                       pxNewTCB->pxStack = pxTaskDefinition->puxStackBuffer;\r
+\r
+                       #if( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE != 0 )\r
+                       {\r
+                               /* Tasks can be created statically or dynamically, so note this\r
+                               task was created statically in case the task is later deleted. */\r
+                               pxNewTCB->ucStaticallyAllocated = tskSTATICALLY_ALLOCATED_STACK_AND_TCB;\r
+                       }\r
+                       #endif /* tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE */\r
+\r
+                       prvInitialiseNewTask(   pxTaskDefinition->pvTaskCode,\r
+                                                                       pxTaskDefinition->pcName,\r
+                                                                       ( uint32_t ) pxTaskDefinition->usStackDepth,\r
+                                                                       pxTaskDefinition->pvParameters,\r
+                                                                       pxTaskDefinition->uxPriority,\r
+                                                                       pxCreatedTask, pxNewTCB,\r
+                                                                       pxTaskDefinition->xRegions );\r
+\r
+                       prvAddNewTaskToReadyList( pxNewTCB );\r
+                       xReturn = pdPASS;\r
+               }\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif /* ( portUSING_MPU_WRAPPERS == 1 ) && ( configSUPPORT_STATIC_ALLOCATION == 1 ) */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( portUSING_MPU_WRAPPERS == 1 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) )\r
+\r
+       BaseType_t xTaskCreateRestricted( const TaskParameters_t * const pxTaskDefinition, TaskHandle_t *pxCreatedTask )\r
+       {\r
+       TCB_t *pxNewTCB;\r
+       BaseType_t xReturn = errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY;\r
+\r
+               configASSERT( pxTaskDefinition->puxStackBuffer );\r
+\r
+               if( pxTaskDefinition->puxStackBuffer != NULL )\r
+               {\r
+                       /* Allocate space for the TCB.  Where the memory comes from depends\r
+                       on the implementation of the port malloc function and whether or\r
+                       not static allocation is being used. */\r
+                       pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );\r
+\r
+                       if( pxNewTCB != NULL )\r
+                       {\r
+                               /* Store the stack location in the TCB. */\r
+                               pxNewTCB->pxStack = pxTaskDefinition->puxStackBuffer;\r
+\r
+                               #if( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE != 0 )\r
+                               {\r
+                                       /* Tasks can be created statically or dynamically, so note\r
+                                       this task had a statically allocated stack in case it is\r
+                                       later deleted.  The TCB was allocated dynamically. */\r
+                                       pxNewTCB->ucStaticallyAllocated = tskSTATICALLY_ALLOCATED_STACK_ONLY;\r
+                               }\r
+                               #endif /* tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE */\r
+\r
+                               prvInitialiseNewTask(   pxTaskDefinition->pvTaskCode,\r
+                                                                               pxTaskDefinition->pcName,\r
+                                                                               ( uint32_t ) pxTaskDefinition->usStackDepth,\r
+                                                                               pxTaskDefinition->pvParameters,\r
+                                                                               pxTaskDefinition->uxPriority,\r
+                                                                               pxCreatedTask, pxNewTCB,\r
+                                                                               pxTaskDefinition->xRegions );\r
+\r
+                               prvAddNewTaskToReadyList( pxNewTCB );\r
+                               xReturn = pdPASS;\r
+                       }\r
+               }\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif /* portUSING_MPU_WRAPPERS */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+\r
+       BaseType_t xTaskCreate( TaskFunction_t pxTaskCode,\r
+                                                       const char * const pcName,              /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+                                                       const configSTACK_DEPTH_TYPE usStackDepth,\r
+                                                       void * const pvParameters,\r
+                                                       UBaseType_t uxPriority,\r
+                                                       TaskHandle_t * const pxCreatedTask )\r
+       {\r
+       TCB_t *pxNewTCB;\r
+       BaseType_t xReturn;\r
+\r
+               /* If the stack grows down then allocate the stack then the TCB so the stack\r
+               does not grow into the TCB.  Likewise if the stack grows up then allocate\r
+               the TCB then the stack. */\r
+               #if( portSTACK_GROWTH > 0 )\r
+               {\r
+                       /* Allocate space for the TCB.  Where the memory comes from depends on\r
+                       the implementation of the port malloc function and whether or not static\r
+                       allocation is being used. */\r
+                       pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );\r
+\r
+                       if( pxNewTCB != NULL )\r
+                       {\r
+                               /* Allocate space for the stack used by the task being created.\r
+                               The base of the stack memory stored in the TCB so the task can\r
+                               be deleted later if required. */\r
+                               pxNewTCB->pxStack = ( StackType_t * ) pvPortMalloc( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ) ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
+\r
+                               if( pxNewTCB->pxStack == NULL )\r
+                               {\r
+                                       /* Could not allocate the stack.  Delete the allocated TCB. */\r
+                                       vPortFree( pxNewTCB );\r
+                                       pxNewTCB = NULL;\r
+                               }\r
+                       }\r
+               }\r
+               #else /* portSTACK_GROWTH */\r
+               {\r
+               StackType_t *pxStack;\r
+\r
+                       /* Allocate space for the stack used by the task being created. */\r
+                       pxStack = pvPortMalloc( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ) ); /*lint !e9079 All values returned by pvPortMalloc() have at least the alignment required by the MCU's stack and this allocation is the stack. */\r
+\r
+                       if( pxStack != NULL )\r
+                       {\r
+                               /* Allocate space for the TCB. */\r
+                               pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) ); /*lint !e9087 !e9079 All values returned by pvPortMalloc() have at least the alignment required by the MCU's stack, and the first member of TCB_t is always a pointer to the task's stack. */\r
+\r
+                               if( pxNewTCB != NULL )\r
+                               {\r
+                                       /* Store the stack location in the TCB. */\r
+                                       pxNewTCB->pxStack = pxStack;\r
+                               }\r
+                               else\r
+                               {\r
+                                       /* The stack cannot be used as the TCB was not created.  Free\r
+                                       it again. */\r
+                                       vPortFree( pxStack );\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               pxNewTCB = NULL;\r
+                       }\r
+               }\r
+               #endif /* portSTACK_GROWTH */\r
+\r
+               if( pxNewTCB != NULL )\r
+               {\r
+                       #if( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE != 0 ) /*lint !e9029 !e731 Macro has been consolidated for readability reasons. */\r
+                       {\r
+                               /* Tasks can be created statically or dynamically, so note this\r
+                               task was created dynamically in case it is later deleted. */\r
+                               pxNewTCB->ucStaticallyAllocated = tskDYNAMICALLY_ALLOCATED_STACK_AND_TCB;\r
+                       }\r
+                       #endif /* tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE */\r
+\r
+                       prvInitialiseNewTask( pxTaskCode, pcName, ( uint32_t ) usStackDepth, pvParameters, uxPriority, pxCreatedTask, pxNewTCB, NULL );\r
+                       prvAddNewTaskToReadyList( pxNewTCB );\r
+                       xReturn = pdPASS;\r
+               }\r
+               else\r
+               {\r
+                       xReturn = errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY;\r
+               }\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
+/*-----------------------------------------------------------*/\r
+\r
+static void prvInitialiseNewTask(      TaskFunction_t pxTaskCode,\r
+                                                                       const char * const pcName,              /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+                                                                       const uint32_t ulStackDepth,\r
+                                                                       void * const pvParameters,\r
+                                                                       UBaseType_t uxPriority,\r
+                                                                       TaskHandle_t * const pxCreatedTask,\r
+                                                                       TCB_t *pxNewTCB,\r
+                                                                       const MemoryRegion_t * const xRegions )\r
+{\r
+StackType_t *pxTopOfStack;\r
+UBaseType_t x;\r
+\r
+       #if( portUSING_MPU_WRAPPERS == 1 )\r
+               /* Should the task be created in privileged mode? */\r
+               BaseType_t xRunPrivileged;\r
+               if( ( uxPriority & portPRIVILEGE_BIT ) != 0U )\r
+               {\r
+                       xRunPrivileged = pdTRUE;\r
+               }\r
+               else\r
+               {\r
+                       xRunPrivileged = pdFALSE;\r
+               }\r
+               uxPriority &= ~portPRIVILEGE_BIT;\r
+       #endif /* portUSING_MPU_WRAPPERS == 1 */\r
+\r
+       /* Avoid dependency on memset() if it is not required. */\r
+       #if( tskSET_NEW_STACKS_TO_KNOWN_VALUE == 1 )\r
+       {\r
+               /* Fill the stack with a known value to assist debugging. */\r
+               ( void ) memset( pxNewTCB->pxStack, ( int ) tskSTACK_FILL_BYTE, ( size_t ) ulStackDepth * sizeof( StackType_t ) );\r
+       }\r
+       #endif /* tskSET_NEW_STACKS_TO_KNOWN_VALUE */\r
+\r
+       /* Calculate the top of stack address.  This depends on whether the stack\r
+       grows from high memory to low (as per the 80x86) or vice versa.\r
+       portSTACK_GROWTH is used to make the result positive or negative as required\r
+       by the port. */\r
+       #if( portSTACK_GROWTH < 0 )\r
+       {\r
+               pxTopOfStack = &( pxNewTCB->pxStack[ ulStackDepth - ( uint32_t ) 1 ] );\r
+               pxTopOfStack = ( StackType_t * ) ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) ); /*lint !e923 !e9033 !e9078 MISRA exception.  Avoiding casts between pointers and integers is not practical.  Size differences accounted for using portPOINTER_SIZE_TYPE type.  Checked by assert(). */\r
+\r
+               /* Check the alignment of the calculated top of stack is correct. */\r
+               configASSERT( ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack & ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
+\r
+               #if( configRECORD_STACK_HIGH_ADDRESS == 1 )\r
+               {\r
+                       /* Also record the stack's high address, which may assist\r
+                       debugging. */\r
+                       pxNewTCB->pxEndOfStack = pxTopOfStack;\r
+               }\r
+               #endif /* configRECORD_STACK_HIGH_ADDRESS */\r
+       }\r
+       #else /* portSTACK_GROWTH */\r
+       {\r
+               pxTopOfStack = pxNewTCB->pxStack;\r
+\r
+               /* Check the alignment of the stack buffer is correct. */\r
+               configASSERT( ( ( ( portPOINTER_SIZE_TYPE ) pxNewTCB->pxStack & ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
+\r
+               /* The other extreme of the stack space is required if stack checking is\r
+               performed. */\r
+               pxNewTCB->pxEndOfStack = pxNewTCB->pxStack + ( ulStackDepth - ( uint32_t ) 1 );\r
+       }\r
+       #endif /* portSTACK_GROWTH */\r
+\r
+       /* Store the task name in the TCB. */\r
+       if( pcName != NULL )\r
+       {\r
+               for( x = ( UBaseType_t ) 0; x < ( UBaseType_t ) configMAX_TASK_NAME_LEN; x++ )\r
+               {\r
+                       pxNewTCB->pcTaskName[ x ] = pcName[ x ];\r
+\r
+                       /* Don't copy all configMAX_TASK_NAME_LEN if the string is shorter than\r
+                       configMAX_TASK_NAME_LEN characters just in case the memory after the\r
+                       string is not accessible (extremely unlikely). */\r
+                       if( pcName[ x ] == ( char ) 0x00 )\r
+                       {\r
+                               break;\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+\r
+               /* Ensure the name string is terminated in the case that the string length\r
+               was greater or equal to configMAX_TASK_NAME_LEN. */\r
+               pxNewTCB->pcTaskName[ configMAX_TASK_NAME_LEN - 1 ] = '\0';\r
+       }\r
+       else\r
+       {\r
+               /* The task has not been given a name, so just ensure there is a NULL\r
+               terminator when it is read out. */\r
+               pxNewTCB->pcTaskName[ 0 ] = 0x00;\r
+       }\r
 \r
-       static uint16_t prvTaskCheckFreeStackSpace( const uint8_t * pucStackByte ) PRIVILEGED_FUNCTION;\r
+       /* This is used as an array index so must ensure it's not too large.  First\r
+       remove the privilege bit if one is present. */\r
+       if( uxPriority >= ( UBaseType_t ) configMAX_PRIORITIES )\r
+       {\r
+               uxPriority = ( UBaseType_t ) configMAX_PRIORITIES - ( UBaseType_t ) 1U;\r
+       }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 \r
-#endif\r
+       pxNewTCB->uxPriority = uxPriority;\r
+       #if ( configUSE_MUTEXES == 1 )\r
+       {\r
+               pxNewTCB->uxBasePriority = uxPriority;\r
+               pxNewTCB->uxMutexesHeld = 0;\r
+       }\r
+       #endif /* configUSE_MUTEXES */\r
 \r
-/*\r
- * Return the amount of time, in ticks, that will pass before the kernel will\r
- * next move a task from the Blocked state to the Running state.\r
- *\r
- * This conditional compilation should use inequality to 0, not equality to 1.\r
- * This is to ensure portSUPPRESS_TICKS_AND_SLEEP() can be called when user\r
- * defined low power mode implementations require configUSE_TICKLESS_IDLE to be\r
- * set to a value other than 1.\r
- */\r
-#if ( configUSE_TICKLESS_IDLE != 0 )\r
+       vListInitialiseItem( &( pxNewTCB->xStateListItem ) );\r
+       vListInitialiseItem( &( pxNewTCB->xEventListItem ) );\r
 \r
-       static TickType_t prvGetExpectedIdleTime( void ) PRIVILEGED_FUNCTION;\r
+       /* Set the pxNewTCB as a link back from the ListItem_t.  This is so we can get\r
+       back to the containing TCB from a generic item in a list. */\r
+       listSET_LIST_ITEM_OWNER( &( pxNewTCB->xStateListItem ), pxNewTCB );\r
 \r
-#endif\r
+       /* Event lists are always in priority order. */\r
+       listSET_LIST_ITEM_VALUE( &( pxNewTCB->xEventListItem ), ( TickType_t ) configMAX_PRIORITIES - ( TickType_t ) uxPriority ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
+       listSET_LIST_ITEM_OWNER( &( pxNewTCB->xEventListItem ), pxNewTCB );\r
 \r
-/*\r
- * Set xNextTaskUnblockTime to the time at which the next Blocked state task\r
- * will exit the Blocked state.\r
- */\r
-static void prvResetNextTaskUnblockTime( void );\r
+       #if ( portCRITICAL_NESTING_IN_TCB == 1 )\r
+       {\r
+               pxNewTCB->uxCriticalNesting = ( UBaseType_t ) 0U;\r
+       }\r
+       #endif /* portCRITICAL_NESTING_IN_TCB */\r
 \r
-#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )\r
+       #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
+       {\r
+               pxNewTCB->pxTaskTag = NULL;\r
+       }\r
+       #endif /* configUSE_APPLICATION_TASK_TAG */\r
 \r
-       /*\r
-        * Helper function used to pad task names with spaces when printing out\r
-        * human readable tables of task information.\r
-        */\r
-       static char *prvWriteNameToBuffer( char *pcBuffer, const char *pcTaskName );\r
+       #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
+       {\r
+               pxNewTCB->ulRunTimeCounter = 0UL;\r
+       }\r
+       #endif /* configGENERATE_RUN_TIME_STATS */\r
 \r
-#endif\r
-/*-----------------------------------------------------------*/\r
+       #if ( portUSING_MPU_WRAPPERS == 1 )\r
+       {\r
+               vPortStoreTaskMPUSettings( &( pxNewTCB->xMPUSettings ), xRegions, pxNewTCB->pxStack, ulStackDepth );\r
+       }\r
+       #else\r
+       {\r
+               /* Avoid compiler warning about unreferenced parameter. */\r
+               ( void ) xRegions;\r
+       }\r
+       #endif\r
 \r
-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. */\r
-{\r
-BaseType_t xReturn;\r
-TCB_t * pxNewTCB;\r
-StackType_t *pxTopOfStack;\r
+       #if( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )\r
+       {\r
+               for( x = 0; x < ( UBaseType_t ) configNUM_THREAD_LOCAL_STORAGE_POINTERS; x++ )\r
+               {\r
+                       pxNewTCB->pvThreadLocalStoragePointers[ x ] = NULL;\r
+               }\r
+       }\r
+       #endif\r
 \r
-       configASSERT( pxTaskCode );\r
-       configASSERT( ( ( uxPriority & ( UBaseType_t ) ( ~portPRIVILEGE_BIT ) ) < ( UBaseType_t ) configMAX_PRIORITIES ) );\r
+       #if ( configUSE_TASK_NOTIFICATIONS == 1 )\r
+       {\r
+               pxNewTCB->ulNotifiedValue = 0;\r
+               pxNewTCB->ucNotifyState = taskNOT_WAITING_NOTIFICATION;\r
+       }\r
+       #endif\r
 \r
-       /* Allocate the memory required by the TCB and stack for the new task,\r
-       checking that the allocation was successful. */\r
-       pxNewTCB = prvAllocateTCBAndStack( usStackDepth, puxStackBuffer );\r
+       #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
+       {\r
+               /* Initialise this task's Newlib reent structure.\r
+               See the third party link http://www.nadler.com/embedded/newlibAndFreeRTOS.html\r
+               for additional information. */\r
+               _REENT_INIT_PTR( ( &( pxNewTCB->xNewLib_reent ) ) );\r
+       }\r
+       #endif\r
 \r
-       if( pxNewTCB != NULL )\r
+       #if( INCLUDE_xTaskAbortDelay == 1 )\r
        {\r
-               #if( portUSING_MPU_WRAPPERS == 1 )\r
-                       /* Should the task be created in privileged mode? */\r
-                       BaseType_t xRunPrivileged;\r
-                       if( ( uxPriority & portPRIVILEGE_BIT ) != 0U )\r
-                       {\r
-                               xRunPrivileged = pdTRUE;\r
-                       }\r
-                       else\r
-                       {\r
-                               xRunPrivileged = pdFALSE;\r
-                       }\r
-                       uxPriority &= ~portPRIVILEGE_BIT;\r
+               pxNewTCB->ucDelayAborted = pdFALSE;\r
+       }\r
+       #endif\r
 \r
-                       if( puxStackBuffer != NULL )\r
+       /* Initialize the TCB stack to look as if the task was already running,\r
+       but had been interrupted by the scheduler.  The return address is set\r
+       to the start of the task function. Once the stack has been initialised\r
+       the top of stack variable is updated. */\r
+       #if( portUSING_MPU_WRAPPERS == 1 )\r
+       {\r
+               /* If the port has capability to detect stack overflow,\r
+               pass the stack end address to the stack initialization\r
+               function as well. */\r
+               #if( portHAS_STACK_OVERFLOW_CHECKING == 1 )\r
+               {\r
+                       #if( portSTACK_GROWTH < 0 )\r
                        {\r
-                               /* The application provided its own stack.  Note this so no\r
-                               attempt is made to delete the stack should that task be\r
-                               deleted. */\r
-                               pxNewTCB->xUsingStaticallyAllocatedStack = pdTRUE;\r
+                               pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxNewTCB->pxStack, pxTaskCode, pvParameters, xRunPrivileged );\r
                        }\r
-                       else\r
+                       #else /* portSTACK_GROWTH */\r
                        {\r
-                               /* The stack was allocated dynamically.  Note this so it can be\r
-                               deleted again if the task is deleted. */\r
-                               pxNewTCB->xUsingStaticallyAllocatedStack = pdFALSE;\r
+                               pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxNewTCB->pxEndOfStack, pxTaskCode, pvParameters, xRunPrivileged );\r
                        }\r
-               #endif /* portUSING_MPU_WRAPPERS == 1 */\r
-\r
-               /* Calculate the top of stack address.  This depends on whether the\r
-               stack grows from high memory to low (as per the 80x86) or vice versa.\r
-               portSTACK_GROWTH is used to make the result positive or negative as\r
-               required by the port. */\r
-               #if( portSTACK_GROWTH < 0 )\r
-               {\r
-                       pxTopOfStack = pxNewTCB->pxStack + ( usStackDepth - ( uint16_t ) 1 );\r
-                       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. */\r
-\r
-                       /* Check the alignment of the calculated top of stack is correct. */\r
-                       configASSERT( ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack & ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
+                       #endif /* portSTACK_GROWTH */\r
                }\r
-               #else /* portSTACK_GROWTH */\r
+               #else /* portHAS_STACK_OVERFLOW_CHECKING */\r
                {\r
-                       pxTopOfStack = pxNewTCB->pxStack;\r
-\r
-                       /* Check the alignment of the stack buffer is correct. */\r
-                       configASSERT( ( ( ( portPOINTER_SIZE_TYPE ) pxNewTCB->pxStack & ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
-\r
-                       /* If we want to use stack checking on architectures that use\r
-                       a positive stack growth direction then we also need to store the\r
-                       other extreme of the stack space. */\r
-                       pxNewTCB->pxEndOfStack = pxNewTCB->pxStack + ( usStackDepth - 1 );\r
+                       pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxTaskCode, pvParameters, xRunPrivileged );\r
                }\r
-               #endif /* portSTACK_GROWTH */\r
-\r
-               /* Setup the newly allocated TCB with the initial state of the task. */\r
-               prvInitialiseTCBVariables( pxNewTCB, pcName, uxPriority, xRegions, usStackDepth );\r
-\r
-               /* Initialize the TCB stack to look as if the task was already running,\r
-               but had been interrupted by the scheduler.  The return address is set\r
-               to the start of the task function. Once the stack has been initialised\r
-               the     top of stack variable is updated. */\r
-               #if( portUSING_MPU_WRAPPERS == 1 )\r
+               #endif /* portHAS_STACK_OVERFLOW_CHECKING */\r
+       }\r
+       #else /* portUSING_MPU_WRAPPERS */\r
+       {\r
+               /* If the port has capability to detect stack overflow,\r
+               pass the stack end address to the stack initialization\r
+               function as well. */\r
+               #if( portHAS_STACK_OVERFLOW_CHECKING == 1 )\r
                {\r
-                       pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxTaskCode, pvParameters, xRunPrivileged );\r
+                       #if( portSTACK_GROWTH < 0 )\r
+                       {\r
+                               pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxNewTCB->pxStack, pxTaskCode, pvParameters );\r
+                       }\r
+                       #else /* portSTACK_GROWTH */\r
+                       {\r
+                               pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxNewTCB->pxEndOfStack, pxTaskCode, pvParameters );\r
+                       }\r
+                       #endif /* portSTACK_GROWTH */\r
                }\r
-               #else /* portUSING_MPU_WRAPPERS */\r
+               #else /* portHAS_STACK_OVERFLOW_CHECKING */\r
                {\r
                        pxNewTCB->pxTopOfStack = pxPortInitialiseStack( pxTopOfStack, pxTaskCode, pvParameters );\r
                }\r
-               #endif /* portUSING_MPU_WRAPPERS */\r
+               #endif /* portHAS_STACK_OVERFLOW_CHECKING */\r
+       }\r
+       #endif /* portUSING_MPU_WRAPPERS */\r
+\r
+       if( pxCreatedTask != NULL )\r
+       {\r
+               /* Pass the handle out in an anonymous way.  The handle can be used to\r
+               change the created task's priority, delete the created task, etc.*/\r
+               *pxCreatedTask = ( TaskHandle_t ) pxNewTCB;\r
+       }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
+}\r
+/*-----------------------------------------------------------*/\r
 \r
-               if( ( void * ) pxCreatedTask != NULL )\r
+static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB )\r
+{\r
+       /* Ensure interrupts don't access the task lists while the lists are being\r
+       updated. */\r
+       taskENTER_CRITICAL();\r
+       {\r
+               uxCurrentNumberOfTasks++;\r
+               if( pxCurrentTCB == NULL )\r
                {\r
-                       /* Pass the TCB out - in an anonymous way.  The calling function/\r
-                       task can use this as a handle to delete the task later if\r
-                       required.*/\r
-                       *pxCreatedTask = ( TaskHandle_t ) pxNewTCB;\r
+                       /* There are no other tasks, or all the other tasks are in\r
+                       the suspended state - make this the current task. */\r
+                       pxCurrentTCB = pxNewTCB;\r
+\r
+                       if( uxCurrentNumberOfTasks == ( UBaseType_t ) 1 )\r
+                       {\r
+                               /* This is the first task to be created so do the preliminary\r
+                               initialisation required.  We will not recover if this call\r
+                               fails, but we will report the failure. */\r
+                               prvInitialiseTaskLists();\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
                else\r
                {\r
-                       mtCOVERAGE_TEST_MARKER();\r
-               }\r
-\r
-               /* Ensure interrupts don't access the task lists while they are being\r
-               updated. */\r
-               taskENTER_CRITICAL();\r
-               {\r
-                       uxCurrentNumberOfTasks++;\r
-                       if( pxCurrentTCB == NULL )\r
+                       /* If the scheduler is not already running, make this task the\r
+                       current task if it is the highest priority task to be created\r
+                       so far. */\r
+                       if( xSchedulerRunning == pdFALSE )\r
                        {\r
-                               /* There are no other tasks, or all the other tasks are in\r
-                               the suspended state - make this the current task. */\r
-                               pxCurrentTCB =  pxNewTCB;\r
-\r
-                               if( uxCurrentNumberOfTasks == ( UBaseType_t ) 1 )\r
+                               if( pxCurrentTCB->uxPriority <= pxNewTCB->uxPriority )\r
                                {\r
-                                       /* This is the first task to be created so do the preliminary\r
-                                       initialisation required.  We will not recover if this call\r
-                                       fails, but we will report the failure. */\r
-                                       prvInitialiseTaskLists();\r
+                                       pxCurrentTCB = pxNewTCB;\r
                                }\r
                                else\r
                                {\r
@@ -671,71 +1117,43 @@ StackType_t *pxTopOfStack;
                        }\r
                        else\r
                        {\r
-                               /* If the scheduler is not already running, make this task the\r
-                               current task if it is the highest priority task to be created\r
-                               so far. */\r
-                               if( xSchedulerRunning == pdFALSE )\r
-                               {\r
-                                       if( pxCurrentTCB->uxPriority <= uxPriority )\r
-                                       {\r
-                                               pxCurrentTCB = pxNewTCB;\r
-                                       }\r
-                                       else\r
-                                       {\r
-                                               mtCOVERAGE_TEST_MARKER();\r
-                                       }\r
-                               }\r
-                               else\r
-                               {\r
-                                       mtCOVERAGE_TEST_MARKER();\r
-                               }\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
+               }\r
 \r
-                       uxTaskNumber++;\r
+               uxTaskNumber++;\r
 \r
-                       #if ( configUSE_TRACE_FACILITY == 1 )\r
-                       {\r
-                               /* Add a counter into the TCB for tracing only. */\r
-                               pxNewTCB->uxTCBNumber = uxTaskNumber;\r
-                       }\r
-                       #endif /* configUSE_TRACE_FACILITY */\r
-                       traceTASK_CREATE( pxNewTCB );\r
+               #if ( configUSE_TRACE_FACILITY == 1 )\r
+               {\r
+                       /* Add a counter into the TCB for tracing only. */\r
+                       pxNewTCB->uxTCBNumber = uxTaskNumber;\r
+               }\r
+               #endif /* configUSE_TRACE_FACILITY */\r
+               traceTASK_CREATE( pxNewTCB );\r
 \r
-                       prvAddTaskToReadyList( pxNewTCB );\r
+               prvAddTaskToReadyList( pxNewTCB );\r
 \r
-                       xReturn = pdPASS;\r
-                       portSETUP_TCB( pxNewTCB );\r
-               }\r
-               taskEXIT_CRITICAL();\r
-       }\r
-       else\r
-       {\r
-               xReturn = errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY;\r
-               traceTASK_CREATE_FAILED();\r
+               portSETUP_TCB( pxNewTCB );\r
        }\r
+       taskEXIT_CRITICAL();\r
 \r
-       if( xReturn == pdPASS )\r
+       if( xSchedulerRunning != pdFALSE )\r
        {\r
-               if( xSchedulerRunning != pdFALSE )\r
+               /* If the created task is of a higher priority than the current task\r
+               then it should run now. */\r
+               if( pxCurrentTCB->uxPriority < pxNewTCB->uxPriority )\r
                {\r
-                       /* If the created task is of a higher priority than the current task\r
-                       then it should run now. */\r
-                       if( pxCurrentTCB->uxPriority < uxPriority )\r
-                       {\r
-                               taskYIELD_IF_USING_PREEMPTION();\r
-                       }\r
-                       else\r
-                       {\r
-                               mtCOVERAGE_TEST_MARKER();\r
-                       }\r
+                       taskYIELD_IF_USING_PREEMPTION();\r
                }\r
                else\r
                {\r
                        mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
-\r
-       return xReturn;\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -751,11 +1169,8 @@ StackType_t *pxTopOfStack;
                        being deleted. */\r
                        pxTCB = prvGetTCBFromHandle( xTaskToDelete );\r
 \r
-                       /* Remove task from the ready list and place in the     termination list.\r
-                       This will stop the task from be scheduled.  The idle task will check\r
-                       the termination list and free up any memory allocated by the\r
-                       scheduler for the TCB and stack. */\r
-                       if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
+                       /* Remove task from the ready/delayed list. */\r
+                       if( uxListRemove( &( pxTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
                        {\r
                                taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                        }\r
@@ -774,18 +1189,47 @@ StackType_t *pxTopOfStack;
                                mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
-                       vListInsertEnd( &xTasksWaitingTermination, &( pxTCB->xGenericListItem ) );\r
+                       /* Increment the uxTaskNumber also so kernel aware debuggers can\r
+                       detect that the task lists need re-generating.  This is done before\r
+                       portPRE_TASK_DELETE_HOOK() as in the Windows port that macro will\r
+                       not return. */\r
+                       uxTaskNumber++;\r
 \r
-                       /* Increment the ucTasksDeleted variable so the idle task knows\r
-                       there is a task that has been deleted and that it should therefore\r
-                       check the xTasksWaitingTermination list. */\r
-                       ++uxTasksDeleted;\r
+                       if( pxTCB == pxCurrentTCB )\r
+                       {\r
+                               /* A task is deleting itself.  This cannot complete within the\r
+                               task itself, as a context switch to another task is required.\r
+                               Place the task in the termination list.  The idle task will\r
+                               check the termination list and free up any memory allocated by\r
+                               the scheduler for the TCB and stack of the deleted task. */\r
+                               vListInsertEnd( &xTasksWaitingTermination, &( pxTCB->xStateListItem ) );\r
+\r
+                               /* Increment the ucTasksDeleted variable so the idle task knows\r
+                               there is a task that has been deleted and that it should therefore\r
+                               check the xTasksWaitingTermination list. */\r
+                               ++uxDeletedTasksWaitingCleanUp;\r
+\r
+                               /* Call the delete hook before portPRE_TASK_DELETE_HOOK() as\r
+                               portPRE_TASK_DELETE_HOOK() does not return in the Win32 port. */\r
+                               traceTASK_DELETE( pxTCB );\r
 \r
-                       /* Increment the uxTaskNumberVariable also so kernel aware debuggers\r
-                       can detect that the task lists need re-generating. */\r
-                       uxTaskNumber++;\r
+                               /* The pre-delete hook is primarily for the Windows simulator,\r
+                               in which Windows specific clean up operations are performed,\r
+                               after which it is not possible to yield away from this task -\r
+                               hence xYieldPending is used to latch that a context switch is\r
+                               required. */\r
+                               portPRE_TASK_DELETE_HOOK( pxTCB, &xYieldPending );\r
+                       }\r
+                       else\r
+                       {\r
+                               --uxCurrentNumberOfTasks;\r
+                               traceTASK_DELETE( pxTCB );\r
+                               prvDeleteTCB( pxTCB );\r
 \r
-                       traceTASK_DELETE( pxTCB );\r
+                               /* Reset the next expected unblock time in case it referred to\r
+                               the task that has just been deleted. */\r
+                               prvResetNextTaskUnblockTime();\r
+                       }\r
                }\r
                taskEXIT_CRITICAL();\r
 \r
@@ -796,24 +1240,11 @@ StackType_t *pxTopOfStack;
                        if( pxTCB == pxCurrentTCB )\r
                        {\r
                                configASSERT( uxSchedulerSuspended == 0 );\r
-\r
-                               /* The pre-delete hook is primarily for the Windows simulator,\r
-                               in which Windows specific clean up operations are performed,\r
-                               after which it is not possible to yield away from this task -\r
-                               hence xYieldPending is used to latch that a context switch is\r
-                               required. */\r
-                               portPRE_TASK_DELETE_HOOK( pxTCB, &xYieldPending );\r
                                portYIELD_WITHIN_API();\r
                        }\r
                        else\r
                        {\r
-                               /* Reset the next expected unblock time in case it referred to\r
-                               the task that has just been deleted. */\r
-                               taskENTER_CRITICAL();\r
-                               {\r
-                                       prvResetNextTaskUnblockTime();\r
-                               }\r
-                               taskEXIT_CRITICAL();\r
+                               mtCOVERAGE_TEST_MARKER();\r
                        }\r
                }\r
        }\r
@@ -877,23 +1308,11 @@ StackType_t *pxTopOfStack;
 \r
                        if( xShouldDelay != pdFALSE )\r
                        {\r
-                               traceTASK_DELAY_UNTIL();\r
-\r
-                               /* Remove the task from the ready list before adding it to the\r
-                               blocked list as the same list item is used for both lists. */\r
-                               if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-                               {\r
-                                       /* The current task must be in a ready list, so there is\r
-                                       no need to check, and the port reset macro can be called\r
-                                       directly. */\r
-                                       portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-                               }\r
-                               else\r
-                               {\r
-                                       mtCOVERAGE_TEST_MARKER();\r
-                               }\r
+                               traceTASK_DELAY_UNTIL( xTimeToWake );\r
 \r
-                               prvAddCurrentTaskToDelayedList( xTimeToWake );\r
+                               /* prvAddCurrentTaskToDelayedList() needs the block time, not\r
+                               the time to wake, so subtract the current tick count. */\r
+                               prvAddCurrentTaskToDelayedList( xTimeToWake - xConstTickCount, pdFALSE );\r
                        }\r
                        else\r
                        {\r
@@ -921,10 +1340,8 @@ StackType_t *pxTopOfStack;
 \r
        void vTaskDelay( const TickType_t xTicksToDelay )\r
        {\r
-       TickType_t xTimeToWake;\r
        BaseType_t xAlreadyYielded = pdFALSE;\r
 \r
-\r
                /* A delay time of zero just forces a reschedule. */\r
                if( xTicksToDelay > ( TickType_t ) 0U )\r
                {\r
@@ -940,26 +1357,7 @@ StackType_t *pxTopOfStack;
 \r
                                This task cannot be in an event list as it is the currently\r
                                executing task. */\r
-\r
-                               /* Calculate the time to wake - this may overflow but this is\r
-                               not a problem. */\r
-                               xTimeToWake = xTickCount + xTicksToDelay;\r
-\r
-                               /* We must remove ourselves from the ready list before adding\r
-                               ourselves to the blocked list as the same list item is used for\r
-                               both lists. */\r
-                               if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-                               {\r
-                                       /* The current task must be in a ready list, so there is\r
-                                       no need to check, and the port reset macro can be called\r
-                                       directly. */\r
-                                       portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-                               }\r
-                               else\r
-                               {\r
-                                       mtCOVERAGE_TEST_MARKER();\r
-                               }\r
-                               prvAddCurrentTaskToDelayedList( xTimeToWake );\r
+                               prvAddCurrentTaskToDelayedList( xTicksToDelay, pdFALSE );\r
                        }\r
                        xAlreadyYielded = xTaskResumeAll();\r
                }\r
@@ -983,13 +1381,13 @@ StackType_t *pxTopOfStack;
 #endif /* INCLUDE_vTaskDelay */\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( INCLUDE_eTaskGetState == 1 )\r
+#if( ( INCLUDE_eTaskGetState == 1 ) || ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_xTaskAbortDelay == 1 ) )\r
 \r
        eTaskState eTaskGetState( TaskHandle_t xTask )\r
        {\r
        eTaskState eReturn;\r
-       List_t *pxStateList;\r
-       const TCB_t * const pxTCB = ( TCB_t * ) xTask;\r
+       List_t const * pxStateList, *pxDelayedList, *pxOverflowedDelayedList;\r
+       const TCB_t * const pxTCB = xTask;\r
 \r
                configASSERT( pxTCB );\r
 \r
@@ -1002,11 +1400,13 @@ StackType_t *pxTopOfStack;
                {\r
                        taskENTER_CRITICAL();\r
                        {\r
-                               pxStateList = ( List_t * ) listLIST_ITEM_CONTAINER( &( pxTCB->xGenericListItem ) );\r
+                               pxStateList = listLIST_ITEM_CONTAINER( &( pxTCB->xStateListItem ) );\r
+                               pxDelayedList = pxDelayedTaskList;\r
+                               pxOverflowedDelayedList = pxOverflowDelayedTaskList;\r
                        }\r
                        taskEXIT_CRITICAL();\r
 \r
-                       if( ( pxStateList == pxDelayedTaskList ) || ( pxStateList == pxOverflowDelayedTaskList ) )\r
+                       if( ( pxStateList == pxDelayedList ) || ( pxStateList == pxOverflowedDelayedList ) )\r
                        {\r
                                /* The task being queried is referenced from one of the Blocked\r
                                lists. */\r
@@ -1017,11 +1417,30 @@ StackType_t *pxTopOfStack;
                                else if( pxStateList == &xSuspendedTaskList )\r
                                {\r
                                        /* The task being queried is referenced from the suspended\r
-                                       list.  Is it genuinely suspended or is it block\r
+                                       list.  Is it genuinely suspended or is it blocked\r
                                        indefinitely? */\r
                                        if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) == NULL )\r
                                        {\r
-                                               eReturn = eSuspended;\r
+                                               #if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+                                               {\r
+                                                       /* The task does not appear on the event list item of\r
+                                                       and of the RTOS objects, but could still be in the\r
+                                                       blocked state if it is waiting on its notification\r
+                                                       rather than waiting on an object. */\r
+                                                       if( pxTCB->ucNotifyState == taskWAITING_NOTIFICATION )\r
+                                                       {\r
+                                                               eReturn = eBlocked;\r
+                                                       }\r
+                                                       else\r
+                                                       {\r
+                                                               eReturn = eSuspended;\r
+                                                       }\r
+                                               }\r
+                                               #else\r
+                                               {\r
+                                                       eReturn = eSuspended;\r
+                                               }\r
+                                               #endif\r
                                        }\r
                                        else\r
                                        {\r
@@ -1031,10 +1450,11 @@ StackType_t *pxTopOfStack;
                        #endif\r
 \r
                        #if ( INCLUDE_vTaskDelete == 1 )\r
-                               else if( pxStateList == &xTasksWaitingTermination )\r
+                               else if( ( pxStateList == &xTasksWaitingTermination ) || ( pxStateList == NULL ) )\r
                                {\r
                                        /* The task being queried is referenced from the deleted\r
-                                       tasks list. */\r
+                                       tasks list, or it is not referenced from any lists at\r
+                                       all. */\r
                                        eReturn = eDeleted;\r
                                }\r
                        #endif\r
@@ -1055,15 +1475,15 @@ StackType_t *pxTopOfStack;
 \r
 #if ( INCLUDE_uxTaskPriorityGet == 1 )\r
 \r
-       UBaseType_t uxTaskPriorityGet( TaskHandle_t xTask )\r
+       UBaseType_t uxTaskPriorityGet( const TaskHandle_t xTask )\r
        {\r
-       TCB_t *pxTCB;\r
+       TCB_t const *pxTCB;\r
        UBaseType_t uxReturn;\r
 \r
                taskENTER_CRITICAL();\r
                {\r
-                       /* If null is passed in here then it is the priority of the that\r
-                       called uxTaskPriorityGet() that is being queried. */\r
+                       /* If null is passed in here then it is the priority of the task\r
+                       that called uxTaskPriorityGet() that is being queried. */\r
                        pxTCB = prvGetTCBFromHandle( xTask );\r
                        uxReturn = pxTCB->uxPriority;\r
                }\r
@@ -1077,9 +1497,9 @@ StackType_t *pxTopOfStack;
 \r
 #if ( INCLUDE_uxTaskPriorityGet == 1 )\r
 \r
-       UBaseType_t uxTaskPriorityGetFromISR( TaskHandle_t xTask )\r
+       UBaseType_t uxTaskPriorityGetFromISR( const TaskHandle_t xTask )\r
        {\r
-       TCB_t *pxTCB;\r
+       TCB_t const *pxTCB;\r
        UBaseType_t uxReturn, uxSavedInterruptState;\r
 \r
                /* RTOS ports that support interrupt nesting have the concept of a\r
@@ -1097,7 +1517,7 @@ StackType_t *pxTopOfStack;
                separate interrupt safe API to ensure interrupt entry is as fast and as\r
                simple as possible.  More information (albeit Cortex-M specific) is\r
                provided on the following link:\r
-               http://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
+               https://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
                portASSERT_IF_INTERRUPT_PRIORITY_INVALID();\r
 \r
                uxSavedInterruptState = portSET_INTERRUPT_MASK_FROM_ISR();\r
@@ -1233,15 +1653,15 @@ StackType_t *pxTopOfStack;
                                }\r
 \r
                                /* If the task is in the blocked or suspended list we need do\r
-                               nothing more than change it's priority variable. However, if\r
+                               nothing more than change its priority variable. However, if\r
                                the task is in a ready list it needs to be removed and placed\r
                                in the list appropriate to its new priority. */\r
-                               if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ uxPriorityUsedOnEntry ] ), &( pxTCB->xGenericListItem ) ) != pdFALSE )\r
+                               if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ uxPriorityUsedOnEntry ] ), &( pxTCB->xStateListItem ) ) != pdFALSE )\r
                                {\r
-                                       /* The task is currently in its ready list - remove before adding\r
-                                       it to it's new ready list.  As we are in a critical section we\r
-                                       can do this even if the scheduler is suspended. */\r
-                                       if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
+                                       /* The task is currently in its ready list - remove before\r
+                                       adding it to it's new ready list.  As we are in a critical\r
+                                       section we can do this even if the scheduler is suspended. */\r
+                                       if( uxListRemove( &( pxTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
                                        {\r
                                                /* It is known that the task is in its ready list so\r
                                                there is no need to check again and the port level\r
@@ -1259,7 +1679,7 @@ StackType_t *pxTopOfStack;
                                        mtCOVERAGE_TEST_MARKER();\r
                                }\r
 \r
-                               if( xYieldRequired == pdTRUE )\r
+                               if( xYieldRequired != pdFALSE )\r
                                {\r
                                        taskYIELD_IF_USING_PREEMPTION();\r
                                }\r
@@ -1295,7 +1715,7 @@ StackType_t *pxTopOfStack;
 \r
                        /* Remove task from the ready/delayed list and place in the\r
                        suspended list. */\r
-                       if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
+                       if( uxListRemove( &( pxTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
                        {\r
                                taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                        }\r
@@ -1314,9 +1734,35 @@ StackType_t *pxTopOfStack;
                                mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
-                       vListInsertEnd( &xSuspendedTaskList, &( pxTCB->xGenericListItem ) );\r
+                       vListInsertEnd( &xSuspendedTaskList, &( pxTCB->xStateListItem ) );\r
+\r
+                       #if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+                       {\r
+                               if( pxTCB->ucNotifyState == taskWAITING_NOTIFICATION )\r
+                               {\r
+                                       /* The task was blocked to wait for a notification, but is\r
+                                       now suspended, so no notification was received. */\r
+                                       pxTCB->ucNotifyState = taskNOT_WAITING_NOTIFICATION;\r
+                               }\r
+                       }\r
+                       #endif\r
+               }\r
+               taskEXIT_CRITICAL();\r
+\r
+               if( xSchedulerRunning != pdFALSE )\r
+               {\r
+                       /* Reset the next expected unblock time in case it referred to the\r
+                       task that is now in the Suspended state. */\r
+                       taskENTER_CRITICAL();\r
+                       {\r
+                               prvResetNextTaskUnblockTime();\r
+                       }\r
+                       taskEXIT_CRITICAL();\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
-               taskEXIT_CRITICAL();\r
 \r
                if( pxTCB == pxCurrentTCB )\r
                {\r
@@ -1331,7 +1777,7 @@ StackType_t *pxTopOfStack;
                                /* The scheduler is not running, but the task that was pointed\r
                                to by pxCurrentTCB has just been suspended and pxCurrentTCB\r
                                must be adjusted to point to a different task. */\r
-                               if( listCURRENT_LIST_LENGTH( &xSuspendedTaskList ) == uxCurrentNumberOfTasks )\r
+                               if( listCURRENT_LIST_LENGTH( &xSuspendedTaskList ) == uxCurrentNumberOfTasks ) /*lint !e931 Right has no side effect, just volatile. */\r
                                {\r
                                        /* No other tasks are ready, so set pxCurrentTCB back to\r
                                        NULL so when the next task is created pxCurrentTCB will\r
@@ -1347,21 +1793,7 @@ StackType_t *pxTopOfStack;
                }\r
                else\r
                {\r
-                       if( xSchedulerRunning != pdFALSE )\r
-                       {\r
-                               /* A task other than the currently running task was suspended,\r
-                               reset the next expected unblock time in case it referred to the\r
-                               task that is now in the Suspended state. */\r
-                               taskENTER_CRITICAL();\r
-                               {\r
-                                       prvResetNextTaskUnblockTime();\r
-                               }\r
-                               taskEXIT_CRITICAL();\r
-                       }\r
-                       else\r
-                       {\r
-                               mtCOVERAGE_TEST_MARKER();\r
-                       }\r
+                       mtCOVERAGE_TEST_MARKER();\r
                }\r
        }\r
 \r
@@ -1373,7 +1805,7 @@ StackType_t *pxTopOfStack;
        static BaseType_t prvTaskIsTaskSuspended( const TaskHandle_t xTask )\r
        {\r
        BaseType_t xReturn = pdFALSE;\r
-       const TCB_t * const pxTCB = ( TCB_t * ) xTask;\r
+       const TCB_t * const pxTCB = xTask;\r
 \r
                /* Accesses xPendingReadyList so must be called from a critical\r
                section. */\r
@@ -1382,14 +1814,14 @@ StackType_t *pxTopOfStack;
                configASSERT( xTask );\r
 \r
                /* Is the task being resumed actually in the suspended list? */\r
-               if( listIS_CONTAINED_WITHIN( &xSuspendedTaskList, &( pxTCB->xGenericListItem ) ) != pdFALSE )\r
+               if( listIS_CONTAINED_WITHIN( &xSuspendedTaskList, &( pxTCB->xStateListItem ) ) != pdFALSE )\r
                {\r
                        /* Has the task already been resumed from within an ISR? */\r
                        if( listIS_CONTAINED_WITHIN( &xPendingReadyList, &( pxTCB->xEventListItem ) ) == pdFALSE )\r
                        {\r
                                /* Is it in the suspended list because it is in the     Suspended\r
                                state, or because is is blocked with no timeout? */\r
-                               if( listIS_CONTAINED_WITHIN( NULL, &( pxTCB->xEventListItem ) ) != pdFALSE )\r
+                               if( listIS_CONTAINED_WITHIN( NULL, &( pxTCB->xEventListItem ) ) != pdFALSE ) /*lint !e961.  The cast is only redundant when NULL is used. */\r
                                {\r
                                        xReturn = pdTRUE;\r
                                }\r
@@ -1418,27 +1850,27 @@ StackType_t *pxTopOfStack;
 \r
        void vTaskResume( TaskHandle_t xTaskToResume )\r
        {\r
-       TCB_t * const pxTCB = ( TCB_t * ) xTaskToResume;\r
+       TCB_t * const pxTCB = xTaskToResume;\r
 \r
                /* It does not make sense to resume the calling task. */\r
                configASSERT( xTaskToResume );\r
 \r
                /* The parameter cannot be NULL as it is impossible to resume the\r
                currently executing task. */\r
-               if( ( pxTCB != NULL ) && ( pxTCB != pxCurrentTCB ) )\r
+               if( ( pxTCB != pxCurrentTCB ) && ( pxTCB != NULL ) )\r
                {\r
                        taskENTER_CRITICAL();\r
                        {\r
-                               if( prvTaskIsTaskSuspended( pxTCB ) == pdTRUE )\r
+                               if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )\r
                                {\r
                                        traceTASK_RESUME( pxTCB );\r
 \r
-                                       /* As we are in a critical section we can access the ready\r
-                                       lists even if the scheduler is suspended. */\r
-                                       ( void ) uxListRemove(  &( pxTCB->xGenericListItem ) );\r
+                                       /* The ready list can be accessed even if the scheduler is\r
+                                       suspended because this is inside a critical section. */\r
+                                       ( void ) uxListRemove(  &( pxTCB->xStateListItem ) );\r
                                        prvAddTaskToReadyList( pxTCB );\r
 \r
-                                       /* We may have just resumed a higher priority task. */\r
+                                       /* A higher priority task may have just been resumed. */\r
                                        if( pxTCB->uxPriority >= pxCurrentTCB->uxPriority )\r
                                        {\r
                                                /* This yield may not cause the task just resumed to run,\r
@@ -1473,7 +1905,7 @@ StackType_t *pxTopOfStack;
        BaseType_t xTaskResumeFromISR( TaskHandle_t xTaskToResume )\r
        {\r
        BaseType_t xYieldRequired = pdFALSE;\r
-       TCB_t * const pxTCB = ( TCB_t * ) xTaskToResume;\r
+       TCB_t * const pxTCB = xTaskToResume;\r
        UBaseType_t uxSavedInterruptStatus;\r
 \r
                configASSERT( xTaskToResume );\r
@@ -1493,12 +1925,12 @@ StackType_t *pxTopOfStack;
                separate interrupt safe API to ensure interrupt entry is as fast and as\r
                simple as possible.  More information (albeit Cortex-M specific) is\r
                provided on the following link:\r
-               http://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
+               https://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
                portASSERT_IF_INTERRUPT_PRIORITY_INVALID();\r
 \r
                uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
                {\r
-                       if( prvTaskIsTaskSuspended( pxTCB ) == pdTRUE )\r
+                       if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )\r
                        {\r
                                traceTASK_RESUME_FROM_ISR( pxTCB );\r
 \r
@@ -1516,7 +1948,7 @@ StackType_t *pxTopOfStack;
                                                mtCOVERAGE_TEST_MARKER();\r
                                        }\r
 \r
-                                       ( void ) uxListRemove(  &( pxTCB->xGenericListItem ) );\r
+                                       ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
                                        prvAddTaskToReadyList( pxTCB );\r
                                }\r
                                else\r
@@ -1545,18 +1977,43 @@ void vTaskStartScheduler( void )
 BaseType_t xReturn;\r
 \r
        /* Add the idle task at the lowest priority. */\r
-       #if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )\r
+       #if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
        {\r
-               /* Create the idle task, storing its handle in xIdleTaskHandle so it can\r
-               be returned by the xTaskGetIdleTaskHandle() function. */\r
-               xReturn = xTaskCreate( prvIdleTask, "IDLE", tskIDLE_STACK_SIZE, ( void * ) NULL, ( tskIDLE_PRIORITY | portPRIVILEGE_BIT ), &xIdleTaskHandle ); /*lint !e961 MISRA exception, justified as it is not a redundant explicit cast to all supported compilers. */\r
+               StaticTask_t *pxIdleTaskTCBBuffer = NULL;\r
+               StackType_t *pxIdleTaskStackBuffer = NULL;\r
+               uint32_t ulIdleTaskStackSize;\r
+\r
+               /* The Idle task is created using user provided RAM - obtain the\r
+               address of the RAM then create the idle task. */\r
+               vApplicationGetIdleTaskMemory( &pxIdleTaskTCBBuffer, &pxIdleTaskStackBuffer, &ulIdleTaskStackSize );\r
+               xIdleTaskHandle = xTaskCreateStatic(    prvIdleTask,\r
+                                                                                               configIDLE_TASK_NAME,\r
+                                                                                               ulIdleTaskStackSize,\r
+                                                                                               ( void * ) NULL, /*lint !e961.  The cast is not redundant for all compilers. */\r
+                                                                                               portPRIVILEGE_BIT, /* In effect ( tskIDLE_PRIORITY | portPRIVILEGE_BIT ), but tskIDLE_PRIORITY is zero. */\r
+                                                                                               pxIdleTaskStackBuffer,\r
+                                                                                               pxIdleTaskTCBBuffer ); /*lint !e961 MISRA exception, justified as it is not a redundant explicit cast to all supported compilers. */\r
+\r
+               if( xIdleTaskHandle != NULL )\r
+               {\r
+                       xReturn = pdPASS;\r
+               }\r
+               else\r
+               {\r
+                       xReturn = pdFAIL;\r
+               }\r
        }\r
        #else\r
        {\r
-               /* Create the idle task without storing its handle. */\r
-               xReturn = xTaskCreate( prvIdleTask, "IDLE", tskIDLE_STACK_SIZE, ( void * ) NULL, ( tskIDLE_PRIORITY | portPRIVILEGE_BIT ), NULL );  /*lint !e961 MISRA exception, justified as it is not a redundant explicit cast to all supported compilers. */\r
+               /* The Idle task is being created using dynamically allocated RAM. */\r
+               xReturn = xTaskCreate(  prvIdleTask,\r
+                                                               configIDLE_TASK_NAME,\r
+                                                               configMINIMAL_STACK_SIZE,\r
+                                                               ( void * ) NULL,\r
+                                                               portPRIVILEGE_BIT, /* In effect ( tskIDLE_PRIORITY | portPRIVILEGE_BIT ), but tskIDLE_PRIORITY is zero. */\r
+                                                               &xIdleTaskHandle ); /*lint !e961 MISRA exception, justified as it is not a redundant explicit cast to all supported compilers. */\r
        }\r
-       #endif /* INCLUDE_xTaskGetIdleTaskHandle */\r
+       #endif /* configSUPPORT_STATIC_ALLOCATION */\r
 \r
        #if ( configUSE_TIMERS == 1 )\r
        {\r
@@ -1573,6 +2030,15 @@ BaseType_t xReturn;
 \r
        if( xReturn == pdPASS )\r
        {\r
+               /* freertos_tasks_c_additions_init() should only be called if the user\r
+               definable macro FREERTOS_TASKS_C_ADDITIONS_INIT() is defined, as that is\r
+               the only macro called by the function. */\r
+               #ifdef FREERTOS_TASKS_C_ADDITIONS_INIT\r
+               {\r
+                       freertos_tasks_c_additions_init();\r
+               }\r
+               #endif\r
+\r
                /* Interrupts are turned off here, to ensure a tick does not occur\r
                before or during the call to xPortStartScheduler().  The stacks of\r
                the created tasks contain a status word with interrupts switched on\r
@@ -1583,20 +2049,27 @@ BaseType_t xReturn;
                #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
                {\r
                        /* Switch Newlib's _impure_ptr variable to point to the _reent\r
-                       structure specific to the task that will run first. */\r
+                       structure specific to the task that will run first.\r
+                       See the third party link http://www.nadler.com/embedded/newlibAndFreeRTOS.html\r
+                       for additional information. */\r
                        _impure_ptr = &( pxCurrentTCB->xNewLib_reent );\r
                }\r
                #endif /* configUSE_NEWLIB_REENTRANT */\r
 \r
                xNextTaskUnblockTime = portMAX_DELAY;\r
                xSchedulerRunning = pdTRUE;\r
-               xTickCount = ( TickType_t ) 0U;\r
+               xTickCount = ( TickType_t ) configINITIAL_TICK_COUNT;\r
 \r
                /* If configGENERATE_RUN_TIME_STATS is defined then the following\r
                macro must be defined to configure the timer/counter used to generate\r
-               the run time counter time base. */\r
+               the run time counter time base.   NOTE:  If configGENERATE_RUN_TIME_STATS\r
+               is set to 0 and the following line fails to build then ensure you do not\r
+               have portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() defined in your\r
+               FreeRTOSConfig.h file. */\r
                portCONFIGURE_TIMER_FOR_RUN_TIME_STATS();\r
 \r
+               traceTASK_SWITCHED_IN();\r
+\r
                /* Setting up the timer tick is hardware specific and thus in the\r
                portable interface. */\r
                if( xPortStartScheduler() != pdFALSE )\r
@@ -1614,8 +2087,12 @@ BaseType_t xReturn;
                /* This line will only be reached if the kernel could not be started,\r
                because there was not enough FreeRTOS heap to create the idle task\r
                or the timer task. */\r
-               configASSERT( xReturn );\r
+               configASSERT( xReturn != errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY );\r
        }\r
+\r
+       /* Prevent compiler warnings if INCLUDE_xTaskGetIdleTaskHandle is set to 0,\r
+       meaning xIdleTaskHandle is not used anywhere else. */\r
+       ( void ) xIdleTaskHandle;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -1637,6 +2114,7 @@ void vTaskSuspendAll( void )
        post in the FreeRTOS support forum before reporting this as a bug! -\r
        http://goo.gl/wu4acr */\r
        ++uxSchedulerSuspended;\r
+       portMEMORY_BARRIER();\r
 }\r
 /*----------------------------------------------------------*/\r
 \r
@@ -1645,6 +2123,34 @@ void vTaskSuspendAll( void )
        static TickType_t prvGetExpectedIdleTime( void )\r
        {\r
        TickType_t xReturn;\r
+       UBaseType_t uxHigherPriorityReadyTasks = pdFALSE;\r
+\r
+               /* uxHigherPriorityReadyTasks takes care of the case where\r
+               configUSE_PREEMPTION is 0, so there may be tasks above the idle priority\r
+               task that are in the Ready state, even though the idle task is\r
+               running. */\r
+               #if( configUSE_PORT_OPTIMISED_TASK_SELECTION == 0 )\r
+               {\r
+                       if( uxTopReadyPriority > tskIDLE_PRIORITY )\r
+                       {\r
+                               uxHigherPriorityReadyTasks = pdTRUE;\r
+                       }\r
+               }\r
+               #else\r
+               {\r
+                       const UBaseType_t uxLeastSignificantBit = ( UBaseType_t ) 0x01;\r
+\r
+                       /* When port optimised task selection is used the uxTopReadyPriority\r
+                       variable is used as a bit map.  If bits other than the least\r
+                       significant bit are set then there are tasks that have a priority\r
+                       above the idle priority that are in the Ready state.  This takes\r
+                       care of the case where the co-operative scheduler is in use. */\r
+                       if( uxTopReadyPriority > uxLeastSignificantBit )\r
+                       {\r
+                               uxHigherPriorityReadyTasks = pdTRUE;\r
+                       }\r
+               }\r
+               #endif\r
 \r
                if( pxCurrentTCB->uxPriority > tskIDLE_PRIORITY )\r
                {\r
@@ -1657,6 +2163,13 @@ void vTaskSuspendAll( void )
                        processed. */\r
                        xReturn = 0;\r
                }\r
+               else if( uxHigherPriorityReadyTasks != pdFALSE )\r
+               {\r
+                       /* There are tasks in the Ready state that have a priority above the\r
+                       idle priority.  This path can only be reached if\r
+                       configUSE_PREEMPTION is 0. */\r
+                       xReturn = 0;\r
+               }\r
                else\r
                {\r
                        xReturn = xNextTaskUnblockTime - xTickCount;\r
@@ -1670,8 +2183,9 @@ void vTaskSuspendAll( void )
 \r
 BaseType_t xTaskResumeAll( void )\r
 {\r
-TCB_t *pxTCB;\r
+TCB_t *pxTCB = NULL;\r
 BaseType_t xAlreadyYielded = pdFALSE;\r
+TickType_t xTicksToNextUnblockTime;\r
 \r
        /* If uxSchedulerSuspended is zero then this function does not match a\r
        previous call to vTaskSuspendAll(). */\r
@@ -1694,9 +2208,9 @@ BaseType_t xAlreadyYielded = pdFALSE;
                                appropriate ready list. */\r
                                while( listLIST_IS_EMPTY( &xPendingReadyList ) == pdFALSE )\r
                                {\r
-                                       pxTCB = ( TCB_t * ) listGET_OWNER_OF_HEAD_ENTRY( ( &xPendingReadyList ) );\r
+                                       pxTCB = listGET_OWNER_OF_HEAD_ENTRY( ( &xPendingReadyList ) ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
                                        ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
-                                       ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
+                                       ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
                                        prvAddTaskToReadyList( pxTCB );\r
 \r
                                        /* If the moved task has a priority higher than the current\r
@@ -1711,31 +2225,69 @@ BaseType_t xAlreadyYielded = pdFALSE;
                                        }\r
                                }\r
 \r
+                               if( pxTCB != NULL )\r
+                               {\r
+                                       /* A task was unblocked while the scheduler was suspended,\r
+                                       which may have prevented the next unblock time from being\r
+                                       re-calculated, in which case re-calculate it now.  Mainly\r
+                                       important for low power tickless implementations, where\r
+                                       this can prevent an unnecessary exit from low power\r
+                                       state. */\r
+                                       prvResetNextTaskUnblockTime();\r
+                               }\r
+\r
                                /* If any ticks occurred while the scheduler was suspended then\r
                                they should be processed now.  This ensures the tick count does\r
                                not     slip, and that any delayed tasks are resumed at the correct\r
                                time. */\r
-                               if( uxPendedTicks > ( UBaseType_t ) 0U )\r
+                               while( xPendedTicks > ( TickType_t ) 0 )\r
                                {\r
-                                       while( uxPendedTicks > ( UBaseType_t ) 0U )\r
+                                       /* Calculate how far into the future the next task will\r
+                                       leave the Blocked state because its timeout expired.  If\r
+                                       there are no tasks due to leave the blocked state between\r
+                                       the time now and the time at which the tick count overflows\r
+                                       then xNextTaskUnblockTime will the tick overflow time.\r
+                                       This means xNextTaskUnblockTime can never be less than\r
+                                       xTickCount, and the following can therefore not\r
+                                       underflow. */\r
+                                       configASSERT( xNextTaskUnblockTime >= xTickCount );\r
+                                       xTicksToNextUnblockTime = xNextTaskUnblockTime - xTickCount;\r
+\r
+                                       /* Don't want to move the tick count more than the number\r
+                                       of ticks that are pending, so cap if necessary. */\r
+                                       if( xTicksToNextUnblockTime > xPendedTicks )\r
                                        {\r
-                                               if( xTaskIncrementTick() != pdFALSE )\r
-                                               {\r
-                                                       xYieldPending = pdTRUE;\r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       mtCOVERAGE_TEST_MARKER();\r
-                                               }\r
-                                               --uxPendedTicks;\r
+                                               xTicksToNextUnblockTime = xPendedTicks;\r
                                        }\r
-                               }\r
-                               else\r
-                               {\r
-                                       mtCOVERAGE_TEST_MARKER();\r
+\r
+                                       if( xTicksToNextUnblockTime == 0 )\r
+                                       {\r
+                                               /* xTicksToNextUnblockTime could be zero if the tick\r
+                                               count is about to overflow and xTicksToNetUnblockTime\r
+                                               holds the time at which the tick count will overflow\r
+                                               (rather than the time at which the next task will\r
+                                               unblock).  Set to 1 otherwise xPendedTicks won't be\r
+                                               decremented below. */\r
+                                               xTicksToNextUnblockTime = ( TickType_t ) 1;\r
+                                       }\r
+                                       else if( xTicksToNextUnblockTime > ( TickType_t ) 1 )\r
+                                       {\r
+                                               /* Move the tick count one short of the next unblock\r
+                                               time, then call xTaskIncrementTick() to move the tick\r
+                                               count up to the next unblock time to unblock the task,\r
+                                               if any.  This will also swap the blocked task and\r
+                                               overflow blocked task lists if necessary. */\r
+                                               xTickCount += ( xTicksToNextUnblockTime - ( TickType_t ) 1 );\r
+                                       }\r
+                                       xYieldPending |= xTaskIncrementTick();\r
+\r
+                                       /* Adjust for the number of ticks just added to\r
+                                       xTickCount and go around the loop again if\r
+                                       xTicksToCatchUp is still greater than 0. */\r
+                                       xPendedTicks -= xTicksToNextUnblockTime;\r
                                }\r
 \r
-                               if( xYieldPending == pdTRUE )\r
+                               if( xYieldPending != pdFALSE )\r
                                {\r
                                        #if( configUSE_PREEMPTION != 0 )\r
                                        {\r
@@ -1794,7 +2346,7 @@ UBaseType_t uxSavedInterruptStatus;
        system call     interrupt priority.  FreeRTOS maintains a separate interrupt\r
        safe API to ensure interrupt entry is as fast and as simple as possible.\r
        More information (albeit Cortex-M specific) is provided on the following\r
-       link: http://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
+       link: https://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
        portASSERT_IF_INTERRUPT_PRIORITY_INVALID();\r
 \r
        uxSavedInterruptStatus = portTICK_TYPE_SET_INTERRUPT_MASK_FROM_ISR();\r
@@ -1815,19 +2367,149 @@ UBaseType_t uxTaskGetNumberOfTasks( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( INCLUDE_pcTaskGetTaskName == 1 )\r
+char *pcTaskGetName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+{\r
+TCB_t *pxTCB;\r
+\r
+       /* If null is passed in here then the name of the calling task is being\r
+       queried. */\r
+       pxTCB = prvGetTCBFromHandle( xTaskToQuery );\r
+       configASSERT( pxTCB );\r
+       return &( pxTCB->pcTaskName[ 0 ] );\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_xTaskGetHandle == 1 )\r
 \r
-       char *pcTaskGetTaskName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+       static TCB_t *prvSearchForNameWithinSingleList( List_t *pxList, const char pcNameToQuery[] )\r
        {\r
-       TCB_t *pxTCB;\r
+       TCB_t *pxNextTCB, *pxFirstTCB, *pxReturn = NULL;\r
+       UBaseType_t x;\r
+       char cNextChar;\r
+       BaseType_t xBreakLoop;\r
 \r
-               /* If null is passed in here then the name of the calling task is being queried. */\r
-               pxTCB = prvGetTCBFromHandle( xTaskToQuery );\r
-               configASSERT( pxTCB );\r
-               return &( pxTCB->pcTaskName[ 0 ] );\r
+               /* This function is called with the scheduler suspended. */\r
+\r
+               if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )\r
+               {\r
+                       listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList );  /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
+\r
+                       do\r
+                       {\r
+                               listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
+\r
+                               /* Check each character in the name looking for a match or\r
+                               mismatch. */\r
+                               xBreakLoop = pdFALSE;\r
+                               for( x = ( UBaseType_t ) 0; x < ( UBaseType_t ) configMAX_TASK_NAME_LEN; x++ )\r
+                               {\r
+                                       cNextChar = pxNextTCB->pcTaskName[ x ];\r
+\r
+                                       if( cNextChar != pcNameToQuery[ x ] )\r
+                                       {\r
+                                               /* Characters didn't match. */\r
+                                               xBreakLoop = pdTRUE;\r
+                                       }\r
+                                       else if( cNextChar == ( char ) 0x00 )\r
+                                       {\r
+                                               /* Both strings terminated, a match must have been\r
+                                               found. */\r
+                                               pxReturn = pxNextTCB;\r
+                                               xBreakLoop = pdTRUE;\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+\r
+                                       if( xBreakLoop != pdFALSE )\r
+                                       {\r
+                                               break;\r
+                                       }\r
+                               }\r
+\r
+                               if( pxReturn != NULL )\r
+                               {\r
+                                       /* The handle has been found. */\r
+                                       break;\r
+                               }\r
+\r
+                       } while( pxNextTCB != pxFirstTCB );\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
+\r
+               return pxReturn;\r
+       }\r
+\r
+#endif /* INCLUDE_xTaskGetHandle */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_xTaskGetHandle == 1 )\r
+\r
+       TaskHandle_t xTaskGetHandle( const char *pcNameToQuery ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
+       {\r
+       UBaseType_t uxQueue = configMAX_PRIORITIES;\r
+       TCB_t* pxTCB;\r
+\r
+               /* Task names will be truncated to configMAX_TASK_NAME_LEN - 1 bytes. */\r
+               configASSERT( strlen( pcNameToQuery ) < configMAX_TASK_NAME_LEN );\r
+\r
+               vTaskSuspendAll();\r
+               {\r
+                       /* Search the ready lists. */\r
+                       do\r
+                       {\r
+                               uxQueue--;\r
+                               pxTCB = prvSearchForNameWithinSingleList( ( List_t * ) &( pxReadyTasksLists[ uxQueue ] ), pcNameToQuery );\r
+\r
+                               if( pxTCB != NULL )\r
+                               {\r
+                                       /* Found the handle. */\r
+                                       break;\r
+                               }\r
+\r
+                       } while( uxQueue > ( UBaseType_t ) tskIDLE_PRIORITY ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
+\r
+                       /* Search the delayed lists. */\r
+                       if( pxTCB == NULL )\r
+                       {\r
+                               pxTCB = prvSearchForNameWithinSingleList( ( List_t * ) pxDelayedTaskList, pcNameToQuery );\r
+                       }\r
+\r
+                       if( pxTCB == NULL )\r
+                       {\r
+                               pxTCB = prvSearchForNameWithinSingleList( ( List_t * ) pxOverflowDelayedTaskList, pcNameToQuery );\r
+                       }\r
+\r
+                       #if ( INCLUDE_vTaskSuspend == 1 )\r
+                       {\r
+                               if( pxTCB == NULL )\r
+                               {\r
+                                       /* Search the suspended list. */\r
+                                       pxTCB = prvSearchForNameWithinSingleList( &xSuspendedTaskList, pcNameToQuery );\r
+                               }\r
+                       }\r
+                       #endif\r
+\r
+                       #if( INCLUDE_vTaskDelete == 1 )\r
+                       {\r
+                               if( pxTCB == NULL )\r
+                               {\r
+                                       /* Search the deleted list. */\r
+                                       pxTCB = prvSearchForNameWithinSingleList( &xTasksWaitingTermination, pcNameToQuery );\r
+                               }\r
+                       }\r
+                       #endif\r
+               }\r
+               ( void ) xTaskResumeAll();\r
+\r
+               return pxTCB;\r
        }\r
 \r
-#endif /* INCLUDE_pcTaskGetTaskName */\r
+#endif /* INCLUDE_xTaskGetHandle */\r
 /*-----------------------------------------------------------*/\r
 \r
 #if ( configUSE_TRACE_FACILITY == 1 )\r
@@ -1846,20 +2528,20 @@ UBaseType_t uxTaskGetNumberOfTasks( void )
                                do\r
                                {\r
                                        uxQueue--;\r
-                                       uxTask += prvListTaskWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), &( pxReadyTasksLists[ uxQueue ] ), eReady );\r
+                                       uxTask += prvListTasksWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), &( pxReadyTasksLists[ uxQueue ] ), eReady );\r
 \r
                                } while( uxQueue > ( UBaseType_t ) tskIDLE_PRIORITY ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
 \r
                                /* Fill in an TaskStatus_t structure with information on each\r
                                task in the Blocked state. */\r
-                               uxTask += prvListTaskWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), ( List_t * ) pxDelayedTaskList, eBlocked );\r
-                               uxTask += prvListTaskWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), ( List_t * ) pxOverflowDelayedTaskList, eBlocked );\r
+                               uxTask += prvListTasksWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), ( List_t * ) pxDelayedTaskList, eBlocked );\r
+                               uxTask += prvListTasksWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), ( List_t * ) pxOverflowDelayedTaskList, eBlocked );\r
 \r
                                #if( INCLUDE_vTaskDelete == 1 )\r
                                {\r
                                        /* Fill in an TaskStatus_t structure with information on\r
                                        each task that has been deleted but not yet cleaned up. */\r
-                                       uxTask += prvListTaskWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), &xTasksWaitingTermination, eDeleted );\r
+                                       uxTask += prvListTasksWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), &xTasksWaitingTermination, eDeleted );\r
                                }\r
                                #endif\r
 \r
@@ -1867,7 +2549,7 @@ UBaseType_t uxTaskGetNumberOfTasks( void )
                                {\r
                                        /* Fill in an TaskStatus_t structure with information on\r
                                        each task in the Suspended state. */\r
-                                       uxTask += prvListTaskWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), &xSuspendedTaskList, eSuspended );\r
+                                       uxTask += prvListTasksWithinSingleList( &( pxTaskStatusArray[ uxTask ] ), &xSuspendedTaskList, eSuspended );\r
                                }\r
                                #endif\r
 \r
@@ -1923,17 +2605,200 @@ implementations require configUSE_TICKLESS_IDLE to be set to a value other than
 1. */\r
 #if ( configUSE_TICKLESS_IDLE != 0 )\r
 \r
-       void vTaskStepTick( const TickType_t xTicksToJump )\r
-       {\r
-               /* Correct the tick count value after a period during which the tick\r
-               was suppressed.  Note this does *not* call the tick hook function for\r
-               each stepped tick. */\r
-               configASSERT( ( xTickCount + xTicksToJump ) <= xNextTaskUnblockTime );\r
-               xTickCount += xTicksToJump;\r
-               traceINCREASE_TICK_COUNT( xTicksToJump );\r
+       void vTaskStepTick( const TickType_t xTicksToJump )\r
+       {\r
+               /* Correct the tick count value after a period during which the tick\r
+               was suppressed.  Note this does *not* call the tick hook function for\r
+               each stepped tick. */\r
+               configASSERT( ( xTickCount + xTicksToJump ) <= xNextTaskUnblockTime );\r
+               xTickCount += xTicksToJump;\r
+               traceINCREASE_TICK_COUNT( xTicksToJump );\r
+       }\r
+\r
+#endif /* configUSE_TICKLESS_IDLE */\r
+/*----------------------------------------------------------*/\r
+\r
+BaseType_t xTaskCatchUpTicks( TickType_t xTicksToCatchUp )\r
+{\r
+BaseType_t xYieldRequired = pdFALSE;\r
+\r
+       /* Must not be called with the scheduler suspended as the implementation\r
+       relies on xPendedTicks being wound down to 0 in xTaskResumeAll(). */\r
+       configASSERT( uxSchedulerSuspended == 0 );\r
+\r
+       /* Use xPendedTicks to mimic xTicksToCatchUp number of ticks occurring when\r
+       the scheduler is suspended so the ticks are executed in xTaskResumeAll(). */\r
+       vTaskSuspendAll();\r
+       xPendedTicks += xTicksToCatchUp;\r
+       xYieldRequired = xTaskResumeAll();\r
+\r
+       return xYieldRequired;\r
+}\r
+/*----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_xTaskAbortDelay == 1 )\r
+\r
+       BaseType_t xTaskAbortDelayFromISR( TaskHandle_t xTask, BaseType_t * const pxHigherPriorityTaskWoken )\r
+       {\r
+       TCB_t *pxTCB = xTask;\r
+       BaseType_t xReturn;\r
+       UBaseType_t uxSavedInterruptStatus;\r
+\r
+               configASSERT( pxTCB );\r
+\r
+               /* RTOS ports that support interrupt nesting have the concept of a maximum\r
+               system call (or maximum API call) interrupt priority.  Interrupts that are\r
+               above the maximum system call priority are kept permanently enabled, even\r
+               when the RTOS kernel is in a critical section, but cannot make any calls to\r
+               FreeRTOS API functions.  If configASSERT() is defined in FreeRTOSConfig.h\r
+               then portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion\r
+               failure if a FreeRTOS API function is called from an interrupt that has been\r
+               assigned a priority above the configured maximum system call priority.\r
+               Only FreeRTOS functions that end in FromISR can be called from interrupts\r
+               that have been assigned a priority at or (logically) below the maximum\r
+               system call     interrupt priority.  FreeRTOS maintains a separate interrupt\r
+               safe API to ensure interrupt entry is as fast and as simple as possible.\r
+               More information (albeit Cortex-M specific) is provided on the following\r
+               link: http://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
+               portASSERT_IF_INTERRUPT_PRIORITY_INVALID();\r
+\r
+               uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
+               {\r
+                       /* A task can only be prematurely removed from the Blocked state if\r
+                       it is actually in the Blocked state. */\r
+                       if( eTaskGetState( xTask ) == eBlocked )\r
+                       {\r
+                               xReturn = pdPASS;\r
+\r
+                               /* Remove the reference to the task from the blocked list.  A higher\r
+                               priority interrupt won't touch the xStateListItem because of the\r
+                               critical section. */\r
+                               ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
+\r
+                               /* Is the task waiting on an event also?  If so remove it from\r
+                               the event list too. */\r
+                               if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
+                               {\r
+                                       ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
+\r
+                                       /* This lets the task know it was forcibly removed from the\r
+                                       blocked state so it should not re-evaluate its block time and\r
+                                       then block again. */\r
+                                       pxTCB->ucDelayAborted = pdTRUE;\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+\r
+                               /* Place the unblocked task into the appropriate ready list. */\r
+                               prvAddTaskToReadyList( pxTCB );\r
+\r
+                               if( pxTCB->uxPriority > pxCurrentTCB->uxPriority )\r
+                               {\r
+                                       if( pxHigherPriorityTaskWoken != NULL )\r
+                                       {\r
+                                               /* Pend the yield to be performed when the scheduler\r
+                                               is unsuspended. */\r
+                                               *pxHigherPriorityTaskWoken = pdTRUE;\r
+                                       }\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               xReturn = pdFAIL;\r
+                       }\r
+               }\r
+               portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif\r
+/*----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_xTaskAbortDelay == 1 )\r
+\r
+       BaseType_t xTaskAbortDelay( TaskHandle_t xTask )\r
+       {\r
+       TCB_t *pxTCB = xTask;\r
+       BaseType_t xReturn;\r
+\r
+               configASSERT( pxTCB );\r
+\r
+               vTaskSuspendAll();\r
+               {\r
+                       /* A task can only be prematurely removed from the Blocked state if\r
+                       it is actually in the Blocked state. */\r
+                       if( eTaskGetState( xTask ) == eBlocked )\r
+                       {\r
+                               xReturn = pdPASS;\r
+\r
+                               /* Remove the reference to the task from the blocked list.  An\r
+                               interrupt won't touch the xStateListItem because the\r
+                               scheduler is suspended. */\r
+                               ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
+\r
+                               /* Is the task waiting on an event also?  If so remove it from\r
+                               the event list too.  Interrupts can touch the event list item,\r
+                               even though the scheduler is suspended, so a critical section\r
+                               is used. */\r
+                               taskENTER_CRITICAL();\r
+                               {\r
+                                       if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
+                                       {\r
+                                               ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
+\r
+                                               /* This lets the task know it was forcibly removed from the\r
+                                               blocked state so it should not re-evaluate its block time and\r
+                                               then block again. */\r
+                                               pxTCB->ucDelayAborted = pdTRUE;\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               taskEXIT_CRITICAL();\r
+\r
+                               /* Place the unblocked task into the appropriate ready list. */\r
+                               prvAddTaskToReadyList( pxTCB );\r
+\r
+                               /* A task being unblocked cannot cause an immediate context\r
+                               switch if preemption is turned off. */\r
+                               #if (  configUSE_PREEMPTION == 1 )\r
+                               {\r
+                                       /* Preemption is on, but a context switch should only be\r
+                                       performed if the unblocked task has a priority that is\r
+                                       equal to or higher than the currently executing task. */\r
+                                       if( pxTCB->uxPriority > pxCurrentTCB->uxPriority )\r
+                                       {\r
+                                               /* Pend the yield to be performed when the scheduler\r
+                                               is unsuspended. */\r
+                                               xYieldPending = pdTRUE;\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               #endif /* configUSE_PREEMPTION */\r
+                       }\r
+                       else\r
+                       {\r
+                               xReturn = pdFAIL;\r
+                       }\r
+               }\r
+               ( void ) xTaskResumeAll();\r
+\r
+               return xReturn;\r
        }\r
 \r
-#endif /* configUSE_TICKLESS_IDLE */\r
+#endif /* INCLUDE_xTaskAbortDelay */\r
 /*----------------------------------------------------------*/\r
 \r
 BaseType_t xTaskIncrementTick( void )\r
@@ -1948,103 +2813,101 @@ BaseType_t xSwitchRequired = pdFALSE;
        traceTASK_INCREMENT_TICK( xTickCount );\r
        if( uxSchedulerSuspended == ( UBaseType_t ) pdFALSE )\r
        {\r
+               /* Minor optimisation.  The tick count cannot change in this\r
+               block. */\r
+               const TickType_t xConstTickCount = xTickCount + ( TickType_t ) 1;\r
+\r
                /* Increment the RTOS tick, switching the delayed and overflowed\r
                delayed lists if it wraps to 0. */\r
-               ++xTickCount;\r
+               xTickCount = xConstTickCount;\r
 \r
+               if( xConstTickCount == ( TickType_t ) 0U ) /*lint !e774 'if' does not always evaluate to false as it is looking for an overflow. */\r
                {\r
-                       /* Minor optimisation.  The tick count cannot change in this\r
-                       block. */\r
-                       const TickType_t xConstTickCount = xTickCount;\r
-\r
-                       if( xConstTickCount == ( TickType_t ) 0U )\r
-                       {\r
-                               taskSWITCH_DELAYED_LISTS();\r
-                       }\r
-                       else\r
-                       {\r
-                               mtCOVERAGE_TEST_MARKER();\r
-                       }\r
+                       taskSWITCH_DELAYED_LISTS();\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
 \r
-                       /* See if this tick has made a timeout expire.  Tasks are stored in\r
-                       the     queue in the order of their wake time - meaning once one task\r
-                       has been found whose block time has not expired there is no need to\r
-                       look any further down the list. */\r
-                       if( xConstTickCount >= xNextTaskUnblockTime )\r
+               /* See if this tick has made a timeout expire.  Tasks are stored in\r
+               the     queue in the order of their wake time - meaning once one task\r
+               has been found whose block time has not expired there is no need to\r
+               look any further down the list. */\r
+               if( xConstTickCount >= xNextTaskUnblockTime )\r
+               {\r
+                       for( ;; )\r
                        {\r
-                               for( ;; )\r
+                               if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE )\r
+                               {\r
+                                       /* The delayed list is empty.  Set xNextTaskUnblockTime\r
+                                       to the maximum possible value so it is extremely\r
+                                       unlikely that the\r
+                                       if( xTickCount >= xNextTaskUnblockTime ) test will pass\r
+                                       next time through. */\r
+                                       xNextTaskUnblockTime = portMAX_DELAY; /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
+                                       break;\r
+                               }\r
+                               else\r
                                {\r
-                                       if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE )\r
+                                       /* The delayed list is not empty, get the value of the\r
+                                       item at the head of the delayed list.  This is the time\r
+                                       at which the task at the head of the delayed list must\r
+                                       be removed from the Blocked state. */\r
+                                       pxTCB = listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
+                                       xItemValue = listGET_LIST_ITEM_VALUE( &( pxTCB->xStateListItem ) );\r
+\r
+                                       if( xConstTickCount < xItemValue )\r
                                        {\r
-                                               /* The delayed list is empty.  Set xNextTaskUnblockTime\r
-                                               to the maximum possible value so it is extremely\r
-                                               unlikely that the\r
-                                               if( xTickCount >= xNextTaskUnblockTime ) test will pass\r
-                                               next time through. */\r
-                                               xNextTaskUnblockTime = portMAX_DELAY;\r
-                                               break;\r
+                                               /* It is not time to unblock this item yet, but the\r
+                                               item value is the time at which the task at the head\r
+                                               of the blocked list must be removed from the Blocked\r
+                                               state - so record the item value in\r
+                                               xNextTaskUnblockTime. */\r
+                                               xNextTaskUnblockTime = xItemValue;\r
+                                               break; /*lint !e9011 Code structure here is deedmed easier to understand with multiple breaks. */\r
                                        }\r
                                        else\r
                                        {\r
-                                               /* The delayed list is not empty, get the value of the\r
-                                               item at the head of the delayed list.  This is the time\r
-                                               at which the task at the head of the delayed list must\r
-                                               be removed from the Blocked state. */\r
-                                               pxTCB = ( TCB_t * ) listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList );\r
-                                               xItemValue = listGET_LIST_ITEM_VALUE( &( pxTCB->xGenericListItem ) );\r
-\r
-                                               if( xConstTickCount < xItemValue )\r
-                                               {\r
-                                                       /* It is not time to unblock this item yet, but the\r
-                                                       item value is the time at which the task at the head\r
-                                                       of the blocked list must be removed from the Blocked\r
-                                                       state - so record the item value in\r
-                                                       xNextTaskUnblockTime. */\r
-                                                       xNextTaskUnblockTime = xItemValue;\r
-                                                       break;\r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       mtCOVERAGE_TEST_MARKER();\r
-                                               }\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+\r
+                                       /* It is time to remove the item from the Blocked state. */\r
+                                       ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
+\r
+                                       /* Is the task waiting on an event also?  If so remove\r
+                                       it from the event list. */\r
+                                       if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
+                                       {\r
+                                               ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
 \r
-                                               /* It is time to remove the item from the Blocked state. */\r
-                                               ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
+                                       /* Place the unblocked task into the appropriate ready\r
+                                       list. */\r
+                                       prvAddTaskToReadyList( pxTCB );\r
 \r
-                                               /* Is the task waiting on an event also?  If so remove\r
-                                               it from the event list. */\r
-                                               if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
+                                       /* A task being unblocked cannot cause an immediate\r
+                                       context switch if preemption is turned off. */\r
+                                       #if (  configUSE_PREEMPTION == 1 )\r
+                                       {\r
+                                               /* Preemption is on, but a context switch should\r
+                                               only be performed if the unblocked task has a\r
+                                               priority that is equal to or higher than the\r
+                                               currently executing task. */\r
+                                               if( pxTCB->uxPriority >= pxCurrentTCB->uxPriority )\r
                                                {\r
-                                                       ( void ) uxListRemove( &( pxTCB->xEventListItem ) );\r
+                                                       xSwitchRequired = pdTRUE;\r
                                                }\r
                                                else\r
                                                {\r
                                                        mtCOVERAGE_TEST_MARKER();\r
                                                }\r
-\r
-                                               /* Place the unblocked task into the appropriate ready\r
-                                               list. */\r
-                                               prvAddTaskToReadyList( pxTCB );\r
-\r
-                                               /* A task being unblocked cannot cause an immediate\r
-                                               context switch if preemption is turned off. */\r
-                                               #if (  configUSE_PREEMPTION == 1 )\r
-                                               {\r
-                                                       /* Preemption is on, but a context switch should\r
-                                                       only be performed if the unblocked task has a\r
-                                                       priority that is equal to or higher than the\r
-                                                       currently executing task. */\r
-                                                       if( pxTCB->uxPriority >= pxCurrentTCB->uxPriority )\r
-                                                       {\r
-                                                               xSwitchRequired = pdTRUE;\r
-                                                       }\r
-                                                       else\r
-                                                       {\r
-                                                               mtCOVERAGE_TEST_MARKER();\r
-                                                       }\r
-                                               }\r
-                                               #endif /* configUSE_PREEMPTION */\r
                                        }\r
+                                       #endif /* configUSE_PREEMPTION */\r
                                }\r
                        }\r
                }\r
@@ -2069,7 +2932,7 @@ BaseType_t xSwitchRequired = pdFALSE;
                {\r
                        /* Guard against the tick hook being called when the pended tick\r
                        count is being unwound (when the scheduler is being unlocked). */\r
-                       if( uxPendedTicks == ( UBaseType_t ) 0U )\r
+                       if( xPendedTicks == ( TickType_t ) 0 )\r
                        {\r
                                vApplicationTickHook();\r
                        }\r
@@ -2079,10 +2942,23 @@ BaseType_t xSwitchRequired = pdFALSE;
                        }\r
                }\r
                #endif /* configUSE_TICK_HOOK */\r
+\r
+               #if ( configUSE_PREEMPTION == 1 )\r
+               {\r
+                       if( xYieldPending != pdFALSE )\r
+                       {\r
+                               xSwitchRequired = pdTRUE;\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               #endif /* configUSE_PREEMPTION */\r
        }\r
        else\r
        {\r
-               ++uxPendedTicks;\r
+               ++xPendedTicks;\r
 \r
                /* The tick hook gets called at regular intervals, even if the\r
                scheduler is locked. */\r
@@ -2093,19 +2969,6 @@ BaseType_t xSwitchRequired = pdFALSE;
                #endif\r
        }\r
 \r
-       #if ( configUSE_PREEMPTION == 1 )\r
-       {\r
-               if( xYieldPending != pdFALSE )\r
-               {\r
-                       xSwitchRequired = pdTRUE;\r
-               }\r
-               else\r
-               {\r
-                       mtCOVERAGE_TEST_MARKER();\r
-               }\r
-       }\r
-       #endif /* configUSE_PREEMPTION */\r
-\r
        return xSwitchRequired;\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -2124,13 +2987,15 @@ BaseType_t xSwitchRequired = pdFALSE;
                }\r
                else\r
                {\r
-                       xTCB = ( TCB_t * ) xTask;\r
+                       xTCB = xTask;\r
                }\r
 \r
                /* Save the hook function in the TCB.  A critical section is required as\r
                the value can be accessed from an interrupt. */\r
                taskENTER_CRITICAL();\r
+               {\r
                        xTCB->pxTaskTag = pxHookFunction;\r
+               }\r
                taskEXIT_CRITICAL();\r
        }\r
 \r
@@ -2141,24 +3006,17 @@ BaseType_t xSwitchRequired = pdFALSE;
 \r
        TaskHookFunction_t xTaskGetApplicationTaskTag( TaskHandle_t xTask )\r
        {\r
-       TCB_t *xTCB;\r
+       TCB_t *pxTCB;\r
        TaskHookFunction_t xReturn;\r
 \r
-               /* If xTask is NULL then we are setting our own task hook. */\r
-               if( xTask == NULL )\r
-               {\r
-                       xTCB = ( TCB_t * ) pxCurrentTCB;\r
-               }\r
-               else\r
-               {\r
-                       xTCB = ( TCB_t * ) xTask;\r
-               }\r
+               /* If xTask is NULL then set the calling task's hook. */\r
+               pxTCB = prvGetTCBFromHandle( xTask );\r
 \r
                /* Save the hook function in the TCB.  A critical section is required as\r
                the value can be accessed from an interrupt. */\r
                taskENTER_CRITICAL();\r
                {\r
-                       xReturn = xTCB->pxTaskTag;\r
+                       xReturn = pxTCB->pxTaskTag;\r
                }\r
                taskEXIT_CRITICAL();\r
 \r
@@ -2168,6 +3026,31 @@ BaseType_t xSwitchRequired = pdFALSE;
 #endif /* configUSE_APPLICATION_TASK_TAG */\r
 /*-----------------------------------------------------------*/\r
 \r
+#if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
+\r
+       TaskHookFunction_t xTaskGetApplicationTaskTagFromISR( TaskHandle_t xTask )\r
+       {\r
+       TCB_t *pxTCB;\r
+       TaskHookFunction_t xReturn;\r
+       UBaseType_t uxSavedInterruptStatus;\r
+\r
+               /* If xTask is NULL then set the calling task's hook. */\r
+               pxTCB = prvGetTCBFromHandle( xTask );\r
+\r
+               /* Save the hook function in the TCB.  A critical section is required as\r
+               the value can be accessed from an interrupt. */\r
+               uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
+               {\r
+                       xReturn = pxTCB->pxTaskTag;\r
+               }\r
+               portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif /* configUSE_APPLICATION_TASK_TAG */\r
+/*-----------------------------------------------------------*/\r
+\r
 #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
 \r
        BaseType_t xTaskCallApplicationTaskHook( TaskHandle_t xTask, void *pvParameter )\r
@@ -2178,11 +3061,11 @@ BaseType_t xSwitchRequired = pdFALSE;
                /* If xTask is NULL then we are calling our own task hook. */\r
                if( xTask == NULL )\r
                {\r
-                       xTCB = ( TCB_t * ) pxCurrentTCB;\r
+                       xTCB = pxCurrentTCB;\r
                }\r
                else\r
                {\r
-                       xTCB = ( TCB_t * ) xTask;\r
+                       xTCB = xTask;\r
                }\r
 \r
                if( xTCB->pxTaskTag != NULL )\r
@@ -2215,44 +3098,59 @@ void vTaskSwitchContext( void )
 \r
                #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
                {\r
-                               #ifdef portALT_GET_RUN_TIME_COUNTER_VALUE\r
-                                       portALT_GET_RUN_TIME_COUNTER_VALUE( ulTotalRunTime );\r
-                               #else\r
-                                       ulTotalRunTime = portGET_RUN_TIME_COUNTER_VALUE();\r
-                               #endif\r
+                       #ifdef portALT_GET_RUN_TIME_COUNTER_VALUE\r
+                               portALT_GET_RUN_TIME_COUNTER_VALUE( ulTotalRunTime );\r
+                       #else\r
+                               ulTotalRunTime = portGET_RUN_TIME_COUNTER_VALUE();\r
+                       #endif\r
 \r
-                               /* Add the amount of time the task has been running to the\r
-                               accumulated     time so far.  The time the task started running was\r
-                               stored in ulTaskSwitchedInTime.  Note that there is no overflow\r
-                               protection here so count values are only valid until the timer\r
-                               overflows.  The guard against negative values is to protect\r
-                               against suspect run time stat counter implementations - which\r
-                               are provided by the application, not the kernel. */\r
-                               if( ulTotalRunTime > ulTaskSwitchedInTime )\r
-                               {\r
-                                       pxCurrentTCB->ulRunTimeCounter += ( ulTotalRunTime - ulTaskSwitchedInTime );\r
-                               }\r
-                               else\r
-                               {\r
-                                       mtCOVERAGE_TEST_MARKER();\r
-                               }\r
-                               ulTaskSwitchedInTime = ulTotalRunTime;\r
+                       /* Add the amount of time the task has been running to the\r
+                       accumulated time so far.  The time the task started running was\r
+                       stored in ulTaskSwitchedInTime.  Note that there is no overflow\r
+                       protection here so count values are only valid until the timer\r
+                       overflows.  The guard against negative values is to protect\r
+                       against suspect run time stat counter implementations - which\r
+                       are provided by the application, not the kernel. */\r
+                       if( ulTotalRunTime > ulTaskSwitchedInTime )\r
+                       {\r
+                               pxCurrentTCB->ulRunTimeCounter += ( ulTotalRunTime - ulTaskSwitchedInTime );\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+                       ulTaskSwitchedInTime = ulTotalRunTime;\r
                }\r
                #endif /* configGENERATE_RUN_TIME_STATS */\r
 \r
                /* Check for stack overflow, if configured. */\r
-               taskFIRST_CHECK_FOR_STACK_OVERFLOW();\r
-               taskSECOND_CHECK_FOR_STACK_OVERFLOW();\r
+               taskCHECK_FOR_STACK_OVERFLOW();\r
+\r
+               /* Before the currently running task is switched out, save its errno. */\r
+               #if( configUSE_POSIX_ERRNO == 1 )\r
+               {\r
+                       pxCurrentTCB->iTaskErrno = FreeRTOS_errno;\r
+               }\r
+               #endif\r
 \r
                /* Select a new task to run using either the generic C or port\r
                optimised asm code. */\r
-               taskSELECT_HIGHEST_PRIORITY_TASK();\r
+               taskSELECT_HIGHEST_PRIORITY_TASK(); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
                traceTASK_SWITCHED_IN();\r
 \r
+               /* After the new task is switched in, update the global errno. */\r
+               #if( configUSE_POSIX_ERRNO == 1 )\r
+               {\r
+                       FreeRTOS_errno = pxCurrentTCB->iTaskErrno;\r
+               }\r
+               #endif\r
+\r
                #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
                {\r
                        /* Switch Newlib's _impure_ptr variable to point to the _reent\r
-                       structure specific to this task. */\r
+                       structure specific to this task.\r
+                       See the third party link http://www.nadler.com/embedded/newlibAndFreeRTOS.html\r
+                       for additional information. */\r
                        _impure_ptr = &( pxCurrentTCB->xNewLib_reent );\r
                }\r
                #endif /* configUSE_NEWLIB_REENTRANT */\r
@@ -2262,8 +3160,6 @@ void vTaskSwitchContext( void )
 \r
 void vTaskPlaceOnEventList( List_t * const pxEventList, const TickType_t xTicksToWait )\r
 {\r
-TickType_t xTimeToWake;\r
-\r
        configASSERT( pxEventList );\r
 \r
        /* THIS FUNCTION MUST BE CALLED WITH EITHER INTERRUPTS DISABLED OR THE\r
@@ -2275,54 +3171,12 @@ TickType_t xTimeToWake;
        list is locked, preventing simultaneous access from interrupts. */\r
        vListInsert( pxEventList, &( pxCurrentTCB->xEventListItem ) );\r
 \r
-       /* The task must be removed from from the ready list before it is added to\r
-       the blocked list as the same list item is used for both lists.  Exclusive\r
-       access to the ready lists guaranteed because the scheduler is locked. */\r
-       if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-       {\r
-               /* The current task must be in a ready list, so there is no need to\r
-               check, and the port reset macro can be called directly. */\r
-               portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-       }\r
-       else\r
-       {\r
-               mtCOVERAGE_TEST_MARKER();\r
-       }\r
-\r
-       #if ( INCLUDE_vTaskSuspend == 1 )\r
-       {\r
-               if( xTicksToWait == portMAX_DELAY )\r
-               {\r
-                       /* Add the task to the suspended task list instead of a delayed task\r
-                       list to ensure the task is not woken by a timing event.  It will\r
-                       block indefinitely. */\r
-                       vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
-               }\r
-               else\r
-               {\r
-                       /* Calculate the time at which the task should be woken if the event\r
-                       does not occur.  This may overflow but this doesn't matter, the\r
-                       scheduler will handle it. */\r
-                       xTimeToWake = xTickCount + xTicksToWait;\r
-                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-               }\r
-       }\r
-       #else /* INCLUDE_vTaskSuspend */\r
-       {\r
-                       /* Calculate the time at which the task should be woken if the event does\r
-                       not occur.  This may overflow but this doesn't matter, the scheduler\r
-                       will handle it. */\r
-                       xTimeToWake = xTickCount + xTicksToWait;\r
-                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-       }\r
-       #endif /* INCLUDE_vTaskSuspend */\r
+       prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 void vTaskPlaceOnUnorderedEventList( List_t * pxEventList, const TickType_t xItemValue, const TickType_t xTicksToWait )\r
 {\r
-TickType_t xTimeToWake;\r
-\r
        configASSERT( pxEventList );\r
 \r
        /* THIS FUNCTION MUST BE CALLED WITH THE SCHEDULER SUSPENDED.  It is used by\r
@@ -2341,56 +3195,14 @@ TickType_t xTimeToWake;
        the task level). */\r
        vListInsertEnd( pxEventList, &( pxCurrentTCB->xEventListItem ) );\r
 \r
-       /* The task must be removed from the ready list before it is added to the\r
-       blocked list.  Exclusive access can be assured to the ready list as the\r
-       scheduler is locked. */\r
-       if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-       {\r
-               /* The current task must be in a ready list, so there is no need to\r
-               check, and the port reset macro can be called directly. */\r
-               portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-       }\r
-       else\r
-       {\r
-               mtCOVERAGE_TEST_MARKER();\r
-       }\r
-\r
-       #if ( INCLUDE_vTaskSuspend == 1 )\r
-       {\r
-               if( xTicksToWait == portMAX_DELAY )\r
-               {\r
-                       /* Add the task to the suspended task list instead of a delayed task\r
-                       list to ensure it is not woken by a timing event.  It will block\r
-                       indefinitely. */\r
-                       vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
-               }\r
-               else\r
-               {\r
-                       /* Calculate the time at which the task should be woken if the event\r
-                       does not occur.  This may overflow but this doesn't matter, the\r
-                       kernel will manage it correctly. */\r
-                       xTimeToWake = xTickCount + xTicksToWait;\r
-                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-               }\r
-       }\r
-       #else /* INCLUDE_vTaskSuspend */\r
-       {\r
-                       /* Calculate the time at which the task should be woken if the event does\r
-                       not occur.  This may overflow but this doesn't matter, the kernel\r
-                       will manage it correctly. */\r
-                       xTimeToWake = xTickCount + xTicksToWait;\r
-                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-       }\r
-       #endif /* INCLUDE_vTaskSuspend */\r
+       prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#if configUSE_TIMERS == 1\r
+#if( configUSE_TIMERS == 1 )\r
 \r
-       void vTaskPlaceOnEventListRestricted( List_t * const pxEventList, const TickType_t xTicksToWait, const BaseType_t xWaitIndefinitely )\r
+       void vTaskPlaceOnEventListRestricted( List_t * const pxEventList, TickType_t xTicksToWait, const BaseType_t xWaitIndefinitely )\r
        {\r
-       TickType_t xTimeToWake;\r
-\r
                configASSERT( pxEventList );\r
 \r
                /* This function should not be called by application code hence the\r
@@ -2405,59 +3217,16 @@ TickType_t xTimeToWake;
                can be used in place of vListInsert. */\r
                vListInsertEnd( pxEventList, &( pxCurrentTCB->xEventListItem ) );\r
 \r
-               /* We must remove this task from the ready list before adding it to the\r
-               blocked list as the same list item is used for both lists.  This\r
-               function is called with the scheduler locked so interrupts will not\r
-               access the lists at the same time. */\r
-               if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-               {\r
-                       /* The current task must be in a ready list, so there is no need to\r
-                       check, and the port reset macro can be called directly. */\r
-                       portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-               }\r
-               else\r
-               {\r
-                       mtCOVERAGE_TEST_MARKER();\r
-               }\r
-\r
-               /* If vTaskSuspend() is available then the suspended task list is also\r
-               available and a task that is blocking indefinitely can enter the\r
-               suspended state (it is not really suspended as it will re-enter the\r
-               Ready state when the event it is waiting indefinitely for occurs).\r
-               Blocking indefinitely is useful when using tickless idle mode as when\r
-               all tasks are blocked indefinitely all timers can be turned off. */\r
-               #if( INCLUDE_vTaskSuspend == 1 )\r
+               /* If the task should block indefinitely then set the block time to a\r
+               value that will be recognised as an indefinite delay inside the\r
+               prvAddCurrentTaskToDelayedList() function. */\r
+               if( xWaitIndefinitely != pdFALSE )\r
                {\r
-                       if( xWaitIndefinitely == pdTRUE )\r
-                       {\r
-                               /* Add the task to the suspended task list instead of a delayed\r
-                               task list to ensure the task is not woken by a timing event.  It\r
-                               will block indefinitely. */\r
-                               vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
-                       }\r
-                       else\r
-                       {\r
-                               /* Calculate the time at which the task should be woken if the\r
-                               event does not occur.  This may overflow but this doesn't\r
-                               matter. */\r
-                               xTimeToWake = xTickCount + xTicksToWait;\r
-                               traceTASK_DELAY_UNTIL();\r
-                               prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-                       }\r
+                       xTicksToWait = portMAX_DELAY;\r
                }\r
-               #else\r
-               {\r
-                       /* Calculate the time at which the task should be woken if the event\r
-                       does not occur.  This may overflow but this doesn't matter. */\r
-                       xTimeToWake = xTickCount + xTicksToWait;\r
-                       traceTASK_DELAY_UNTIL();\r
-                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
 \r
-                       /* Remove compiler warnings when INCLUDE_vTaskSuspend() is not\r
-                       defined. */\r
-                       ( void ) xWaitIndefinitely;\r
-               }\r
-               #endif\r
+               traceTASK_DELAY_UNTIL( ( xTickCount + xTicksToWait ) );\r
+               prvAddCurrentTaskToDelayedList( xTicksToWait, xWaitIndefinitely );\r
        }\r
 \r
 #endif /* configUSE_TIMERS */\r
@@ -2481,14 +3250,28 @@ BaseType_t xReturn;
 \r
        This function assumes that a check has already been made to ensure that\r
        pxEventList is not empty. */\r
-       pxUnblockedTCB = ( TCB_t * ) listGET_OWNER_OF_HEAD_ENTRY( pxEventList );\r
+       pxUnblockedTCB = listGET_OWNER_OF_HEAD_ENTRY( pxEventList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
        configASSERT( pxUnblockedTCB );\r
        ( void ) uxListRemove( &( pxUnblockedTCB->xEventListItem ) );\r
 \r
        if( uxSchedulerSuspended == ( UBaseType_t ) pdFALSE )\r
        {\r
-               ( void ) uxListRemove( &( pxUnblockedTCB->xGenericListItem ) );\r
+               ( void ) uxListRemove( &( pxUnblockedTCB->xStateListItem ) );\r
                prvAddTaskToReadyList( pxUnblockedTCB );\r
+\r
+               #if( configUSE_TICKLESS_IDLE != 0 )\r
+               {\r
+                       /* If a task is blocked on a kernel object then xNextTaskUnblockTime\r
+                       might be set to the blocked task's time out time.  If the task is\r
+                       unblocked for a reason other than a timeout xNextTaskUnblockTime is\r
+                       normally left unchanged, because it is automatically reset to a new\r
+                       value when the tick count equals xNextTaskUnblockTime.  However if\r
+                       tickless idling is used it might be more important to enter sleep mode\r
+                       at the earliest possible time - so reset xNextTaskUnblockTime here to\r
+                       ensure it is updated at the earliest possible time. */\r
+                       prvResetNextTaskUnblockTime();\r
+               }\r
+               #endif\r
        }\r
        else\r
        {\r
@@ -2513,28 +3296,13 @@ BaseType_t xReturn;
                xReturn = pdFALSE;\r
        }\r
 \r
-       #if( configUSE_TICKLESS_IDLE != 0 )\r
-       {\r
-               /* If a task is blocked on a kernel object then xNextTaskUnblockTime\r
-               might be set to the blocked task's time out time.  If the task is\r
-               unblocked for a reason other than a timeout xNextTaskUnblockTime is\r
-               normally left unchanged, because it is automatically reset to a new\r
-               value when the tick count equals xNextTaskUnblockTime.  However if\r
-               tickless idling is used it might be more important to enter sleep mode\r
-               at the earliest possible time - so reset xNextTaskUnblockTime here to\r
-               ensure it is updated at the earliest possible time. */\r
-               prvResetNextTaskUnblockTime();\r
-       }\r
-       #endif\r
-\r
        return xReturn;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-BaseType_t xTaskRemoveFromUnorderedEventList( ListItem_t * pxEventListItem, const TickType_t xItemValue )\r
+void vTaskRemoveFromUnorderedEventList( ListItem_t * pxEventListItem, const TickType_t xItemValue )\r
 {\r
 TCB_t *pxUnblockedTCB;\r
-BaseType_t xReturn;\r
 \r
        /* THIS FUNCTION MUST BE CALLED WITH THE SCHEDULER SUSPENDED.  It is used by\r
        the event flags implementation. */\r
@@ -2545,40 +3313,56 @@ BaseType_t xReturn;
 \r
        /* Remove the event list form the event flag.  Interrupts do not access\r
        event flags. */\r
-       pxUnblockedTCB = ( TCB_t * ) listGET_LIST_ITEM_OWNER( pxEventListItem );\r
+       pxUnblockedTCB = listGET_LIST_ITEM_OWNER( pxEventListItem ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
        configASSERT( pxUnblockedTCB );\r
        ( void ) uxListRemove( pxEventListItem );\r
 \r
+       #if( configUSE_TICKLESS_IDLE != 0 )\r
+       {\r
+               /* If a task is blocked on a kernel object then xNextTaskUnblockTime\r
+               might be set to the blocked task's time out time.  If the task is\r
+               unblocked for a reason other than a timeout xNextTaskUnblockTime is\r
+               normally left unchanged, because it is automatically reset to a new\r
+               value when the tick count equals xNextTaskUnblockTime.  However if\r
+               tickless idling is used it might be more important to enter sleep mode\r
+               at the earliest possible time - so reset xNextTaskUnblockTime here to\r
+               ensure it is updated at the earliest possible time. */\r
+               prvResetNextTaskUnblockTime();\r
+       }\r
+       #endif\r
+\r
        /* Remove the task from the delayed list and add it to the ready list.  The\r
        scheduler is suspended so interrupts will not be accessing the ready\r
        lists. */\r
-       ( void ) uxListRemove( &( pxUnblockedTCB->xGenericListItem ) );\r
+       ( void ) uxListRemove( &( pxUnblockedTCB->xStateListItem ) );\r
        prvAddTaskToReadyList( pxUnblockedTCB );\r
 \r
        if( pxUnblockedTCB->uxPriority > pxCurrentTCB->uxPriority )\r
        {\r
-               /* Return true if the task removed from the event list has\r
-               a higher priority than the calling task.  This allows\r
-               the calling task to know if it should force a context\r
-               switch now. */\r
-               xReturn = pdTRUE;\r
-\r
-               /* Mark that a yield is pending in case the user is not using the\r
-               "xHigherPriorityTaskWoken" parameter to an ISR safe FreeRTOS function. */\r
+               /* The unblocked task has a priority above that of the calling task, so\r
+               a context switch is required.  This function is called with the\r
+               scheduler suspended so xYieldPending is set so the context switch\r
+               occurs immediately that the scheduler is resumed (unsuspended). */\r
                xYieldPending = pdTRUE;\r
        }\r
-       else\r
-       {\r
-               xReturn = pdFALSE;\r
-       }\r
-\r
-       return xReturn;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 void vTaskSetTimeOutState( TimeOut_t * const pxTimeOut )\r
 {\r
        configASSERT( pxTimeOut );\r
+       taskENTER_CRITICAL();\r
+       {\r
+               pxTimeOut->xOverflowCount = xNumOfOverflows;\r
+               pxTimeOut->xTimeOnEntering = xTickCount;\r
+       }\r
+       taskEXIT_CRITICAL();\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vTaskInternalSetTimeOutState( TimeOut_t * const pxTimeOut )\r
+{\r
+       /* For internal use only as it does not use a critical section. */\r
        pxTimeOut->xOverflowCount = xNumOfOverflows;\r
        pxTimeOut->xTimeOnEntering = xTickCount;\r
 }\r
@@ -2595,35 +3379,49 @@ BaseType_t xReturn;
        {\r
                /* Minor optimisation.  The tick count cannot change in this block. */\r
                const TickType_t xConstTickCount = xTickCount;\r
+               const TickType_t xElapsedTime = xConstTickCount - pxTimeOut->xTimeOnEntering;\r
+\r
+               #if( INCLUDE_xTaskAbortDelay == 1 )\r
+                       if( pxCurrentTCB->ucDelayAborted != ( uint8_t ) pdFALSE )\r
+                       {\r
+                               /* The delay was aborted, which is not the same as a time out,\r
+                               but has the same result. */\r
+                               pxCurrentTCB->ucDelayAborted = pdFALSE;\r
+                               xReturn = pdTRUE;\r
+                       }\r
+                       else\r
+               #endif\r
 \r
                #if ( INCLUDE_vTaskSuspend == 1 )\r
-                       /* If INCLUDE_vTaskSuspend is set to 1 and the block time specified is\r
-                       the maximum block time then the task should block indefinitely, and\r
-                       therefore never time out. */\r
                        if( *pxTicksToWait == portMAX_DELAY )\r
                        {\r
+                               /* If INCLUDE_vTaskSuspend is set to 1 and the block time\r
+                               specified is the maximum block time then the task should block\r
+                               indefinitely, and therefore never time out. */\r
                                xReturn = pdFALSE;\r
                        }\r
-                       else /* We are not blocking indefinitely, perform the checks below. */\r
+                       else\r
                #endif\r
 \r
                if( ( xNumOfOverflows != pxTimeOut->xOverflowCount ) && ( xConstTickCount >= pxTimeOut->xTimeOnEntering ) ) /*lint !e525 Indentation preferred as is to make code within pre-processor directives clearer. */\r
                {\r
-                       /* The tick count is greater than the time at which vTaskSetTimeout()\r
-                       was called, but has also overflowed since vTaskSetTimeOut() was called.\r
-                       It must have wrapped all the way around and gone past us again. This\r
-                       passed since vTaskSetTimeout() was called. */\r
+                       /* The tick count is greater than the time at which\r
+                       vTaskSetTimeout() was called, but has also overflowed since\r
+                       vTaskSetTimeOut() was called.  It must have wrapped all the way\r
+                       around and gone past again. This passed since vTaskSetTimeout()\r
+                       was called. */\r
                        xReturn = pdTRUE;\r
                }\r
-               else if( ( xConstTickCount - pxTimeOut->xTimeOnEntering ) < *pxTicksToWait )\r
+               else if( xElapsedTime < *pxTicksToWait ) /*lint !e961 Explicit casting is only redundant with some compilers, whereas others require it to prevent integer conversion errors. */\r
                {\r
                        /* Not a genuine timeout. Adjust parameters for time remaining. */\r
-                       *pxTicksToWait -= ( xConstTickCount -  pxTimeOut->xTimeOnEntering );\r
-                       vTaskSetTimeOutState( pxTimeOut );\r
+                       *pxTicksToWait -= xElapsedTime;\r
+                       vTaskInternalSetTimeOutState( pxTimeOut );\r
                        xReturn = pdFALSE;\r
                }\r
                else\r
                {\r
+                       *pxTicksToWait = 0;\r
                        xReturn = pdTRUE;\r
                }\r
        }\r
@@ -2644,11 +3442,11 @@ void vTaskMissedYield( void )
        UBaseType_t uxTaskGetTaskNumber( TaskHandle_t xTask )\r
        {\r
        UBaseType_t uxReturn;\r
-       TCB_t *pxTCB;\r
+       TCB_t const *pxTCB;\r
 \r
                if( xTask != NULL )\r
                {\r
-                       pxTCB = ( TCB_t * ) xTask;\r
+                       pxTCB = xTask;\r
                        uxReturn = pxTCB->uxTaskNumber;\r
                }\r
                else\r
@@ -2666,11 +3464,11 @@ void vTaskMissedYield( void )
 \r
        void vTaskSetTaskNumber( TaskHandle_t xTask, const UBaseType_t uxHandle )\r
        {\r
-       TCB_t *pxTCB;\r
+       TCB_t * pxTCB;\r
 \r
                if( xTask != NULL )\r
                {\r
-                       pxTCB = ( TCB_t * ) xTask;\r
+                       pxTCB = xTask;\r
                        pxTCB->uxTaskNumber = uxHandle;\r
                }\r
        }\r
@@ -2693,9 +3491,18 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
        /* Stop warnings. */\r
        ( void ) pvParameters;\r
 \r
+       /** THIS IS THE RTOS IDLE TASK - WHICH IS CREATED AUTOMATICALLY WHEN THE\r
+       SCHEDULER IS STARTED. **/\r
+\r
+       /* In case a task that has a secure context deletes itself, in which case\r
+       the idle task is responsible for deleting the task's secure context, if\r
+       any. */\r
+       portALLOCATE_SECURE_CONTEXT( configMINIMAL_SECURE_STACK_SIZE );\r
+\r
        for( ;; )\r
        {\r
-               /* See if any tasks have been deleted. */\r
+               /* See if any tasks have deleted themselves - if so then the idle task\r
+               is responsible for freeing the deleted task's TCB and stack. */\r
                prvCheckTasksWaitingTermination();\r
 \r
                #if ( configUSE_PREEMPTION == 0 )\r
@@ -2768,6 +3575,11 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
                                        configASSERT( xNextTaskUnblockTime >= xTickCount );\r
                                        xExpectedIdleTime = prvGetExpectedIdleTime();\r
 \r
+                                       /* Define the following macro to set xExpectedIdleTime to 0\r
+                                       if the application does not want\r
+                                       portSUPPRESS_TICKS_AND_SLEEP() to be called. */\r
+                                       configPRE_SUPPRESS_TICKS_AND_SLEEP_PROCESSING( xExpectedIdleTime );\r
+\r
                                        if( xExpectedIdleTime >= configEXPECTED_IDLE_TIME_BEFORE_SLEEP )\r
                                        {\r
                                                traceLOW_POWER_IDLE_BEGIN();\r
@@ -2799,6 +3611,8 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
        const UBaseType_t uxNonApplicationTasks = 1;\r
        eSleepModeStatus eReturn = eStandardSleep;\r
 \r
+               /* This function must be called from a critical section. */\r
+\r
                if( listCURRENT_LIST_LENGTH( &xPendingReadyList ) != 0 )\r
                {\r
                        /* A task was made ready while the scheduler was suspended. */\r
@@ -2831,116 +3645,6 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
 #endif /* configUSE_TICKLESS_IDLE */\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvInitialiseTCBVariables( TCB_t * const pxTCB, const char * const pcName, UBaseType_t uxPriority, const MemoryRegion_t * const xRegions, const uint16_t usStackDepth ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
-{\r
-UBaseType_t x;\r
-\r
-       /* Store the task name in the TCB. */\r
-       for( x = ( UBaseType_t ) 0; x < ( UBaseType_t ) configMAX_TASK_NAME_LEN; x++ )\r
-       {\r
-               pxTCB->pcTaskName[ x ] = pcName[ x ];\r
-\r
-               /* Don't copy all configMAX_TASK_NAME_LEN if the string is shorter than\r
-               configMAX_TASK_NAME_LEN characters just in case the memory after the\r
-               string is not accessible (extremely unlikely). */\r
-               if( pcName[ x ] == 0x00 )\r
-               {\r
-                       break;\r
-               }\r
-               else\r
-               {\r
-                       mtCOVERAGE_TEST_MARKER();\r
-               }\r
-       }\r
-\r
-       /* Ensure the name string is terminated in the case that the string length\r
-       was greater or equal to configMAX_TASK_NAME_LEN. */\r
-       pxTCB->pcTaskName[ configMAX_TASK_NAME_LEN - 1 ] = '\0';\r
-\r
-       /* This is used as an array index so must ensure it's not too large.  First\r
-       remove the privilege bit if one is present. */\r
-       if( uxPriority >= ( UBaseType_t ) configMAX_PRIORITIES )\r
-       {\r
-               uxPriority = ( UBaseType_t ) configMAX_PRIORITIES - ( UBaseType_t ) 1U;\r
-       }\r
-       else\r
-       {\r
-               mtCOVERAGE_TEST_MARKER();\r
-       }\r
-\r
-       pxTCB->uxPriority = uxPriority;\r
-       #if ( configUSE_MUTEXES == 1 )\r
-       {\r
-               pxTCB->uxBasePriority = uxPriority;\r
-               pxTCB->uxMutexesHeld = 0;\r
-       }\r
-       #endif /* configUSE_MUTEXES */\r
-\r
-       vListInitialiseItem( &( pxTCB->xGenericListItem ) );\r
-       vListInitialiseItem( &( pxTCB->xEventListItem ) );\r
-\r
-       /* Set the pxTCB as a link back from the ListItem_t.  This is so we can get\r
-       back to the containing TCB from a generic item in a list. */\r
-       listSET_LIST_ITEM_OWNER( &( pxTCB->xGenericListItem ), pxTCB );\r
-\r
-       /* Event lists are always in priority order. */\r
-       listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), ( TickType_t ) configMAX_PRIORITIES - ( TickType_t ) uxPriority ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
-       listSET_LIST_ITEM_OWNER( &( pxTCB->xEventListItem ), pxTCB );\r
-\r
-       #if ( portCRITICAL_NESTING_IN_TCB == 1 )\r
-       {\r
-               pxTCB->uxCriticalNesting = ( UBaseType_t ) 0U;\r
-       }\r
-       #endif /* portCRITICAL_NESTING_IN_TCB */\r
-\r
-       #if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
-       {\r
-               pxTCB->pxTaskTag = NULL;\r
-       }\r
-       #endif /* configUSE_APPLICATION_TASK_TAG */\r
-\r
-       #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
-       {\r
-               pxTCB->ulRunTimeCounter = 0UL;\r
-       }\r
-       #endif /* configGENERATE_RUN_TIME_STATS */\r
-\r
-       #if ( portUSING_MPU_WRAPPERS == 1 )\r
-       {\r
-               vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), xRegions, pxTCB->pxStack, usStackDepth );\r
-       }\r
-       #else /* portUSING_MPU_WRAPPERS */\r
-       {\r
-               ( void ) xRegions;\r
-               ( void ) usStackDepth;\r
-       }\r
-       #endif /* portUSING_MPU_WRAPPERS */\r
-\r
-       #if( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )\r
-       {\r
-               for( x = 0; x < ( UBaseType_t ) configNUM_THREAD_LOCAL_STORAGE_POINTERS; x++ )\r
-               {\r
-                       pxTCB->pvThreadLocalStoragePointers[ x ] = NULL;\r
-               }\r
-       }\r
-       #endif\r
-\r
-       #if ( configUSE_TASK_NOTIFICATIONS == 1 )\r
-       {\r
-               pxTCB->ulNotifiedValue = 0;\r
-               pxTCB->eNotifyState = eNotWaitingNotification;\r
-       }\r
-       #endif\r
-\r
-       #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
-       {\r
-               /* Initialise this task's Newlib reent structure. */\r
-               _REENT_INIT_PTR( ( &( pxTCB->xNewLib_reent ) ) );\r
-       }\r
-       #endif /* configUSE_NEWLIB_REENTRANT */\r
-}\r
-/*-----------------------------------------------------------*/\r
-\r
 #if ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )\r
 \r
        void vTaskSetThreadLocalStoragePointer( TaskHandle_t xTaskToSet, BaseType_t xIndex, void *pvValue )\r
@@ -2990,7 +3694,7 @@ UBaseType_t x;
                the calling task. */\r
                pxTCB = prvGetTCBFromHandle( xTaskToModify );\r
 \r
-        vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), xRegions, NULL, 0 );\r
+               vPortStoreTaskMPUSettings( &( pxTCB->xMPUSettings ), xRegions, NULL, 0 );\r
        }\r
 \r
 #endif /* portUSING_MPU_WRAPPERS */\r
@@ -3030,160 +3734,139 @@ UBaseType_t uxPriority;
 \r
 static void prvCheckTasksWaitingTermination( void )\r
 {\r
+\r
+       /** THIS FUNCTION IS CALLED FROM THE RTOS IDLE TASK **/\r
+\r
        #if ( INCLUDE_vTaskDelete == 1 )\r
        {\r
-               BaseType_t xListIsEmpty;\r
+               TCB_t *pxTCB;\r
 \r
-               /* ucTasksDeleted is used to prevent vTaskSuspendAll() being called\r
-               too often in the idle task. */\r
-               while( uxTasksDeleted > ( UBaseType_t ) 0U )\r
+               /* uxDeletedTasksWaitingCleanUp is used to prevent taskENTER_CRITICAL()\r
+               being called too often in the idle task. */\r
+               while( uxDeletedTasksWaitingCleanUp > ( UBaseType_t ) 0U )\r
                {\r
-                       vTaskSuspendAll();\r
+                       taskENTER_CRITICAL();\r
                        {\r
-                               xListIsEmpty = listLIST_IS_EMPTY( &xTasksWaitingTermination );\r
+                               pxTCB = listGET_OWNER_OF_HEAD_ENTRY( ( &xTasksWaitingTermination ) ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
+                               ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
+                               --uxCurrentNumberOfTasks;\r
+                               --uxDeletedTasksWaitingCleanUp;\r
                        }\r
-                       ( void ) xTaskResumeAll();\r
-\r
-                       if( xListIsEmpty == pdFALSE )\r
-                       {\r
-                               TCB_t *pxTCB;\r
-\r
-                               taskENTER_CRITICAL();\r
-                               {\r
-                                       pxTCB = ( TCB_t * ) listGET_OWNER_OF_HEAD_ENTRY( ( &xTasksWaitingTermination ) );\r
-                                       ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
-                                       --uxCurrentNumberOfTasks;\r
-                                       --uxTasksDeleted;\r
-                               }\r
-                               taskEXIT_CRITICAL();\r
+                       taskEXIT_CRITICAL();\r
 \r
-                               prvDeleteTCB( pxTCB );\r
-                       }\r
-                       else\r
-                       {\r
-                               mtCOVERAGE_TEST_MARKER();\r
-                       }\r
+                       prvDeleteTCB( pxTCB );\r
                }\r
        }\r
-       #endif /* vTaskDelete */\r
+       #endif /* INCLUDE_vTaskDelete */\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvAddCurrentTaskToDelayedList( const TickType_t xTimeToWake )\r
-{\r
-       /* The list item will be inserted in wake time order. */\r
-       listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xGenericListItem ), xTimeToWake );\r
+#if( configUSE_TRACE_FACILITY == 1 )\r
 \r
-       if( xTimeToWake < xTickCount )\r
-       {\r
-               /* Wake time has overflowed.  Place this item in the overflow list. */\r
-               vListInsert( pxOverflowDelayedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
-       }\r
-       else\r
+       void vTaskGetInfo( TaskHandle_t xTask, TaskStatus_t *pxTaskStatus, BaseType_t xGetFreeStackSpace, eTaskState eState )\r
        {\r
-               /* The wake time has not overflowed, so the current block list is used. */\r
-               vListInsert( pxDelayedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
+       TCB_t *pxTCB;\r
+\r
+               /* xTask is NULL then get the state of the calling task. */\r
+               pxTCB = prvGetTCBFromHandle( xTask );\r
+\r
+               pxTaskStatus->xHandle = ( TaskHandle_t ) pxTCB;\r
+               pxTaskStatus->pcTaskName = ( const char * ) &( pxTCB->pcTaskName [ 0 ] );\r
+               pxTaskStatus->uxCurrentPriority = pxTCB->uxPriority;\r
+               pxTaskStatus->pxStackBase = pxTCB->pxStack;\r
+               pxTaskStatus->xTaskNumber = pxTCB->uxTCBNumber;\r
 \r
-               /* If the task entering the blocked state was placed at the head of the\r
-               list of blocked tasks then xNextTaskUnblockTime needs to be updated\r
-               too. */\r
-               if( xTimeToWake < xNextTaskUnblockTime )\r
+               #if ( configUSE_MUTEXES == 1 )\r
                {\r
-                       xNextTaskUnblockTime = xTimeToWake;\r
+                       pxTaskStatus->uxBasePriority = pxTCB->uxBasePriority;\r
                }\r
-               else\r
+               #else\r
                {\r
-                       mtCOVERAGE_TEST_MARKER();\r
+                       pxTaskStatus->uxBasePriority = 0;\r
                }\r
-       }\r
-}\r
-/*-----------------------------------------------------------*/\r
-\r
-static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t * const puxStackBuffer )\r
-{\r
-TCB_t *pxNewTCB;\r
-\r
-       /* If the stack grows down then allocate the stack then the TCB so the stack\r
-       does not grow into the TCB.  Likewise if the stack grows up then allocate\r
-       the TCB then the stack. */\r
-       #if( portSTACK_GROWTH > 0 )\r
-       {\r
-               /* Allocate space for the TCB.  Where the memory comes from depends on\r
-               the implementation of the port malloc function. */\r
-               pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );\r
+               #endif\r
 \r
-               if( pxNewTCB != NULL )\r
+               #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
                {\r
-                       /* Allocate space for the stack used by the task being created.\r
-                       The base of the stack memory stored in the TCB so the task can\r
-                       be deleted later if required. */\r
-                       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. */\r
-\r
-                       if( pxNewTCB->pxStack == NULL )\r
-                       {\r
-                               /* Could not allocate the stack.  Delete the allocated TCB. */\r
-                               vPortFree( pxNewTCB );\r
-                               pxNewTCB = NULL;\r
-                       }\r
+                       pxTaskStatus->ulRunTimeCounter = pxTCB->ulRunTimeCounter;\r
                }\r
-       }\r
-       #else /* portSTACK_GROWTH */\r
-       {\r
-       StackType_t *pxStack;\r
-\r
-               /* Allocate space for the stack used by the task being created. */\r
-               pxStack = ( StackType_t * ) pvPortMallocAligned( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ), puxStackBuffer ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
-\r
-               if( pxStack != NULL )\r
+               #else\r
                {\r
-                       /* Allocate space for the TCB.  Where the memory comes from depends\r
-                       on the implementation of the port malloc function. */\r
-                       pxNewTCB = ( TCB_t * ) pvPortMalloc( sizeof( TCB_t ) );\r
+                       pxTaskStatus->ulRunTimeCounter = 0;\r
+               }\r
+               #endif\r
 \r
-                       if( pxNewTCB != NULL )\r
+               /* Obtaining the task state is a little fiddly, so is only done if the\r
+               value of eState passed into this function is eInvalid - otherwise the\r
+               state is just set to whatever is passed in. */\r
+               if( eState != eInvalid )\r
+               {\r
+                       if( pxTCB == pxCurrentTCB )\r
                        {\r
-                               /* Store the stack location in the TCB. */\r
-                               pxNewTCB->pxStack = pxStack;\r
+                               pxTaskStatus->eCurrentState = eRunning;\r
                        }\r
                        else\r
                        {\r
-                               /* The stack cannot be used as the TCB was not created.  Free it\r
-                               again. */\r
-                               vPortFree( pxStack );\r
+                               pxTaskStatus->eCurrentState = eState;\r
+\r
+                               #if ( INCLUDE_vTaskSuspend == 1 )\r
+                               {\r
+                                       /* If the task is in the suspended list then there is a\r
+                                       chance it is actually just blocked indefinitely - so really\r
+                                       it should be reported as being in the Blocked state. */\r
+                                       if( eState == eSuspended )\r
+                                       {\r
+                                               vTaskSuspendAll();\r
+                                               {\r
+                                                       if( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) != NULL )\r
+                                                       {\r
+                                                               pxTaskStatus->eCurrentState = eBlocked;\r
+                                                       }\r
+                                               }\r
+                                               ( void ) xTaskResumeAll();\r
+                                       }\r
+                               }\r
+                               #endif /* INCLUDE_vTaskSuspend */\r
                        }\r
                }\r
                else\r
                {\r
-                       pxNewTCB = NULL;\r
+                       pxTaskStatus->eCurrentState = eTaskGetState( pxTCB );\r
                }\r
-       }\r
-       #endif /* portSTACK_GROWTH */\r
 \r
-       if( pxNewTCB != NULL )\r
-       {\r
-               /* Avoid dependency on memset() if it is not required. */\r
-               #if( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) )\r
+               /* Obtaining the stack space takes some time, so the xGetFreeStackSpace\r
+               parameter is provided to allow it to be skipped. */\r
+               if( xGetFreeStackSpace != pdFALSE )\r
                {\r
-                       /* Just to help debugging. */\r
-                       ( void ) memset( pxNewTCB->pxStack, ( int ) tskSTACK_FILL_BYTE, ( size_t ) usStackDepth * sizeof( StackType_t ) );\r
+                       #if ( portSTACK_GROWTH > 0 )\r
+                       {\r
+                               pxTaskStatus->usStackHighWaterMark = prvTaskCheckFreeStackSpace( ( uint8_t * ) pxTCB->pxEndOfStack );\r
+                       }\r
+                       #else\r
+                       {\r
+                               pxTaskStatus->usStackHighWaterMark = prvTaskCheckFreeStackSpace( ( uint8_t * ) pxTCB->pxStack );\r
+                       }\r
+                       #endif\r
+               }\r
+               else\r
+               {\r
+                       pxTaskStatus->usStackHighWaterMark = 0;\r
                }\r
-               #endif /* ( ( configCHECK_FOR_STACK_OVERFLOW > 1 ) || ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) ) ) */\r
        }\r
 \r
-       return pxNewTCB;\r
-}\r
+#endif /* configUSE_TRACE_FACILITY */\r
 /*-----------------------------------------------------------*/\r
 \r
 #if ( configUSE_TRACE_FACILITY == 1 )\r
 \r
-       static UBaseType_t prvListTaskWithinSingleList( TaskStatus_t *pxTaskStatusArray, List_t *pxList, eTaskState eState )\r
+       static UBaseType_t prvListTasksWithinSingleList( TaskStatus_t *pxTaskStatusArray, List_t *pxList, eTaskState eState )\r
        {\r
-       volatile TCB_t *pxNextTCB, *pxFirstTCB;\r
+       configLIST_VOLATILE TCB_t *pxNextTCB, *pxFirstTCB;\r
        UBaseType_t uxTask = 0;\r
 \r
                if( listCURRENT_LIST_LENGTH( pxList ) > ( UBaseType_t ) 0 )\r
                {\r
-                       listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList );\r
+                       listGET_OWNER_OF_NEXT_ENTRY( pxFirstTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
 \r
                        /* Populate an TaskStatus_t structure within the\r
                        pxTaskStatusArray array for each task that is referenced from\r
@@ -3191,61 +3874,9 @@ TCB_t *pxNewTCB;
                        meaning of each TaskStatus_t structure member. */\r
                        do\r
                        {\r
-                               listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList );\r
-\r
-                               pxTaskStatusArray[ uxTask ].xHandle = ( TaskHandle_t ) pxNextTCB;\r
-                               pxTaskStatusArray[ uxTask ].pcTaskName = ( const char * ) &( pxNextTCB->pcTaskName [ 0 ] );\r
-                               pxTaskStatusArray[ uxTask ].xTaskNumber = pxNextTCB->uxTCBNumber;\r
-                               pxTaskStatusArray[ uxTask ].eCurrentState = eState;\r
-                               pxTaskStatusArray[ uxTask ].uxCurrentPriority = pxNextTCB->uxPriority;\r
-\r
-                               #if ( INCLUDE_vTaskSuspend == 1 )\r
-                               {\r
-                                       /* If the task is in the suspended list then there is a chance\r
-                                       it is actually just blocked indefinitely - so really it should\r
-                                       be reported as being in the Blocked state. */\r
-                                       if( eState == eSuspended )\r
-                                       {\r
-                                               if( listLIST_ITEM_CONTAINER( &( pxNextTCB->xEventListItem ) ) != NULL )\r
-                                               {\r
-                                                       pxTaskStatusArray[ uxTask ].eCurrentState = eBlocked;\r
-                                               }\r
-                                       }\r
-                               }\r
-                               #endif /* INCLUDE_vTaskSuspend */\r
-\r
-                               #if ( configUSE_MUTEXES == 1 )\r
-                               {\r
-                                       pxTaskStatusArray[ uxTask ].uxBasePriority = pxNextTCB->uxBasePriority;\r
-                               }\r
-                               #else\r
-                               {\r
-                                       pxTaskStatusArray[ uxTask ].uxBasePriority = 0;\r
-                               }\r
-                               #endif\r
-\r
-                               #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
-                               {\r
-                                       pxTaskStatusArray[ uxTask ].ulRunTimeCounter = pxNextTCB->ulRunTimeCounter;\r
-                               }\r
-                               #else\r
-                               {\r
-                                       pxTaskStatusArray[ uxTask ].ulRunTimeCounter = 0;\r
-                               }\r
-                               #endif\r
-\r
-                               #if ( portSTACK_GROWTH > 0 )\r
-                               {\r
-                                       pxTaskStatusArray[ uxTask ].usStackHighWaterMark = prvTaskCheckFreeStackSpace( ( uint8_t * ) pxNextTCB->pxEndOfStack );\r
-                               }\r
-                               #else\r
-                               {\r
-                                       pxTaskStatusArray[ uxTask ].usStackHighWaterMark = prvTaskCheckFreeStackSpace( ( uint8_t * ) pxNextTCB->pxStack );\r
-                               }\r
-                               #endif\r
-\r
+                               listGET_OWNER_OF_NEXT_ENTRY( pxNextTCB, pxList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
+                               vTaskGetInfo( ( TaskHandle_t ) pxNextTCB, &( pxTaskStatusArray[ uxTask ] ), pdTRUE, eState );\r
                                uxTask++;\r
-\r
                        } while( pxNextTCB != pxFirstTCB );\r
                }\r
                else\r
@@ -3259,9 +3890,9 @@ TCB_t *pxNewTCB;
 #endif /* configUSE_TRACE_FACILITY */\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) )\r
+#if ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) )\r
 \r
-       static uint16_t prvTaskCheckFreeStackSpace( const uint8_t * pucStackByte )\r
+       static configSTACK_DEPTH_TYPE prvTaskCheckFreeStackSpace( const uint8_t * pucStackByte )\r
        {\r
        uint32_t ulCount = 0U;\r
 \r
@@ -3273,10 +3904,50 @@ TCB_t *pxNewTCB;
 \r
                ulCount /= ( uint32_t ) sizeof( StackType_t ); /*lint !e961 Casting is not redundant on smaller architectures. */\r
 \r
-               return ( uint16_t ) ulCount;\r
+               return ( configSTACK_DEPTH_TYPE ) ulCount;\r
+       }\r
+\r
+#endif /* ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) ) */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 )\r
+\r
+       /* uxTaskGetStackHighWaterMark() and uxTaskGetStackHighWaterMark2() are the\r
+       same except for their return type.  Using configSTACK_DEPTH_TYPE allows the\r
+       user to determine the return type.  It gets around the problem of the value\r
+       overflowing on 8-bit types without breaking backward compatibility for\r
+       applications that expect an 8-bit return type. */\r
+       configSTACK_DEPTH_TYPE uxTaskGetStackHighWaterMark2( TaskHandle_t xTask )\r
+       {\r
+       TCB_t *pxTCB;\r
+       uint8_t *pucEndOfStack;\r
+       configSTACK_DEPTH_TYPE uxReturn;\r
+\r
+               /* uxTaskGetStackHighWaterMark() and uxTaskGetStackHighWaterMark2() are\r
+               the same except for their return type.  Using configSTACK_DEPTH_TYPE\r
+               allows the user to determine the return type.  It gets around the\r
+               problem of the value overflowing on 8-bit types without breaking\r
+               backward compatibility for applications that expect an 8-bit return\r
+               type. */\r
+\r
+               pxTCB = prvGetTCBFromHandle( xTask );\r
+\r
+               #if portSTACK_GROWTH < 0\r
+               {\r
+                       pucEndOfStack = ( uint8_t * ) pxTCB->pxStack;\r
+               }\r
+               #else\r
+               {\r
+                       pucEndOfStack = ( uint8_t * ) pxTCB->pxEndOfStack;\r
+               }\r
+               #endif\r
+\r
+               uxReturn = prvTaskCheckFreeStackSpace( pucEndOfStack );\r
+\r
+               return uxReturn;\r
        }\r
 \r
-#endif /* ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) ) */\r
+#endif /* INCLUDE_uxTaskGetStackHighWaterMark2 */\r
 /*-----------------------------------------------------------*/\r
 \r
 #if ( INCLUDE_uxTaskGetStackHighWaterMark == 1 )\r
@@ -3317,29 +3988,49 @@ TCB_t *pxNewTCB;
                portCLEAN_UP_TCB( pxTCB );\r
 \r
                /* Free up the memory allocated by the scheduler for the task.  It is up\r
-               to the task to free any memory allocated at the application level. */\r
+               to the task to free any memory allocated at the application level.\r
+               See the third party link http://www.nadler.com/embedded/newlibAndFreeRTOS.html\r
+               for additional information. */\r
                #if ( configUSE_NEWLIB_REENTRANT == 1 )\r
                {\r
                        _reclaim_reent( &( pxTCB->xNewLib_reent ) );\r
                }\r
                #endif /* configUSE_NEWLIB_REENTRANT */\r
 \r
-               #if( portUSING_MPU_WRAPPERS == 1 )\r
+               #if( ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) && ( configSUPPORT_STATIC_ALLOCATION == 0 ) && ( portUSING_MPU_WRAPPERS == 0 ) )\r
                {\r
-                       /* Only free the stack if it was allocated dynamically in the first\r
-                       place. */\r
-                       if( pxTCB->xUsingStaticallyAllocatedStack == pdFALSE )\r
-                       {\r
-                               vPortFreeAligned( pxTCB->pxStack );\r
-                       }\r
+                       /* The task can only have been allocated dynamically - free both\r
+                       the stack and TCB. */\r
+                       vPortFree( pxTCB->pxStack );\r
+                       vPortFree( pxTCB );\r
                }\r
-               #else\r
+               #elif( tskSTATIC_AND_DYNAMIC_ALLOCATION_POSSIBLE != 0 ) /*lint !e731 !e9029 Macro has been consolidated for readability reasons. */\r
                {\r
-                       vPortFreeAligned( pxTCB->pxStack );\r
+                       /* The task could have been allocated statically or dynamically, so\r
+                       check what was statically allocated before trying to free the\r
+                       memory. */\r
+                       if( pxTCB->ucStaticallyAllocated == tskDYNAMICALLY_ALLOCATED_STACK_AND_TCB )\r
+                       {\r
+                               /* Both the stack and TCB were allocated dynamically, so both\r
+                               must be freed. */\r
+                               vPortFree( pxTCB->pxStack );\r
+                               vPortFree( pxTCB );\r
+                       }\r
+                       else if( pxTCB->ucStaticallyAllocated == tskSTATICALLY_ALLOCATED_STACK_ONLY )\r
+                       {\r
+                               /* Only the stack was statically allocated, so the TCB is the\r
+                               only memory that must be freed. */\r
+                               vPortFree( pxTCB );\r
+                       }\r
+                       else\r
+                       {\r
+                               /* Neither the stack nor the TCB were allocated dynamically, so\r
+                               nothing needs to be freed. */\r
+                               configASSERT( pxTCB->ucStaticallyAllocated == tskSTATICALLY_ALLOCATED_STACK_AND_TCB     );\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
                }\r
-               #endif\r
-\r
-               vPortFree( pxTCB );\r
+               #endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
        }\r
 \r
 #endif /* INCLUDE_vTaskDelete */\r
@@ -3363,8 +4054,8 @@ TCB_t *pxTCB;
                the item at the head of the delayed list.  This is the time at\r
                which the task at the head of the delayed list should be removed\r
                from the Blocked state. */\r
-               ( pxTCB ) = ( TCB_t * ) listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList );\r
-               xNextTaskUnblockTime = listGET_LIST_ITEM_VALUE( &( ( pxTCB )->xGenericListItem ) );\r
+               ( pxTCB ) = listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList ); /*lint !e9079 void * is used as this macro is used with timers and co-routines too.  Alignment is known to be fine as the type of the pointer stored and retrieved is the same. */\r
+               xNextTaskUnblockTime = listGET_LIST_ITEM_VALUE( &( ( pxTCB )->xStateListItem ) );\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -3416,25 +4107,27 @@ TCB_t *pxTCB;
 \r
 #if ( configUSE_MUTEXES == 1 )\r
 \r
-       void vTaskPriorityInherit( TaskHandle_t const pxMutexHolder )\r
+       BaseType_t xTaskPriorityInherit( TaskHandle_t const pxMutexHolder )\r
        {\r
-       TCB_t * const pxTCB = ( TCB_t * ) pxMutexHolder;\r
+       TCB_t * const pxMutexHolderTCB = pxMutexHolder;\r
+       BaseType_t xReturn = pdFALSE;\r
 \r
                /* If the mutex was given back by an interrupt while the queue was\r
-               locked then the mutex holder might now be NULL. */\r
+               locked then the mutex holder might now be NULL.  _RB_ Is this still\r
+               needed as interrupts can no longer use mutexes? */\r
                if( pxMutexHolder != NULL )\r
                {\r
                        /* If the holder of the mutex has a priority below the priority of\r
                        the task attempting to obtain the mutex then it will temporarily\r
                        inherit the priority of the task attempting to obtain the mutex. */\r
-                       if( pxTCB->uxPriority < pxCurrentTCB->uxPriority )\r
+                       if( pxMutexHolderTCB->uxPriority < pxCurrentTCB->uxPriority )\r
                        {\r
                                /* Adjust the mutex holder state to account for its new\r
                                priority.  Only reset the event list item value if the value is\r
-                               not     being used for anything else. */\r
-                               if( ( listGET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ) ) & taskEVENT_LIST_ITEM_VALUE_IN_USE ) == 0UL )\r
+                               not being used for anything else. */\r
+                               if( ( listGET_LIST_ITEM_VALUE( &( pxMutexHolderTCB->xEventListItem ) ) & taskEVENT_LIST_ITEM_VALUE_IN_USE ) == 0UL )\r
                                {\r
-                                       listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), ( TickType_t ) configMAX_PRIORITIES - ( TickType_t ) pxCurrentTCB->uxPriority ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
+                                       listSET_LIST_ITEM_VALUE( &( pxMutexHolderTCB->xEventListItem ), ( TickType_t ) configMAX_PRIORITIES - ( TickType_t ) pxCurrentTCB->uxPriority ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
                                }\r
                                else\r
                                {\r
@@ -3443,11 +4136,14 @@ TCB_t *pxTCB;
 \r
                                /* If the task being modified is in the ready state it will need\r
                                to be moved into a new list. */\r
-                               if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxTCB->uxPriority ] ), &( pxTCB->xGenericListItem ) ) != pdFALSE )\r
+                               if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxMutexHolderTCB->uxPriority ] ), &( pxMutexHolderTCB->xStateListItem ) ) != pdFALSE )\r
                                {\r
-                                       if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
+                                       if( uxListRemove( &( pxMutexHolderTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
                                        {\r
-                                               taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
+                                               /* It is known that the task is in its ready list so\r
+                                               there is no need to check again and the port level\r
+                                               reset macro can be called directly. */\r
+                                               portRESET_READY_PRIORITY( pxMutexHolderTCB->uxPriority, uxTopReadyPriority );\r
                                        }\r
                                        else\r
                                        {\r
@@ -3455,26 +4151,45 @@ TCB_t *pxTCB;
                                        }\r
 \r
                                        /* Inherit the priority before being moved into the new list. */\r
-                                       pxTCB->uxPriority = pxCurrentTCB->uxPriority;\r
-                                       prvAddTaskToReadyList( pxTCB );\r
+                                       pxMutexHolderTCB->uxPriority = pxCurrentTCB->uxPriority;\r
+                                       prvAddTaskToReadyList( pxMutexHolderTCB );\r
                                }\r
                                else\r
                                {\r
                                        /* Just inherit the priority. */\r
-                                       pxTCB->uxPriority = pxCurrentTCB->uxPriority;\r
+                                       pxMutexHolderTCB->uxPriority = pxCurrentTCB->uxPriority;\r
                                }\r
 \r
-                               traceTASK_PRIORITY_INHERIT( pxTCB, pxCurrentTCB->uxPriority );\r
+                               traceTASK_PRIORITY_INHERIT( pxMutexHolderTCB, pxCurrentTCB->uxPriority );\r
+\r
+                               /* Inheritance occurred. */\r
+                               xReturn = pdTRUE;\r
                        }\r
                        else\r
                        {\r
-                               mtCOVERAGE_TEST_MARKER();\r
+                               if( pxMutexHolderTCB->uxBasePriority < pxCurrentTCB->uxPriority )\r
+                               {\r
+                                       /* The base priority of the mutex holder is lower than the\r
+                                       priority of the task attempting to take the mutex, but the\r
+                                       current priority of the mutex holder is not lower than the\r
+                                       priority of the task attempting to take the mutex.\r
+                                       Therefore the mutex holder must have already inherited a\r
+                                       priority, but inheritance would have occurred if that had\r
+                                       not been the case. */\r
+                                       xReturn = pdTRUE;\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
                        }\r
                }\r
                else\r
                {\r
                        mtCOVERAGE_TEST_MARKER();\r
                }\r
+\r
+               return xReturn;\r
        }\r
 \r
 #endif /* configUSE_MUTEXES */\r
@@ -3484,7 +4199,7 @@ TCB_t *pxTCB;
 \r
        BaseType_t xTaskPriorityDisinherit( TaskHandle_t const pxMutexHolder )\r
        {\r
-       TCB_t * const pxTCB = ( TCB_t * ) pxMutexHolder;\r
+       TCB_t * const pxTCB = pxMutexHolder;\r
        BaseType_t xReturn = pdFALSE;\r
 \r
                if( pxMutexHolder != NULL )\r
@@ -3494,7 +4209,6 @@ TCB_t *pxTCB;
                        interrupt, and if a mutex is given by the holding task then it must\r
                        be the running state task. */\r
                        configASSERT( pxTCB == pxCurrentTCB );\r
-\r
                        configASSERT( pxTCB->uxMutexesHeld );\r
                        ( pxTCB->uxMutexesHeld )--;\r
 \r
@@ -3508,9 +4222,9 @@ TCB_t *pxTCB;
                                        /* A task can only have an inherited priority if it holds\r
                                        the mutex.  If the mutex is held by a task then it cannot be\r
                                        given from an interrupt, and if a mutex is given by the\r
-                                       holding task then it must be the running state task.  Remove\r
-                                       the     holding task from the ready     list. */\r
-                                       if( uxListRemove( &( pxTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
+                                       holding task then it must be the running state task.  Remove\r
+                                       the holding task from the ready/delayed list. */\r
+                                       if( uxListRemove( &( pxTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
                                        {\r
                                                taskRESET_READY_PRIORITY( pxTCB->uxPriority );\r
                                        }\r
@@ -3561,6 +4275,111 @@ TCB_t *pxTCB;
 #endif /* configUSE_MUTEXES */\r
 /*-----------------------------------------------------------*/\r
 \r
+#if ( configUSE_MUTEXES == 1 )\r
+\r
+       void vTaskPriorityDisinheritAfterTimeout( TaskHandle_t const pxMutexHolder, UBaseType_t uxHighestPriorityWaitingTask )\r
+       {\r
+       TCB_t * const pxTCB = pxMutexHolder;\r
+       UBaseType_t uxPriorityUsedOnEntry, uxPriorityToUse;\r
+       const UBaseType_t uxOnlyOneMutexHeld = ( UBaseType_t ) 1;\r
+\r
+               if( pxMutexHolder != NULL )\r
+               {\r
+                       /* If pxMutexHolder is not NULL then the holder must hold at least\r
+                       one mutex. */\r
+                       configASSERT( pxTCB->uxMutexesHeld );\r
+\r
+                       /* Determine the priority to which the priority of the task that\r
+                       holds the mutex should be set.  This will be the greater of the\r
+                       holding task's base priority and the priority of the highest\r
+                       priority task that is waiting to obtain the mutex. */\r
+                       if( pxTCB->uxBasePriority < uxHighestPriorityWaitingTask )\r
+                       {\r
+                               uxPriorityToUse = uxHighestPriorityWaitingTask;\r
+                       }\r
+                       else\r
+                       {\r
+                               uxPriorityToUse = pxTCB->uxBasePriority;\r
+                       }\r
+\r
+                       /* Does the priority need to change? */\r
+                       if( pxTCB->uxPriority != uxPriorityToUse )\r
+                       {\r
+                               /* Only disinherit if no other mutexes are held.  This is a\r
+                               simplification in the priority inheritance implementation.  If\r
+                               the task that holds the mutex is also holding other mutexes then\r
+                               the other mutexes may have caused the priority inheritance. */\r
+                               if( pxTCB->uxMutexesHeld == uxOnlyOneMutexHeld )\r
+                               {\r
+                                       /* If a task has timed out because it already holds the\r
+                                       mutex it was trying to obtain then it cannot of inherited\r
+                                       its own priority. */\r
+                                       configASSERT( pxTCB != pxCurrentTCB );\r
+\r
+                                       /* Disinherit the priority, remembering the previous\r
+                                       priority to facilitate determining the subject task's\r
+                                       state. */\r
+                                       traceTASK_PRIORITY_DISINHERIT( pxTCB, pxTCB->uxBasePriority );\r
+                                       uxPriorityUsedOnEntry = pxTCB->uxPriority;\r
+                                       pxTCB->uxPriority = uxPriorityToUse;\r
+\r
+                                       /* Only reset the event list item value if the value is not\r
+                                       being used for anything else. */\r
+                                       if( ( listGET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ) ) & taskEVENT_LIST_ITEM_VALUE_IN_USE ) == 0UL )\r
+                                       {\r
+                                               listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), ( TickType_t ) configMAX_PRIORITIES - ( TickType_t ) uxPriorityToUse ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+\r
+                                       /* If the running task is not the task that holds the mutex\r
+                                       then the task that holds the mutex could be in either the\r
+                                       Ready, Blocked or Suspended states.  Only remove the task\r
+                                       from its current state list if it is in the Ready state as\r
+                                       the task's priority is going to change and there is one\r
+                                       Ready list per priority. */\r
+                                       if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ uxPriorityUsedOnEntry ] ), &( pxTCB->xStateListItem ) ) != pdFALSE )\r
+                                       {\r
+                                               if( uxListRemove( &( pxTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
+                                               {\r
+                                                       /* It is known that the task is in its ready list so\r
+                                                       there is no need to check again and the port level\r
+                                                       reset macro can be called directly. */\r
+                                                       portRESET_READY_PRIORITY( pxTCB->uxPriority, uxTopReadyPriority );\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       mtCOVERAGE_TEST_MARKER();\r
+                                               }\r
+\r
+                                               prvAddTaskToReadyList( pxTCB );\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               mtCOVERAGE_TEST_MARKER();\r
+                                       }\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       mtCOVERAGE_TEST_MARKER();\r
+               }\r
+       }\r
+\r
+#endif /* configUSE_MUTEXES */\r
+/*-----------------------------------------------------------*/\r
+\r
 #if ( portCRITICAL_NESTING_IN_TCB == 1 )\r
 \r
        void vTaskEnterCritical( void )\r
@@ -3641,7 +4460,7 @@ TCB_t *pxTCB;
                }\r
 \r
                /* Terminate. */\r
-               pcBuffer[ x ] = 0x00;\r
+               pcBuffer[ x ] = ( char ) 0x00;\r
 \r
                /* Return the new end of string. */\r
                return &( pcBuffer[ x ] );\r
@@ -3650,12 +4469,12 @@ TCB_t *pxTCB;
 #endif /* ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) */\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )\r
+#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) )\r
 \r
        void vTaskList( char * pcWriteBuffer )\r
        {\r
        TaskStatus_t *pxTaskStatusArray;\r
-       volatile UBaseType_t uxArraySize, x;\r
+       UBaseType_t uxArraySize, x;\r
        char cStatus;\r
 \r
                /*\r
@@ -3684,14 +4503,16 @@ TCB_t *pxTCB;
 \r
 \r
                /* Make sure the write buffer does not contain a string. */\r
-               *pcWriteBuffer = 0x00;\r
+               *pcWriteBuffer = ( char ) 0x00;\r
 \r
                /* Take a snapshot of the number of tasks in case it changes while this\r
                function is executing. */\r
                uxArraySize = uxCurrentNumberOfTasks;\r
 \r
-               /* Allocate an array index for each task. */\r
-               pxTaskStatusArray = pvPortMalloc( uxCurrentNumberOfTasks * sizeof( TaskStatus_t ) );\r
+               /* Allocate an array index for each task.  NOTE!  if\r
+               configSUPPORT_DYNAMIC_ALLOCATION is set to 0 then pvPortMalloc() will\r
+               equate to NULL. */\r
+               pxTaskStatusArray = pvPortMalloc( uxCurrentNumberOfTasks * sizeof( TaskStatus_t ) ); /*lint !e9079 All values returned by pvPortMalloc() have at least the alignment required by the MCU's stack and this allocation allocates a struct that has the alignment requirements of a pointer. */\r
 \r
                if( pxTaskStatusArray != NULL )\r
                {\r
@@ -3703,6 +4524,9 @@ TCB_t *pxTCB;
                        {\r
                                switch( pxTaskStatusArray[ x ].eCurrentState )\r
                                {\r
+                                       case eRunning:          cStatus = tskRUNNING_CHAR;\r
+                                                                               break;\r
+\r
                                        case eReady:            cStatus = tskREADY_CHAR;\r
                                                                                break;\r
 \r
@@ -3715,9 +4539,10 @@ TCB_t *pxTCB;
                                        case eDeleted:          cStatus = tskDELETED_CHAR;\r
                                                                                break;\r
 \r
+                                       case eInvalid:          /* Fall through. */\r
                                        default:                        /* Should not get here, but it is included\r
                                                                                to prevent static checking errors. */\r
-                                                                               cStatus = 0x00;\r
+                                                                               cStatus = ( char ) 0x00;\r
                                                                                break;\r
                                }\r
 \r
@@ -3726,11 +4551,12 @@ TCB_t *pxTCB;
                                pcWriteBuffer = prvWriteNameToBuffer( pcWriteBuffer, pxTaskStatusArray[ x ].pcTaskName );\r
 \r
                                /* Write the rest of the string. */\r
-                               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 );\r
-                               pcWriteBuffer += strlen( pcWriteBuffer );\r
+                               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 ); /*lint !e586 sprintf() allowed as this is compiled with many compilers and this is a utility function only - not part of the core kernel implementation. */\r
+                               pcWriteBuffer += strlen( pcWriteBuffer ); /*lint !e9016 Pointer arithmetic ok on char pointers especially as in this case where it best denotes the intent of the code. */\r
                        }\r
 \r
-                       /* Free the array again. */\r
+                       /* Free the array again.  NOTE!  If configSUPPORT_DYNAMIC_ALLOCATION\r
+                       is 0 then vPortFree() will be #defined to nothing. */\r
                        vPortFree( pxTaskStatusArray );\r
                }\r
                else\r
@@ -3739,15 +4565,15 @@ TCB_t *pxTCB;
                }\r
        }\r
 \r
-#endif /* ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) ) */\r
+#endif /* ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) ) */\r
 /*----------------------------------------------------------*/\r
 \r
-#if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) )\r
+#if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) )\r
 \r
        void vTaskGetRunTimeStats( char *pcWriteBuffer )\r
        {\r
        TaskStatus_t *pxTaskStatusArray;\r
-       volatile UBaseType_t uxArraySize, x;\r
+       UBaseType_t uxArraySize, x;\r
        uint32_t ulTotalTime, ulStatsAsPercentage;\r
 \r
                #if( configUSE_TRACE_FACILITY != 1 )\r
@@ -3782,14 +4608,16 @@ TCB_t *pxTCB;
                 */\r
 \r
                /* Make sure the write buffer does not contain a string. */\r
-               *pcWriteBuffer = 0x00;\r
+               *pcWriteBuffer = ( char ) 0x00;\r
 \r
                /* Take a snapshot of the number of tasks in case it changes while this\r
                function is executing. */\r
                uxArraySize = uxCurrentNumberOfTasks;\r
 \r
-               /* Allocate an array index for each task. */\r
-               pxTaskStatusArray = pvPortMalloc( uxCurrentNumberOfTasks * sizeof( TaskStatus_t ) );\r
+               /* Allocate an array index for each task.  NOTE!  If\r
+               configSUPPORT_DYNAMIC_ALLOCATION is set to 0 then pvPortMalloc() will\r
+               equate to NULL. */\r
+               pxTaskStatusArray = pvPortMalloc( uxCurrentNumberOfTasks * sizeof( TaskStatus_t ) ); /*lint !e9079 All values returned by pvPortMalloc() have at least the alignment required by the MCU's stack and this allocation allocates a struct that has the alignment requirements of a pointer. */\r
 \r
                if( pxTaskStatusArray != NULL )\r
                {\r
@@ -3800,7 +4628,7 @@ TCB_t *pxTCB;
                        ulTotalTime /= 100UL;\r
 \r
                        /* Avoid divide by zero errors. */\r
-                       if( ulTotalTime > 0 )\r
+                       if( ulTotalTime > 0UL )\r
                        {\r
                                /* Create a human readable table from the binary data. */\r
                                for( x = 0; x < uxArraySize; x++ )\r
@@ -3825,7 +4653,7 @@ TCB_t *pxTCB;
                                                {\r
                                                        /* sizeof( int ) == sizeof( long ) so a smaller\r
                                                        printf() library can be used. */\r
-                                                       sprintf( pcWriteBuffer, "\t%u\t\t%u%%\r\n", ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter, ( unsigned int ) ulStatsAsPercentage );\r
+                                                       sprintf( pcWriteBuffer, "\t%u\t\t%u%%\r\n", ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter, ( unsigned int ) ulStatsAsPercentage ); /*lint !e586 sprintf() allowed as this is compiled with many compilers and this is a utility function only - not part of the core kernel implementation. */\r
                                                }\r
                                                #endif\r
                                        }\r
@@ -3841,12 +4669,12 @@ TCB_t *pxTCB;
                                                {\r
                                                        /* sizeof( int ) == sizeof( long ) so a smaller\r
                                                        printf() library can be used. */\r
-                                                       sprintf( pcWriteBuffer, "\t%u\t\t<1%%\r\n", ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter );\r
+                                                       sprintf( pcWriteBuffer, "\t%u\t\t<1%%\r\n", ( unsigned int ) pxTaskStatusArray[ x ].ulRunTimeCounter ); /*lint !e586 sprintf() allowed as this is compiled with many compilers and this is a utility function only - not part of the core kernel implementation. */\r
                                                }\r
                                                #endif\r
                                        }\r
 \r
-                                       pcWriteBuffer += strlen( pcWriteBuffer );\r
+                                       pcWriteBuffer += strlen( pcWriteBuffer ); /*lint !e9016 Pointer arithmetic ok on char pointers especially as in this case where it best denotes the intent of the code. */\r
                                }\r
                        }\r
                        else\r
@@ -3854,7 +4682,8 @@ TCB_t *pxTCB;
                                mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
-                       /* Free the array again. */\r
+                       /* Free the array again.  NOTE!  If configSUPPORT_DYNAMIC_ALLOCATION\r
+                       is 0 then vPortFree() will be #defined to nothing. */\r
                        vPortFree( pxTaskStatusArray );\r
                }\r
                else\r
@@ -3863,7 +4692,7 @@ TCB_t *pxTCB;
                }\r
        }\r
 \r
-#endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) ) */\r
+#endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS > 0 ) && ( configSUPPORT_STATIC_ALLOCATION == 1 ) ) */\r
 /*-----------------------------------------------------------*/\r
 \r
 TickType_t uxTaskResetEventItemValue( void )\r
@@ -3882,7 +4711,7 @@ TickType_t uxReturn;
 \r
 #if ( configUSE_MUTEXES == 1 )\r
 \r
-       void *pvTaskIncrementMutexHeldCount( void )\r
+       TaskHandle_t pvTaskIncrementMutexHeldCount( void )\r
        {\r
                /* If xSemaphoreCreateMutex() is called before any tasks have been created\r
                then pxCurrentTCB will be NULL. */\r
@@ -3901,7 +4730,6 @@ TickType_t uxReturn;
 \r
        uint32_t ulTaskNotifyTake( BaseType_t xClearCountOnExit, TickType_t xTicksToWait )\r
        {\r
-       TickType_t xTimeToWake;\r
        uint32_t ulReturn;\r
 \r
                taskENTER_CRITICAL();\r
@@ -3910,55 +4738,11 @@ TickType_t uxReturn;
                        if( pxCurrentTCB->ulNotifiedValue == 0UL )\r
                        {\r
                                /* Mark this task as waiting for a notification. */\r
-                               pxCurrentTCB->eNotifyState = eWaitingNotification;\r
+                               pxCurrentTCB->ucNotifyState = taskWAITING_NOTIFICATION;\r
 \r
                                if( xTicksToWait > ( TickType_t ) 0 )\r
                                {\r
-                                       /* The task is going to block.  First it must be removed\r
-                                       from the ready list. */\r
-                                       if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-                                       {\r
-                                               /* The current task must be in a ready list, so there is\r
-                                               no need to check, and the port reset macro can be called\r
-                                               directly. */\r
-                                               portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-                                       }\r
-                                       else\r
-                                       {\r
-                                               mtCOVERAGE_TEST_MARKER();\r
-                                       }\r
-\r
-                                       #if ( INCLUDE_vTaskSuspend == 1 )\r
-                                       {\r
-                                               if( xTicksToWait == portMAX_DELAY )\r
-                                               {\r
-                                                       /* Add the task to the suspended task list instead\r
-                                                       of a delayed task list to ensure the task is not\r
-                                                       woken by a timing event.  It will block\r
-                                                       indefinitely. */\r
-                                                       vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       /* Calculate the time at which the task should be\r
-                                                       woken if no notification events occur.  This may\r
-                                                       overflow but this doesn't matter, the scheduler will\r
-                                                       handle it. */\r
-                                                       xTimeToWake = xTickCount + xTicksToWait;\r
-                                                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-                                               }\r
-                                       }\r
-                                       #else /* INCLUDE_vTaskSuspend */\r
-                                       {\r
-                                                       /* Calculate the time at which the task should be\r
-                                                       woken if the event does not occur.  This may\r
-                                                       overflow but this doesn't matter, the scheduler will\r
-                                                       handle it. */\r
-                                                       xTimeToWake = xTickCount + xTicksToWait;\r
-                                                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-                                       }\r
-                                       #endif /* INCLUDE_vTaskSuspend */\r
-\r
+                                       prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );\r
                                        traceTASK_NOTIFY_TAKE_BLOCK();\r
 \r
                                        /* All ports are written to allow a yield in a critical\r
@@ -3992,7 +4776,7 @@ TickType_t uxReturn;
                                }\r
                                else\r
                                {\r
-                                       ( pxCurrentTCB->ulNotifiedValue )--;\r
+                                       pxCurrentTCB->ulNotifiedValue = ulReturn - ( uint32_t ) 1;\r
                                }\r
                        }\r
                        else\r
@@ -4000,7 +4784,7 @@ TickType_t uxReturn;
                                mtCOVERAGE_TEST_MARKER();\r
                        }\r
 \r
-                       pxCurrentTCB->eNotifyState = eNotWaitingNotification;\r
+                       pxCurrentTCB->ucNotifyState = taskNOT_WAITING_NOTIFICATION;\r
                }\r
                taskEXIT_CRITICAL();\r
 \r
@@ -4014,13 +4798,12 @@ TickType_t uxReturn;
 \r
        BaseType_t xTaskNotifyWait( uint32_t ulBitsToClearOnEntry, uint32_t ulBitsToClearOnExit, uint32_t *pulNotificationValue, TickType_t xTicksToWait )\r
        {\r
-       TickType_t xTimeToWake;\r
        BaseType_t xReturn;\r
 \r
                taskENTER_CRITICAL();\r
                {\r
                        /* Only block if a notification is not already pending. */\r
-                       if( pxCurrentTCB->eNotifyState != eNotified )\r
+                       if( pxCurrentTCB->ucNotifyState != taskNOTIFICATION_RECEIVED )\r
                        {\r
                                /* Clear bits in the task's notification value as bits may get\r
                                set     by the notifying task or interrupt.  This can be used to\r
@@ -4028,57 +4811,13 @@ TickType_t uxReturn;
                                pxCurrentTCB->ulNotifiedValue &= ~ulBitsToClearOnEntry;\r
 \r
                                /* Mark this task as waiting for a notification. */\r
-                               pxCurrentTCB->eNotifyState = eWaitingNotification;\r
+                               pxCurrentTCB->ucNotifyState = taskWAITING_NOTIFICATION;\r
 \r
                                if( xTicksToWait > ( TickType_t ) 0 )\r
                                {\r
-                                       /* The task is going to block.  First it must be removed\r
-                                       from the        ready list. */\r
-                                       if( uxListRemove( &( pxCurrentTCB->xGenericListItem ) ) == ( UBaseType_t ) 0 )\r
-                                       {\r
-                                               /* The current task must be in a ready list, so there is\r
-                                               no need to check, and the port reset macro can be called\r
-                                               directly. */\r
-                                               portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority );\r
-                                       }\r
-                                       else\r
-                                       {\r
-                                               mtCOVERAGE_TEST_MARKER();\r
-                                       }\r
-\r
-                                       #if ( INCLUDE_vTaskSuspend == 1 )\r
-                                       {\r
-                                               if( xTicksToWait == portMAX_DELAY )\r
-                                               {\r
-                                                       /* Add the task to the suspended task list instead\r
-                                                       of a delayed task list to ensure the task is not\r
-                                                       woken by a timing event.  It will block\r
-                                                       indefinitely. */\r
-                                                       vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xGenericListItem ) );\r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       /* Calculate the time at which the task should be\r
-                                                       woken if no notification events occur.  This may\r
-                                                       overflow but this doesn't matter, the scheduler will\r
-                                                       handle it. */\r
-                                                       xTimeToWake = xTickCount + xTicksToWait;\r
-                                                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-                                               }\r
-                                       }\r
-                                       #else /* INCLUDE_vTaskSuspend */\r
-                                       {\r
-                                                       /* Calculate the time at which the task should be\r
-                                                       woken if the event does not occur.  This may\r
-                                                       overflow but this doesn't matter, the scheduler will\r
-                                                       handle it. */\r
-                                                       xTimeToWake = xTickCount + xTicksToWait;\r
-                                                       prvAddCurrentTaskToDelayedList( xTimeToWake );\r
-                                       }\r
-                                       #endif /* INCLUDE_vTaskSuspend */\r
-\r
+                                       prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );\r
                                        traceTASK_NOTIFY_WAIT_BLOCK();\r
-                                       \r
+\r
                                        /* All ports are written to allow a yield in a critical\r
                                        section (some will yield immediately, others wait until the\r
                                        critical section exits) - but it is not something that\r
@@ -4100,7 +4839,7 @@ TickType_t uxReturn;
                taskENTER_CRITICAL();\r
                {\r
                        traceTASK_NOTIFY_WAIT();\r
-                       \r
+\r
                        if( pulNotificationValue != NULL )\r
                        {\r
                                /* Output the current notification value, which may or may not\r
@@ -4108,11 +4847,11 @@ TickType_t uxReturn;
                                *pulNotificationValue = pxCurrentTCB->ulNotifiedValue;\r
                        }\r
 \r
-                       /* If eNotifyValue is set then either the task never entered the\r
+                       /* If ucNotifyValue is set then either the task never entered the\r
                        blocked state (because a notification was already pending) or the\r
                        task unblocked because of a notification.  Otherwise the task\r
                        unblocked because of a timeout. */\r
-                       if( pxCurrentTCB->eNotifyState == eWaitingNotification )\r
+                       if( pxCurrentTCB->ucNotifyState != taskNOTIFICATION_RECEIVED )\r
                        {\r
                                /* A notification was not received. */\r
                                xReturn = pdFALSE;\r
@@ -4125,7 +4864,7 @@ TickType_t uxReturn;
                                xReturn = pdTRUE;\r
                        }\r
 \r
-                       pxCurrentTCB->eNotifyState = eNotWaitingNotification;\r
+                       pxCurrentTCB->ucNotifyState = taskNOT_WAITING_NOTIFICATION;\r
                }\r
                taskEXIT_CRITICAL();\r
 \r
@@ -4140,11 +4879,11 @@ TickType_t uxReturn;
        BaseType_t xTaskGenericNotify( TaskHandle_t xTaskToNotify, uint32_t ulValue, eNotifyAction eAction, uint32_t *pulPreviousNotificationValue )\r
        {\r
        TCB_t * pxTCB;\r
-       eNotifyValue eOriginalNotifyState;\r
        BaseType_t xReturn = pdPASS;\r
+       uint8_t ucOriginalNotifyState;\r
 \r
                configASSERT( xTaskToNotify );\r
-               pxTCB = ( TCB_t * ) xTaskToNotify;\r
+               pxTCB = xTaskToNotify;\r
 \r
                taskENTER_CRITICAL();\r
                {\r
@@ -4153,9 +4892,9 @@ TickType_t uxReturn;
                                *pulPreviousNotificationValue = pxTCB->ulNotifiedValue;\r
                        }\r
 \r
-                       eOriginalNotifyState = pxTCB->eNotifyState;\r
+                       ucOriginalNotifyState = pxTCB->ucNotifyState;\r
 \r
-                       pxTCB->eNotifyState = eNotified;\r
+                       pxTCB->ucNotifyState = taskNOTIFICATION_RECEIVED;\r
 \r
                        switch( eAction )\r
                        {\r
@@ -4172,7 +4911,7 @@ TickType_t uxReturn;
                                        break;\r
 \r
                                case eSetValueWithoutOverwrite :\r
-                                       if( eOriginalNotifyState != eNotified )\r
+                                       if( ucOriginalNotifyState != taskNOTIFICATION_RECEIVED )\r
                                        {\r
                                                pxTCB->ulNotifiedValue = ulValue;\r
                                        }\r
@@ -4187,15 +4926,23 @@ TickType_t uxReturn;
                                        /* The task is being notified without its notify value being\r
                                        updated. */\r
                                        break;\r
+\r
+                               default:\r
+                                       /* Should not get here if all enums are handled.\r
+                                       Artificially force an assert by testing a value the\r
+                                       compiler can't assume is const. */\r
+                                       configASSERT( pxTCB->ulNotifiedValue == ~0UL );\r
+\r
+                                       break;\r
                        }\r
 \r
                        traceTASK_NOTIFY();\r
 \r
                        /* If the task is in the blocked state specifically to wait for a\r
                        notification then unblock it now. */\r
-                       if( eOriginalNotifyState == eWaitingNotification )\r
+                       if( ucOriginalNotifyState == taskWAITING_NOTIFICATION )\r
                        {\r
-                               ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
+                               ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
                                prvAddTaskToReadyList( pxTCB );\r
 \r
                                /* The task should not have been on an event list. */\r
@@ -4246,7 +4993,7 @@ TickType_t uxReturn;
        BaseType_t xTaskGenericNotifyFromISR( TaskHandle_t xTaskToNotify, uint32_t ulValue, eNotifyAction eAction, uint32_t *pulPreviousNotificationValue, BaseType_t *pxHigherPriorityTaskWoken )\r
        {\r
        TCB_t * pxTCB;\r
-       eNotifyValue eOriginalNotifyState;\r
+       uint8_t ucOriginalNotifyState;\r
        BaseType_t xReturn = pdPASS;\r
        UBaseType_t uxSavedInterruptStatus;\r
 \r
@@ -4270,7 +5017,7 @@ TickType_t uxReturn;
                http://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
                portASSERT_IF_INTERRUPT_PRIORITY_INVALID();\r
 \r
-               pxTCB = ( TCB_t * ) xTaskToNotify;\r
+               pxTCB = xTaskToNotify;\r
 \r
                uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
                {\r
@@ -4279,8 +5026,8 @@ TickType_t uxReturn;
                                *pulPreviousNotificationValue = pxTCB->ulNotifiedValue;\r
                        }\r
 \r
-                       eOriginalNotifyState = pxTCB->eNotifyState;\r
-                       pxTCB->eNotifyState = eNotified;\r
+                       ucOriginalNotifyState = pxTCB->ucNotifyState;\r
+                       pxTCB->ucNotifyState = taskNOTIFICATION_RECEIVED;\r
 \r
                        switch( eAction )\r
                        {\r
@@ -4297,7 +5044,7 @@ TickType_t uxReturn;
                                        break;\r
 \r
                                case eSetValueWithoutOverwrite :\r
-                                       if( eOriginalNotifyState != eNotified )\r
+                                       if( ucOriginalNotifyState != taskNOTIFICATION_RECEIVED )\r
                                        {\r
                                                pxTCB->ulNotifiedValue = ulValue;\r
                                        }\r
@@ -4312,20 +5059,27 @@ TickType_t uxReturn;
                                        /* The task is being notified without its notify value being\r
                                        updated. */\r
                                        break;\r
+\r
+                               default:\r
+                                       /* Should not get here if all enums are handled.\r
+                                       Artificially force an assert by testing a value the\r
+                                       compiler can't assume is const. */\r
+                                       configASSERT( pxTCB->ulNotifiedValue == ~0UL );\r
+                                       break;\r
                        }\r
 \r
                        traceTASK_NOTIFY_FROM_ISR();\r
-                       \r
+\r
                        /* If the task is in the blocked state specifically to wait for a\r
                        notification then unblock it now. */\r
-                       if( eOriginalNotifyState == eWaitingNotification )\r
+                       if( ucOriginalNotifyState == taskWAITING_NOTIFICATION )\r
                        {\r
                                /* The task should not have been on an event list. */\r
                                configASSERT( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) == NULL );\r
 \r
                                if( uxSchedulerSuspended == ( UBaseType_t ) pdFALSE )\r
                                {\r
-                                       ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
+                                       ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
                                        prvAddTaskToReadyList( pxTCB );\r
                                }\r
                                else\r
@@ -4343,6 +5097,11 @@ TickType_t uxReturn;
                                        {\r
                                                *pxHigherPriorityTaskWoken = pdTRUE;\r
                                        }\r
+\r
+                                       /* Mark that a yield is pending in case the user is not\r
+                                       using the "xHigherPriorityTaskWoken" parameter to an ISR\r
+                                       safe FreeRTOS function. */\r
+                                       xYieldPending = pdTRUE;\r
                                }\r
                                else\r
                                {\r
@@ -4363,7 +5122,7 @@ TickType_t uxReturn;
        void vTaskNotifyGiveFromISR( TaskHandle_t xTaskToNotify, BaseType_t *pxHigherPriorityTaskWoken )\r
        {\r
        TCB_t * pxTCB;\r
-       eNotifyValue eOriginalNotifyState;\r
+       uint8_t ucOriginalNotifyState;\r
        UBaseType_t uxSavedInterruptStatus;\r
 \r
                configASSERT( xTaskToNotify );\r
@@ -4386,29 +5145,29 @@ TickType_t uxReturn;
                http://www.freertos.org/RTOS-Cortex-M3-M4.html */\r
                portASSERT_IF_INTERRUPT_PRIORITY_INVALID();\r
 \r
-               pxTCB = ( TCB_t * ) xTaskToNotify;\r
+               pxTCB = xTaskToNotify;\r
 \r
                uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
                {\r
-                       eOriginalNotifyState = pxTCB->eNotifyState;\r
-                       pxTCB->eNotifyState = eNotified;\r
+                       ucOriginalNotifyState = pxTCB->ucNotifyState;\r
+                       pxTCB->ucNotifyState = taskNOTIFICATION_RECEIVED;\r
 \r
                        /* 'Giving' is equivalent to incrementing a count in a counting\r
                        semaphore. */\r
                        ( pxTCB->ulNotifiedValue )++;\r
-                       \r
+\r
                        traceTASK_NOTIFY_GIVE_FROM_ISR();\r
 \r
                        /* If the task is in the blocked state specifically to wait for a\r
                        notification then unblock it now. */\r
-                       if( eOriginalNotifyState == eWaitingNotification )\r
+                       if( ucOriginalNotifyState == taskWAITING_NOTIFICATION )\r
                        {\r
                                /* The task should not have been on an event list. */\r
                                configASSERT( listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) ) == NULL );\r
 \r
                                if( uxSchedulerSuspended == ( UBaseType_t ) pdFALSE )\r
                                {\r
-                                       ( void ) uxListRemove( &( pxTCB->xGenericListItem ) );\r
+                                       ( void ) uxListRemove( &( pxTCB->xStateListItem ) );\r
                                        prvAddTaskToReadyList( pxTCB );\r
                                }\r
                                else\r
@@ -4426,6 +5185,11 @@ TickType_t uxReturn;
                                        {\r
                                                *pxHigherPriorityTaskWoken = pdTRUE;\r
                                        }\r
+\r
+                                       /* Mark that a yield is pending in case the user is not\r
+                                       using the "xHigherPriorityTaskWoken" parameter in an ISR\r
+                                       safe FreeRTOS function. */\r
+                                       xYieldPending = pdTRUE;\r
                                }\r
                                else\r
                                {\r
@@ -4437,11 +5201,206 @@ TickType_t uxReturn;
        }\r
 \r
 #endif /* configUSE_TASK_NOTIFICATIONS */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+\r
+       BaseType_t xTaskNotifyStateClear( TaskHandle_t xTask )\r
+       {\r
+       TCB_t *pxTCB;\r
+       BaseType_t xReturn;\r
+\r
+               /* If null is passed in here then it is the calling task that is having\r
+               its notification state cleared. */\r
+               pxTCB = prvGetTCBFromHandle( xTask );\r
+\r
+               taskENTER_CRITICAL();\r
+               {\r
+                       if( pxTCB->ucNotifyState == taskNOTIFICATION_RECEIVED )\r
+                       {\r
+                               pxTCB->ucNotifyState = taskNOT_WAITING_NOTIFICATION;\r
+                               xReturn = pdPASS;\r
+                       }\r
+                       else\r
+                       {\r
+                               xReturn = pdFAIL;\r
+                       }\r
+               }\r
+               taskEXIT_CRITICAL();\r
+\r
+               return xReturn;\r
+       }\r
+\r
+#endif /* configUSE_TASK_NOTIFICATIONS */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+\r
+       uint32_t ulTaskNotifyValueClear( TaskHandle_t xTask, uint32_t ulBitsToClear )\r
+       {\r
+       TCB_t *pxTCB;\r
+       uint32_t ulReturn;\r
+\r
+               /* If null is passed in here then it is the calling task that is having\r
+               its notification state cleared. */\r
+               pxTCB = prvGetTCBFromHandle( xTask );\r
+\r
+               taskENTER_CRITICAL();\r
+               {\r
+                       /* Return the notification as it was before the bits were cleared,\r
+                       then clear the bit mask. */\r
+                       ulReturn = pxCurrentTCB->ulNotifiedValue;\r
+                       pxTCB->ulNotifiedValue &= ~ulBitsToClear;\r
+               }\r
+               taskEXIT_CRITICAL();\r
+\r
+               return ulReturn;\r
+       }\r
+\r
+#endif /* configUSE_TASK_NOTIFICATIONS */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) )\r
+\r
+       uint32_t ulTaskGetIdleRunTimeCounter( void )\r
+       {\r
+               return xIdleTaskHandle->ulRunTimeCounter;\r
+       }\r
 \r
+#endif\r
 /*-----------------------------------------------------------*/\r
 \r
+static void prvAddCurrentTaskToDelayedList( TickType_t xTicksToWait, const BaseType_t xCanBlockIndefinitely )\r
+{\r
+TickType_t xTimeToWake;\r
+const TickType_t xConstTickCount = xTickCount;\r
+\r
+       #if( INCLUDE_xTaskAbortDelay == 1 )\r
+       {\r
+               /* About to enter a delayed list, so ensure the ucDelayAborted flag is\r
+               reset to pdFALSE so it can be detected as having been set to pdTRUE\r
+               when the task leaves the Blocked state. */\r
+               pxCurrentTCB->ucDelayAborted = pdFALSE;\r
+       }\r
+       #endif\r
+\r
+       /* Remove the task from the ready list before adding it to the blocked list\r
+       as the same list item is used for both lists. */\r
+       if( uxListRemove( &( pxCurrentTCB->xStateListItem ) ) == ( UBaseType_t ) 0 )\r
+       {\r
+               /* The current task must be in a ready list, so there is no need to\r
+               check, and the port reset macro can be called directly. */\r
+               portRESET_READY_PRIORITY( pxCurrentTCB->uxPriority, uxTopReadyPriority ); /*lint !e931 pxCurrentTCB cannot change as it is the calling task.  pxCurrentTCB->uxPriority and uxTopReadyPriority cannot change as called with scheduler suspended or in a critical section. */\r
+       }\r
+       else\r
+       {\r
+               mtCOVERAGE_TEST_MARKER();\r
+       }\r
+\r
+       #if ( INCLUDE_vTaskSuspend == 1 )\r
+       {\r
+               if( ( xTicksToWait == portMAX_DELAY ) && ( xCanBlockIndefinitely != pdFALSE ) )\r
+               {\r
+                       /* Add the task to the suspended task list instead of a delayed task\r
+                       list to ensure it is not woken by a timing event.  It will block\r
+                       indefinitely. */\r
+                       vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB->xStateListItem ) );\r
+               }\r
+               else\r
+               {\r
+                       /* Calculate the time at which the task should be woken if the event\r
+                       does not occur.  This may overflow but this doesn't matter, the\r
+                       kernel will manage it correctly. */\r
+                       xTimeToWake = xConstTickCount + xTicksToWait;\r
+\r
+                       /* The list item will be inserted in wake time order. */\r
+                       listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xStateListItem ), xTimeToWake );\r
+\r
+                       if( xTimeToWake < xConstTickCount )\r
+                       {\r
+                               /* Wake time has overflowed.  Place this item in the overflow\r
+                               list. */\r
+                               vListInsert( pxOverflowDelayedTaskList, &( pxCurrentTCB->xStateListItem ) );\r
+                       }\r
+                       else\r
+                       {\r
+                               /* The wake time has not overflowed, so the current block list\r
+                               is used. */\r
+                               vListInsert( pxDelayedTaskList, &( pxCurrentTCB->xStateListItem ) );\r
+\r
+                               /* If the task entering the blocked state was placed at the\r
+                               head of the list of blocked tasks then xNextTaskUnblockTime\r
+                               needs to be updated too. */\r
+                               if( xTimeToWake < xNextTaskUnblockTime )\r
+                               {\r
+                                       xNextTaskUnblockTime = xTimeToWake;\r
+                               }\r
+                               else\r
+                               {\r
+                                       mtCOVERAGE_TEST_MARKER();\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+       #else /* INCLUDE_vTaskSuspend */\r
+       {\r
+               /* Calculate the time at which the task should be woken if the event\r
+               does not occur.  This may overflow but this doesn't matter, the kernel\r
+               will manage it correctly. */\r
+               xTimeToWake = xConstTickCount + xTicksToWait;\r
+\r
+               /* The list item will be inserted in wake time order. */\r
+               listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xStateListItem ), xTimeToWake );\r
+\r
+               if( xTimeToWake < xConstTickCount )\r
+               {\r
+                       /* Wake time has overflowed.  Place this item in the overflow list. */\r
+                       vListInsert( pxOverflowDelayedTaskList, &( pxCurrentTCB->xStateListItem ) );\r
+               }\r
+               else\r
+               {\r
+                       /* The wake time has not overflowed, so the current block list is used. */\r
+                       vListInsert( pxDelayedTaskList, &( pxCurrentTCB->xStateListItem ) );\r
+\r
+                       /* If the task entering the blocked state was placed at the head of the\r
+                       list of blocked tasks then xNextTaskUnblockTime needs to be updated\r
+                       too. */\r
+                       if( xTimeToWake < xNextTaskUnblockTime )\r
+                       {\r
+                               xNextTaskUnblockTime = xTimeToWake;\r
+                       }\r
+                       else\r
+                       {\r
+                               mtCOVERAGE_TEST_MARKER();\r
+                       }\r
+               }\r
+\r
+               /* Avoid compiler warning when INCLUDE_vTaskSuspend is not 1. */\r
+               ( void ) xCanBlockIndefinitely;\r
+       }\r
+       #endif /* INCLUDE_vTaskSuspend */\r
+}\r
+\r
+/* Code below here allows additional code to be inserted into this source file,\r
+especially where access to file scope functions and data is needed (for example\r
+when performing module tests). */\r
 \r
 #ifdef FREERTOS_MODULE_TEST\r
        #include "tasks_test_access_functions.h"\r
 #endif\r
 \r
+\r
+#if( configINCLUDE_FREERTOS_TASK_C_ADDITIONS_H == 1 )\r
+\r
+       #include "freertos_tasks_c_additions.h"\r
+\r
+       #ifdef FREERTOS_TASKS_C_ADDITIONS_INIT\r
+               static void freertos_tasks_c_additions_init( void )\r
+               {\r
+                       FREERTOS_TASKS_C_ADDITIONS_INIT();\r
+               }\r
+       #endif\r
+\r
+#endif\r
+\r
+\r