Prepare for a FreeRTOS V9 release candidate:

- Remove the standard demo files that used the [long since deprecated] alternative API.
- Add standard demo task that tests the new xTaskAbortDelay() function.
- Update the Win32 Visual Studio project to use Visual Studio 2015 Community Edition.
- Rename the xGenericListItem TCB member to xStateListItem as it better describes the member's purpose.

FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcBase.c

@@ -48,7 +48,7 @@
  ******************************************************************************/
 
 /* Tasks and kernel objects can be explicitly excluded from the trace to reduce
-buffer usage. This structure handles the exclude flags for all objects and tasks. 
+buffer usage. This structure handles the exclude flags for all objects and tasks.
 Note that slot 0 is not used, since not a valid handle. */
 uint8_t excludedObjects[(TRACE_KERNEL_OBJECT_COUNT + TRACE_NCLASSES) / 8 + 1] = { 0 };
 
@@ -58,43 +58,43 @@ This structure handle the exclude flags for all event codes */
 uint8_t excludedEventCodes[NEventCodes / 8 + 1] = { 0 };
 
 /* A set of stacks that keeps track of available object handles for each class.
-The stacks are empty initially, meaning that allocation of new handles will be 
+The stacks are empty initially, meaning that allocation of new handles will be
 based on a counter (for each object class). Any delete operation will
 return the handle to the corresponding stack, for reuse on the next allocate.*/
 objectHandleStackType objectHandleStacks = { { 0 }, { 0 }, { 0 }, { 0 }, { 0 } };
 
-/* Initial HWTC_COUNT value, for detecting if the time-stamping source is 
-enabled. If using the OS periodic timer for time-stamping, this might not 
+/* Initial HWTC_COUNT value, for detecting if the time-stamping source is
+enabled. If using the OS periodic timer for time-stamping, this might not
 have been configured on the earliest events during the startup. */
 uint32_t init_hwtc_count;
 
 /*******************************************************************************
  * RecorderData
  *
- * The main data structure. This is the data read by the Tracealyzer tools, 
- * typically through a debugger RAM dump. The recorder uses the pointer 
+ * The main data structure. This is the data read by the Tracealyzer tools,
+ * typically through a debugger RAM dump. The recorder uses the pointer
  * RecorderDataPtr for accessing this, to allow for dynamic allocation.
  *
  * On the NXP LPC17xx you may use the secondary RAM bank (AHB RAM) for this
  * purpose. For instance, the LPC1766 has 32 KB AHB RAM which allows for
  * allocating a buffer size of at least 7500 events without affecting the main
- * RAM. To place RecorderData in this RAM bank using IAR Embedded Workbench 
+ * RAM. To place RecorderData in this RAM bank using IAR Embedded Workbench
  * for ARM, use this pragma right before the declaration:
  *
  *	 #pragma location="AHB_RAM_MEMORY"
  *
  * This of course works for other hardware architectures with additional RAM
- * banks as well, just replace "AHB_RAM_MEMORY" with the section name from the 
+ * banks as well, just replace "AHB_RAM_MEMORY" with the section name from the
  * linker .map file, or simply the desired address.
  *
- * For portability reasons, we don't add the pragma directly in trcBase.c, but 
+ * For portability reasons, we don't add the pragma directly in trcBase.c, but
  * in a header file included below. To include this header, you need to enable
  * USE_LINKER_PRAGMA, defined in trcConfig.h.
  *
  * If using GCC, you need to modify the declaration as follows:
  *
  *	 RecorderDataType RecorderData __attribute__ ((section ("name"))) = ...
- * 
+ *
  * Remember to replace "name" with the correct section name.
  ******************************************************************************/
 
@@ -113,9 +113,9 @@ RecorderDataType* RecorderDataPtr = NULL;
 
 /* This version of the function dynamically allocates the trace data */
 void prvTraceInitTraceData()
-{		
+{
 	init_hwtc_count = HWTC_COUNT;
-	
+
 #if TRACE_DATA_ALLOCATION == TRACE_DATA_ALLOCATION_STATIC
 	RecorderDataPtr = &RecorderData;
 #elif TRACE_DATA_ALLOCATION == TRACE_DATA_ALLOCATION_DYNAMIC
@@ -132,7 +132,7 @@ void prvTraceInitTraceData()
 		vTraceError("No recorder data structure allocated!");
 		return;
 	}
-		
+
 	(void)memset(RecorderDataPtr, 0, sizeof(RecorderDataType));
 
 	RecorderDataPtr->startmarker0 = 0x00;
@@ -196,7 +196,7 @@ void prvTraceInitTraceData()
 
 	/* Fix the start markers of the trace data structure */
 	vInitStartMarkers();
-	
+
 	#ifdef PORT_SPECIFIC_INIT
 	PORT_SPECIFIC_INIT();
 	#endif
@@ -242,15 +242,15 @@ void* xTraceNextFreeEventBufferSlot(void)
 
 uint16_t uiIndexOfObject(objectHandleType objecthandle, uint8_t objectclass)
 {
-	TRACE_ASSERT(objectclass < TRACE_NCLASSES, 
+	TRACE_ASSERT(objectclass < TRACE_NCLASSES,
 		"uiIndexOfObject: Invalid value for objectclass", 0);
-	TRACE_ASSERT(objecthandle > 0 && objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass], 
+	TRACE_ASSERT(objecthandle > 0 && objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass],
 		"uiIndexOfObject: Invalid value for objecthandle", 0);
 
-	if ((objectclass < TRACE_NCLASSES) && (objecthandle > 0) && 
+	if ((objectclass < TRACE_NCLASSES) && (objecthandle > 0) &&
 		(objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass]))
 	{
-		return (uint16_t)(RecorderDataPtr->ObjectPropertyTable.StartIndexOfClass[objectclass] + 
+		return (uint16_t)(RecorderDataPtr->ObjectPropertyTable.StartIndexOfClass[objectclass] +
 			(RecorderDataPtr->ObjectPropertyTable.TotalPropertyBytesPerClass[objectclass] * (objecthandle-1)));
 	}
 
@@ -286,7 +286,7 @@ objectHandleType xTraceGetObjectHandle(traceObjectClass objectclass)
 	objectHandleType handle;
 	static int indexOfHandle;
 
-	TRACE_ASSERT(objectclass < TRACE_NCLASSES, 
+	TRACE_ASSERT(objectclass < TRACE_NCLASSES,
 		"xTraceGetObjectHandle: Invalid value for objectclass", (objectHandleType)0);
 
 	indexOfHandle = objectHandleStacks.indexOfNextAvailableHandle[objectclass];
@@ -335,9 +335,9 @@ void vTraceFreeObjectHandle(traceObjectClass objectclass, objectHandleType handl
 {
 	int indexOfHandle;
 
-	TRACE_ASSERT(objectclass < TRACE_NCLASSES, 
+	TRACE_ASSERT(objectclass < TRACE_NCLASSES,
 		"vTraceFreeObjectHandle: Invalid value for objectclass", );
-	TRACE_ASSERT(handle > 0 && handle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass], 
+	TRACE_ASSERT(handle > 0 && handle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass],
 		"vTraceFreeObjectHandle: Invalid value for handle", );
 
 	/* Check that there is room to push the handle on the stack */
@@ -421,10 +421,10 @@ traceLabel prvTraceOpenSymbol(const char* name, traceLabel userEventChannel)
 	uint8_t len;
 	uint8_t crc;
 	TRACE_SR_ALLOC_CRITICAL_SECTION();
-	
+
 	len = 0;
 	crc = 0;
-	
+
 	TRACE_ASSERT(name != NULL, "prvTraceOpenSymbol: name == NULL", (traceLabel)0);
 
 	prvTraceGetChecksum(name, &crc, &len);
@@ -470,9 +470,9 @@ void vTraceError(const char* msg)
 	{
 		traceErrorMessage = (char*)msg;
 		(void)strncpy(RecorderDataPtr->systemInfo, traceErrorMessage, 80);
-		RecorderDataPtr->internalErrorOccured = 1;	 	 
+		RecorderDataPtr->internalErrorOccured = 1;
 	}
-	
+
 }
 
 /******************************************************************************
@@ -496,7 +496,7 @@ void prvCheckDataToBeOverwrittenForMultiEntryEvents(uint8_t nofEntriesToCheck)
 	unsigned int i = 0;
 	unsigned int e = 0;
 
-	TRACE_ASSERT(nofEntriesToCheck != 0, 
+	TRACE_ASSERT(nofEntriesToCheck != 0,
 		"prvCheckDataToBeOverwrittenForMultiEntryEvents: nofEntriesToCheck == 0", );
 
 	while (i < nofEntriesToCheck)
@@ -535,12 +535,12 @@ void prvCheckDataToBeOverwrittenForMultiEntryEvents(uint8_t nofEntriesToCheck)
  * Updates the index of the event buffer.
  ******************************************************************************/
 void prvTraceUpdateCounters(void)
-{	
+{
 	if (RecorderDataPtr->recorderActive == 0)
 	{
 		return;
 	}
-	
+
 	RecorderDataPtr->numEvents++;
 
 	RecorderDataPtr->nextFreeIndex++;
@@ -584,9 +584,9 @@ uint16_t prvTraceGetDTS(uint16_t param_maxDTS)
 	if (RecorderDataPtr->frequency == 0 && init_hwtc_count != HWTC_COUNT)
 	{
 		/* If HWTC_PERIOD is mapped to the timer reload register,
-		it might not be initialized	before the scheduler has been started. 
+		it might not be initialized	before the scheduler has been started.
 		We therefore store the frequency of the timer when the counter
-		register has changed from its initial value. 
+		register has changed from its initial value.
 		(Note that this function is called also by vTraceStart and
 		uiTraceStart, which might be called before the scheduler
 		has been started.) */
@@ -605,9 +605,9 @@ uint16_t prvTraceGetDTS(uint16_t param_maxDTS)
 	* If necessary, whole seconds are extracted using division while the rest
 	* comes from the modulo operation.
 	**************************************************************************/
-	
-	vTracePortGetTimeStamp(&timestamp);	
-	
+
+	vTracePortGetTimeStamp(&timestamp);
+
 	/***************************************************************************
 	* Since dts is unsigned the result will be correct even if timestamp has
 	* wrapped around.
@@ -818,14 +818,14 @@ void prvTraceGetChecksum(const char *pname, uint8_t* pcrc, uint8_t* plength)
 
 #if (USE_16BIT_OBJECT_HANDLES == 1)
 
-void prvTraceStoreXID(objectHandleType handle); 
+void prvTraceStoreXID(objectHandleType handle);
 
 /******************************************************************************
  * prvTraceStoreXID
  *
  * Stores an XID (eXtended IDentifier) event.
  * This is used if an object/task handle is larger than 255.
- * The parameter "handle" is the full (16 bit) handle, assumed to be 256 or 
+ * The parameter "handle" is the full (16 bit) handle, assumed to be 256 or
  * larger. Handles below 256 should not use this function.
  *
  * NOTE: this function MUST be called from within a critical section.
@@ -844,7 +844,7 @@ void prvTraceStoreXID(objectHandleType handle)
 		xid->type = XID;
 
 		/* This function is (only) used when objectHandleType is 16 bit... */
-		xid->xps_16 = handle; 
+		xid->xps_16 = handle;
 
 		prvTraceUpdateCounters();
 	}
@@ -853,11 +853,11 @@ void prvTraceStoreXID(objectHandleType handle)
 unsigned char prvTraceGet8BitHandle(objectHandleType handle)
 {
 	if (handle > 255)
-	{		
+	{
 		prvTraceStoreXID(handle);
-		/* The full handle (16 bit) is stored in the XID event. 
+		/* The full handle (16 bit) is stored in the XID event.
 		This code (255) is used instead of zero (which is an error code).*/
-		return 255; 
+		return 255;
 	}
 	return (unsigned char)(handle & 0xFF);
 }

FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/FreeRTOSConfig.h

@@ -156,6 +156,8 @@ to exclude the API function. */
 #define INCLUDE_vTaskDelay						1
 #define INCLUDE_xTimerPendFunctionCall			1
 #define INCLUDE_eTaskGetState					1
+#define INCLUDE_xTaskAbortDelay					1
+#define INCLUDE_xTaskGetTaskHandle				1
 
 /* This demo makes use of one or more example stats formatting functions.  These
 format the raw data provided by the uxTaskGetSystemState() function in to human

FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c

@@ -151,6 +151,8 @@
 #include "TaskNotify.h"
 #include "IntSemTest.h"
 #include "StaticAllocation.h"
+#include "AbortDelay.h"
+
 
 /* Priorities for the demo application tasks. */
 #define mainSEM_TEST_PRIORITY				( tskIDLE_PRIORITY + 1UL )
@@ -260,6 +262,7 @@ void main_full( void )
 	vStartTaskNotifyTask();
 	vStartInterruptSemaphoreTasks();
 	vStartStaticallyAllocatedTasks();
+	vCreateAbortDelayTasks();
 
 	/* Start the tasks that implements the command console on the UART, as
 	described above. */
@@ -406,17 +409,22 @@ unsigned long ulErrorFound = pdFALSE;
 			ulErrorFound |= 1UL << 15UL;
 		}
 
+		if( xAreAbortDelayTestTasksStillRunning() != pdPASS )
+		{
+			ulErrorFound |= 1UL << 16UL;
+		}
+
 		/* Check that the register test 1 task is still running. */
 		if( ulLastRegTest1Value == ulRegTest1LoopCounter )
 		{
-			ulErrorFound |= 1UL << 16UL;
+			ulErrorFound |= 1UL << 17UL;
 		}
 		ulLastRegTest1Value = ulRegTest1LoopCounter;
 
 		/* Check that the register test 2 task is still running. */
 		if( ulLastRegTest2Value == ulRegTest2LoopCounter )
 		{
-			ulErrorFound |= 1UL << 17UL;
+			ulErrorFound |= 1UL << 18UL;
 		}
 		ulLastRegTest2Value = ulRegTest2LoopCounter;
 

FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c

@@ -268,7 +268,7 @@ void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )
 
 void vApplicationIdleHook( void )
 {
-volatile size_t xFreeHeapSpace;
+volatile size_t xFreeHeapSpace, xMinimumEverFreeHeapSpace;
 
 	/* This is just a trivial example of an idle hook.  It is called on each
 	cycle of the idle task.  It must *NOT* attempt to block.  In this case the
@@ -278,9 +278,11 @@ volatile size_t xFreeHeapSpace;
 	configTOTAL_HEAP_SIZE value in FreeRTOSConfig.h can be reduced to free up
 	RAM. */
 	xFreeHeapSpace = xPortGetFreeHeapSize();
+	xMinimumEverFreeHeapSpace = xPortGetMinimumEverFreeHeapSize();
 
 	/* Remove compiler warning about xFreeHeapSpace being set but never used. */
 	( void ) xFreeHeapSpace;
+	( void ) xMinimumEverFreeHeapSpace;
 }
 /*-----------------------------------------------------------*/
 

FreeRTOS/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h

@@ -102,7 +102,7 @@
 #define configUSE_MALLOC_FAILED_HOOK	1
 #define configUSE_QUEUE_SETS			1
 #define configUSE_COUNTING_SEMAPHORES	1
-#define configUSE_ALTERNATIVE_API		1
+#define configUSE_ALTERNATIVE_API		0
 
 #define configMAX_PRIORITIES			( 5UL )
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )

FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/FreeRTOSConfig.h

@@ -215,7 +215,7 @@ header file. */
 
 /* LED not used at present, so just increment a variable to keep a count of the
 number of times the LED would otherwise have been toggled. */
-#define mainTOGGLE_LED()	ulLED++
+#define configTOGGLE_LED()	ulLED++
 
 
 #ifdef __cplusplus

FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/Keil_Specific/RTOSDemo.uvoptx

@@ -73,7 +73,7 @@
         <LExpSel>0</LExpSel>
       </OPTXL>
       <OPTFL>
-        <tvExp>0</tvExp>
+        <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
@@ -357,7 +357,7 @@
       <GroupNumber>3</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\Source\portable\RVDS\ARM_CM4F\port.c</PathWithFileName>
@@ -369,7 +369,7 @@
 
   <Group>
     <GroupName>main_low_power</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -401,7 +401,7 @@
 
   <Group>
     <GroupName>main_full</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/main_full/main_full.c

@@ -363,7 +363,7 @@ unsigned long ulErrorFound = pdFALSE;
 		/* Toggle the check LED to give an indication of the system status.  If
 		the LED toggles every mainNO_ERROR_CHECK_TASK_PERIOD milliseconds then
 		everything is ok.  A faster toggle indicates an error. */
-		mainTOGGLE_LED();
+		configTOGGLE_LED();
 
 		if( ulErrorFound != pdFALSE )
 		{

FreeRTOS/Demo/CORTEX_M4F_CEC1302_Keil/main_low_power/main_low_power.c

@@ -225,9 +225,9 @@ const TickType_t xShortDelay = pdMS_TO_TICKS( 10 );
 		{
 			/* Blip the LED briefly to show the demo is running, but without
 			leaving the LED on too long as energy is being conserved. */
-			mainTOGGLE_LED();
+			configTOGGLE_LED();
 			vTaskDelay( xShortDelay );
-			mainTOGGLE_LED();
+			configTOGGLE_LED();
 
 			ulReceivedValue = 0U;
 		}

FreeRTOS/Demo/Common/Minimal/AltBlckQ.c

@@ -1,336 +0,0 @@
-/*
-    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
-
-    ***************************************************************************
-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
-    >>!   distribute a combined work that includes FreeRTOS without being   !<<
-    >>!   obliged to provide the source code for proprietary components     !<<
-    >>!   outside of the FreeRTOS kernel.                                   !<<
-    ***************************************************************************
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
-    link: http://www.freertos.org/a00114.html
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that is more than just the market leader, it     *
-     *    is the industry's de facto standard.                               *
-     *                                                                       *
-     *    Help yourself get started quickly while simultaneously helping     *
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
-     *    tutorial book, reference manual, or both:                          *
-     *    http://www.FreeRTOS.org/Documentation                              *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-    the FAQ page "My application does not run, what could be wrong?".  Have you
-    defined configASSERT()?
-
-    http://www.FreeRTOS.org/support - In return for receiving this top quality
-    embedded software for free we request you assist our global community by
-    participating in the support forum.
-
-    http://www.FreeRTOS.org/training - Investing in training allows your team to
-    be as productive as possible as early as possible.  Now you can receive
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-    Ltd, and the world's leading authority on the world's leading RTOS.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and commercial middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-/*
- * This is a version of BlockQ.c that uses the alternative (Alt) API.
- *
- * Creates six tasks that operate on three queues as follows:
- *
- * The first two tasks send and receive an incrementing number to/from a queue.
- * One task acts as a producer and the other as the consumer.  The consumer is a
- * higher priority than the producer and is set to block on queue reads.  The queue
- * only has space for one item - as soon as the producer posts a message on the
- * queue the consumer will unblock, pre-empt the producer, and remove the item.
- *
- * The second two tasks work the other way around.  Again the queue used only has
- * enough space for one item.  This time the consumer has a lower priority than the
- * producer.  The producer will try to post on the queue blocking when the queue is
- * full.  When the consumer wakes it will remove the item from the queue, causing
- * the producer to unblock, pre-empt the consumer, and immediately re-fill the
- * queue.
- *
- * The last two tasks use the same queue producer and consumer functions.  This time the queue has
- * enough space for lots of items and the tasks operate at the same priority.  The
- * producer will execute, placing items into the queue.  The consumer will start
- * executing when either the queue becomes full (causing the producer to block) or
- * a context switch occurs (tasks of the same priority will time slice).
- *
- */
-
-
-#include <stdlib.h>
-
-/* Scheduler include files. */
-#include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
-
-/* Demo program include files. */
-#include "AltBlckQ.h"
-
-#define blckqSTACK_SIZE		configMINIMAL_STACK_SIZE
-#define blckqNUM_TASK_SETS	( 3 )
-
-/* Structure used to pass parameters to the blocking queue tasks. */
-typedef struct BLOCKING_QUEUE_PARAMETERS
-{
-	QueueHandle_t xQueue;					/*< The queue to be used by the task. */
-	TickType_t xBlockTime;				/*< The block time to use on queue reads/writes. */
-	volatile short *psCheckVariable;	/*< Incremented on each successful cycle to check the task is still running. */
-} xBlockingQueueParameters;
-
-/* Task function that creates an incrementing number and posts it on a queue. */
-static portTASK_FUNCTION_PROTO( vBlockingQueueProducer, pvParameters );
-
-/* Task function that removes the incrementing number from a queue and checks that
-it is the expected number. */
-static portTASK_FUNCTION_PROTO( vBlockingQueueConsumer, pvParameters );
-
-/* Variables which are incremented each time an item is removed from a queue, and
-found to be the expected value.
-These are used to check that the tasks are still running. */
-static volatile short sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };
-
-/* Variable which are incremented each time an item is posted on a queue.   These
-are used to check that the tasks are still running. */
-static volatile short sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };
-
-/*-----------------------------------------------------------*/
-
-void vStartAltBlockingQueueTasks( UBaseType_t uxPriority )
-{
-xBlockingQueueParameters *pxQueueParameters1, *pxQueueParameters2;
-xBlockingQueueParameters *pxQueueParameters3, *pxQueueParameters4;
-xBlockingQueueParameters *pxQueueParameters5, *pxQueueParameters6;
-const UBaseType_t uxQueueSize1 = 1, uxQueueSize5 = 5;
-const TickType_t xBlockTime = ( TickType_t ) 1000 / portTICK_PERIOD_MS;
-const TickType_t xDontBlock = ( TickType_t ) 0;
-
-	/* Create the first two tasks as described at the top of the file. */
-	
-	/* First create the structure used to pass parameters to the consumer tasks. */
-	pxQueueParameters1 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );
-
-	/* Create the queue used by the first two tasks to pass the incrementing number.
-	Pass a pointer to the queue in the parameter structure. */
-	pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( UBaseType_t ) sizeof( uint16_t ) );
-
-	/* The consumer is created first so gets a block time as described above. */
-	pxQueueParameters1->xBlockTime = xBlockTime;
-
-	/* Pass in the variable that this task is going to increment so we can check it
-	is still running. */
-	pxQueueParameters1->psCheckVariable = &( sBlockingConsumerCount[ 0 ] );
-		
-	/* Create the structure used to pass parameters to the producer task. */
-	pxQueueParameters2 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );
-
-	/* Pass the queue to this task also, using the parameter structure. */
-	pxQueueParameters2->xQueue = pxQueueParameters1->xQueue;
-
-	/* The producer is not going to block - as soon as it posts the consumer will
-	wake and remove the item so the producer should always have room to post. */
-	pxQueueParameters2->xBlockTime = xDontBlock;
-
-	/* Pass in the variable that this task is going to increment so we can check
-	it is still running. */
-	pxQueueParameters2->psCheckVariable = &( sBlockingProducerCount[ 0 ] );
-
-
-	/* Note the producer has a lower priority than the consumer when the tasks are
-	spawned. */
-	xTaskCreate( vBlockingQueueConsumer, "QConsB1", blckqSTACK_SIZE, ( void * ) pxQueueParameters1, uxPriority, NULL );
-	xTaskCreate( vBlockingQueueProducer, "QProdB2", blckqSTACK_SIZE, ( void * ) pxQueueParameters2, tskIDLE_PRIORITY, NULL );
-
-	
-
-	/* Create the second two tasks as described at the top of the file.   This uses
-	the same mechanism but reverses the task priorities. */
-
-	pxQueueParameters3 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );
-	pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( UBaseType_t ) sizeof( uint16_t ) );
-	pxQueueParameters3->xBlockTime = xDontBlock;
-	pxQueueParameters3->psCheckVariable = &( sBlockingProducerCount[ 1 ] );
-
-	pxQueueParameters4 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );
-	pxQueueParameters4->xQueue = pxQueueParameters3->xQueue;
-	pxQueueParameters4->xBlockTime = xBlockTime;
-	pxQueueParameters4->psCheckVariable = &( sBlockingConsumerCount[ 1 ] );
-
-	xTaskCreate( vBlockingQueueConsumer, "QProdB3", blckqSTACK_SIZE, ( void * ) pxQueueParameters3, tskIDLE_PRIORITY, NULL );
-	xTaskCreate( vBlockingQueueProducer, "QConsB4", blckqSTACK_SIZE, ( void * ) pxQueueParameters4, uxPriority, NULL );
-
-
-
-	/* Create the last two tasks as described above.  The mechanism is again just
-	the same.  This time both parameter structures are given a block time. */
-	pxQueueParameters5 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );
-	pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( UBaseType_t ) sizeof( uint16_t ) );
-	pxQueueParameters5->xBlockTime = xBlockTime;
-	pxQueueParameters5->psCheckVariable = &( sBlockingProducerCount[ 2 ] );
-
-	pxQueueParameters6 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );
-	pxQueueParameters6->xQueue = pxQueueParameters5->xQueue;
-	pxQueueParameters6->xBlockTime = xBlockTime;
-	pxQueueParameters6->psCheckVariable = &( sBlockingConsumerCount[ 2 ] );	
-
-	xTaskCreate( vBlockingQueueProducer, "QProdB5", blckqSTACK_SIZE, ( void * ) pxQueueParameters5, tskIDLE_PRIORITY, NULL );
-	xTaskCreate( vBlockingQueueConsumer, "QConsB6", blckqSTACK_SIZE, ( void * ) pxQueueParameters6, tskIDLE_PRIORITY, NULL );
-}
-/*-----------------------------------------------------------*/
-
-static portTASK_FUNCTION( vBlockingQueueProducer, pvParameters )
-{
-uint16_t usValue = 0;
-xBlockingQueueParameters *pxQueueParameters;
-short sErrorEverOccurred = pdFALSE;
-
-	#ifdef USE_STDIO
-	void vPrintDisplayMessage( const char * const * ppcMessageToSend );
-	
-		const char * const pcTaskStartMsg = "Alt blocking queue producer task started.\r\n";
-
-		/* Queue a message for printing to say the task has started. */
-		vPrintDisplayMessage( &pcTaskStartMsg );
-	#endif
-
-	pxQueueParameters = ( xBlockingQueueParameters * ) pvParameters;
-
-	for( ;; )
-	{		
-		if( xQueueAltSendToBack( pxQueueParameters->xQueue, ( void * ) &usValue, pxQueueParameters->xBlockTime ) != pdPASS )
-		{
-			sErrorEverOccurred = pdTRUE;
-		}
-		else
-		{
-			/* We have successfully posted a message, so increment the variable
-			used to check we are still running. */
-			if( sErrorEverOccurred == pdFALSE )
-			{
-				( *pxQueueParameters->psCheckVariable )++;
-			}
-
-			/* Increment the variable we are going to post next time round.  The
-			consumer will expect the numbers to	follow in numerical order. */
-			++usValue;
-		}
-	}
-}
-/*-----------------------------------------------------------*/
-
-static portTASK_FUNCTION( vBlockingQueueConsumer, pvParameters )
-{
-uint16_t usData, usExpectedValue = 0;
-xBlockingQueueParameters *pxQueueParameters;
-short sErrorEverOccurred = pdFALSE;
-
-	#ifdef USE_STDIO
-	void vPrintDisplayMessage( const char * const * ppcMessageToSend );
-	
-		const char * const pcTaskStartMsg = "Alt blocking queue consumer task started.\r\n";
-
-		/* Queue a message for printing to say the task has started. */
-		vPrintDisplayMessage( &pcTaskStartMsg );
-	#endif
-
-	pxQueueParameters = ( xBlockingQueueParameters * ) pvParameters;
-
-	for( ;; )
-	{	
-		if( xQueueAltReceive( pxQueueParameters->xQueue, &usData, pxQueueParameters->xBlockTime ) == pdPASS )
-		{
-			if( usData != usExpectedValue )
-			{
-				/* Catch-up. */
-				usExpectedValue = usData;
-
-				sErrorEverOccurred = pdTRUE;
-			}
-			else
-			{
-				/* We have successfully received a message, so increment the
-				variable used to check we are still running. */	
-				if( sErrorEverOccurred == pdFALSE )
-				{
-					( *pxQueueParameters->psCheckVariable )++;
-				}
-							
-				/* Increment the value we expect to remove from the queue next time
-				round. */
-				++usExpectedValue;
-			}			
-		}		
-	}
-}
-/*-----------------------------------------------------------*/
-
-/* This is called to check that all the created tasks are still running. */
-BaseType_t xAreAltBlockingQueuesStillRunning( void )
-{
-static short sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };
-static short sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };
-BaseType_t xReturn = pdPASS, xTasks;
-
-	/* Not too worried about mutual exclusion on these variables as they are 16
-	bits and we are only reading them. We also only care to see if they have
-	changed or not.
-	
-	Loop through each check variable to and return pdFALSE if any are found not
-	to have changed since the last call. */
-
-	for( xTasks = 0; xTasks < blckqNUM_TASK_SETS; xTasks++ )
-	{
-		if( sBlockingConsumerCount[ xTasks ] == sLastBlockingConsumerCount[ xTasks ]  )
-		{
-			xReturn = pdFALSE;
-		}
-		sLastBlockingConsumerCount[ xTasks ] = sBlockingConsumerCount[ xTasks ];
-
-
-		if( sBlockingProducerCount[ xTasks ] == sLastBlockingProducerCount[ xTasks ]  )
-		{
-			xReturn = pdFALSE;
-		}
-		sLastBlockingProducerCount[ xTasks ] = sBlockingProducerCount[ xTasks ];
-	}
-
-	return xReturn;
-}
-

FreeRTOS/Demo/Common/Minimal/AltPollQ.c

@@ -1,279 +0,0 @@
-/*
-    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
-
-    ***************************************************************************
-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
-    >>!   distribute a combined work that includes FreeRTOS without being   !<<
-    >>!   obliged to provide the source code for proprietary components     !<<
-    >>!   outside of the FreeRTOS kernel.                                   !<<
-    ***************************************************************************
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
-    link: http://www.freertos.org/a00114.html
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that is more than just the market leader, it     *
-     *    is the industry's de facto standard.                               *
-     *                                                                       *
-     *    Help yourself get started quickly while simultaneously helping     *
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
-     *    tutorial book, reference manual, or both:                          *
-     *    http://www.FreeRTOS.org/Documentation                              *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-    the FAQ page "My application does not run, what could be wrong?".  Have you
-    defined configASSERT()?
-
-    http://www.FreeRTOS.org/support - In return for receiving this top quality
-    embedded software for free we request you assist our global community by
-    participating in the support forum.
-
-    http://www.FreeRTOS.org/training - Investing in training allows your team to
-    be as productive as possible as early as possible.  Now you can receive
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-    Ltd, and the world's leading authority on the world's leading RTOS.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and commercial middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-/*
- * This is a version of PollQ.c that uses the alternative (Alt) API.
- * 
- * Creates two tasks that communicate over a single queue.  One task acts as a
- * producer, the other a consumer.
- *
- * The producer loops for three iteration, posting an incrementing number onto the
- * queue each cycle.  It then delays for a fixed period before doing exactly the
- * same again.
- *
- * The consumer loops emptying the queue.  Each item removed from the queue is
- * checked to ensure it contains the expected value.  When the queue is empty it
- * blocks for a fixed period, then does the same again.
- *
- * All queue access is performed without blocking.  The consumer completely empties
- * the queue each time it runs so the producer should never find the queue full.
- *
- * An error is flagged if the consumer obtains an unexpected value or the producer
- * find the queue is full.
- */
-
-/*
-Changes from V2.0.0
-
-	+ Delay periods are now specified using variables and constants of
-	  TickType_t rather than uint32_t.
-*/
-
-#include <stdlib.h>
-
-/* Scheduler include files. */
-#include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
-
-/* Demo program include files. */
-#include "AltPollQ.h"
-
-#define pollqSTACK_SIZE			configMINIMAL_STACK_SIZE
-#define pollqQUEUE_SIZE			( 10 )
-#define pollqPRODUCER_DELAY		( ( TickType_t ) 200 / portTICK_PERIOD_MS )
-#define pollqCONSUMER_DELAY		( pollqPRODUCER_DELAY - ( TickType_t ) ( 20 / portTICK_PERIOD_MS ) )
-#define pollqNO_DELAY			( ( TickType_t ) 0 )
-#define pollqVALUES_TO_PRODUCE	( ( BaseType_t ) 3 )
-#define pollqINITIAL_VALUE		( ( BaseType_t ) 0 )
-
-/* The task that posts the incrementing number onto the queue. */
-static portTASK_FUNCTION_PROTO( vPolledQueueProducer, pvParameters );
-
-/* The task that empties the queue. */
-static portTASK_FUNCTION_PROTO( vPolledQueueConsumer, pvParameters );
-
-/* Variables that are used to check that the tasks are still running with no
-errors. */
-static volatile BaseType_t xPollingConsumerCount = pollqINITIAL_VALUE, xPollingProducerCount = pollqINITIAL_VALUE;
-
-/*-----------------------------------------------------------*/
-
-void vStartAltPolledQueueTasks( UBaseType_t uxPriority )
-{
-static QueueHandle_t xPolledQueue;
-
-	/* Create the queue used by the producer and consumer. */
-	xPolledQueue = xQueueCreate( pollqQUEUE_SIZE, ( UBaseType_t ) sizeof( uint16_t ) );
-
-	/* vQueueAddToRegistry() adds the queue to the queue registry, if one is
-	in use.  The queue registry is provided as a means for kernel aware 
-	debuggers to locate queues and has no purpose if a kernel aware debugger
-	is not being used.  The call to vQueueAddToRegistry() will be removed
-	by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is 
-	defined to be less than 1. */
-	vQueueAddToRegistry( xPolledQueue, "AltPollQueue" );
-
-
-	/* Spawn the producer and consumer. */
-	xTaskCreate( vPolledQueueConsumer, "QConsNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( TaskHandle_t * ) NULL );
-	xTaskCreate( vPolledQueueProducer, "QProdNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( TaskHandle_t * ) NULL );
-}
-/*-----------------------------------------------------------*/
-
-static portTASK_FUNCTION( vPolledQueueProducer, pvParameters )
-{
-uint16_t usValue = ( uint16_t ) 0;
-BaseType_t xError = pdFALSE, xLoop;
-
-	#ifdef USE_STDIO
-	void vPrintDisplayMessage( const char * const * ppcMessageToSend );
-	
-		const char * const pcTaskStartMsg = "Alt polling queue producer task started.\r\n";
-
-		/* Queue a message for printing to say the task has started. */
-		vPrintDisplayMessage( &pcTaskStartMsg );
-	#endif
-
-	for( ;; )
-	{		
-		for( xLoop = 0; xLoop < pollqVALUES_TO_PRODUCE; xLoop++ )
-		{
-			/* Send an incrementing number on the queue without blocking. */
-			if( xQueueAltSendToBack( *( ( QueueHandle_t * ) pvParameters ), ( void * ) &usValue, pollqNO_DELAY ) != pdPASS )
-			{
-				/* We should never find the queue full so if we get here there
-				has been an error. */
-				xError = pdTRUE;
-			}
-			else
-			{
-				if( xError == pdFALSE )
-				{
-					/* If an error has ever been recorded we stop incrementing the
-					check variable. */
-					portENTER_CRITICAL();
-						xPollingProducerCount++;
-					portEXIT_CRITICAL();
-				}
-
-				/* Update the value we are going to post next time around. */
-				usValue++;
-			}
-		}
-
-		/* Wait before we start posting again to ensure the consumer runs and
-		empties the queue. */
-		vTaskDelay( pollqPRODUCER_DELAY );
-	}
-}  /*lint !e818 Function prototype must conform to API. */
-/*-----------------------------------------------------------*/
-
-static portTASK_FUNCTION( vPolledQueueConsumer, pvParameters )
-{
-uint16_t usData, usExpectedValue = ( uint16_t ) 0;
-BaseType_t xError = pdFALSE;
-
-	#ifdef USE_STDIO
-	void vPrintDisplayMessage( const char * const * ppcMessageToSend );
-	
-		const char * const pcTaskStartMsg = "Alt blocking queue consumer task started.\r\n";
-
-		/* Queue a message for printing to say the task has started. */
-		vPrintDisplayMessage( &pcTaskStartMsg );
-	#endif
-
-	for( ;; )
-	{		
-		/* Loop until the queue is empty. */
-		while( uxQueueMessagesWaiting( *( ( QueueHandle_t * ) pvParameters ) ) )
-		{
-			if( xQueueAltReceive( *( ( QueueHandle_t * ) pvParameters ), &usData, pollqNO_DELAY ) == pdPASS )
-			{
-				if( usData != usExpectedValue )
-				{
-					/* This is not what we expected to receive so an error has
-					occurred. */
-					xError = pdTRUE;
-
-					/* Catch-up to the value we received so our next expected
-					value should again be correct. */
-					usExpectedValue = usData;
-				}
-				else
-				{
-					if( xError == pdFALSE )
-					{
-						/* Only increment the check variable if no errors have
-						occurred. */
-						portENTER_CRITICAL();
-							xPollingConsumerCount++;
-						portEXIT_CRITICAL();
-					}
-				}
-
-				/* Next time round we would expect the number to be one higher. */
-				usExpectedValue++;
-			}
-		}
-
-		/* Now the queue is empty we block, allowing the producer to place more
-		items in the queue. */
-		vTaskDelay( pollqCONSUMER_DELAY );
-	}
-} /*lint !e818 Function prototype must conform to API. */
-/*-----------------------------------------------------------*/
-
-/* This is called to check that all the created tasks are still running with no errors. */
-BaseType_t xAreAltPollingQueuesStillRunning( void )
-{
-BaseType_t xReturn;
-
-	/* Check both the consumer and producer poll count to check they have both
-	been changed since out last trip round.  We do not need a critical section
-	around the check variables as this is called from a higher priority than
-	the other tasks that access the same variables. */
-	if( ( xPollingConsumerCount == pollqINITIAL_VALUE ) ||
-		( xPollingProducerCount == pollqINITIAL_VALUE )
-	  )
-	{
-		xReturn = pdFALSE;
-	}
-	else
-	{
-		xReturn = pdTRUE;
-	}
-
-	/* Set the check variables back down so we know if they have been
-	incremented the next time around. */
-	xPollingConsumerCount = pollqINITIAL_VALUE;
-	xPollingProducerCount = pollqINITIAL_VALUE;
-
-	return xReturn;
-}

FreeRTOS/Demo/Common/Minimal/blocktim.c

@@ -102,7 +102,7 @@
 /*-----------------------------------------------------------*/
 
 /*
- * The two test tasks.  Their behaviour is commented within the files.
+ * The two test tasks.  Their behaviour is commented within the functions.
  */
 static void vPrimaryBlockTimeTestTask( void *pvParameters );
 static void vSecondaryBlockTimeTestTask( void *pvParameters );
@@ -420,7 +420,7 @@ BaseType_t xData;
 		/*********************************************************************
 		Test 0, 1 and 2
 
-		This task does does not participate in these tests. */
+		This task does not participate in these tests. */
 		vTaskSuspend( NULL );
 
 		/*********************************************************************

FreeRTOS/Demo/Common/Minimal/readme.txt

@@ -0,0 +1,2 @@
+This directory contains the implementation of the "common demo tasks".  These
+are test tasks and demo tasks that are used by nearly all the demo applications.

FreeRTOS/Demo/Common/include/AbortDelay.h

@@ -67,11 +67,11 @@
     1 tab == 4 spaces!
 */
 
-#ifndef ALT_POLLED_Q_H
-#define ALT_POLLED_Q_H
+#ifndef ABORT_DELAY_H
+#define ABORT_DELAY_H
 
-void vStartAltPolledQueueTasks( UBaseType_t uxPriority );
-BaseType_t xAreAltPollingQueuesStillRunning( void );
+void vCreateAbortDelayTasks( void );
+BaseType_t xAreAbortDelayTestTasksStillRunning( void );
 
 #endif
 

FreeRTOS/Demo/Common/include/AltBlckQ.h

@@ -1,78 +0,0 @@
-/*
-    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
-
-    ***************************************************************************
-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
-    >>!   distribute a combined work that includes FreeRTOS without being   !<<
-    >>!   obliged to provide the source code for proprietary components     !<<
-    >>!   outside of the FreeRTOS kernel.                                   !<<
-    ***************************************************************************
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
-    link: http://www.freertos.org/a00114.html
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that is more than just the market leader, it     *
-     *    is the industry's de facto standard.                               *
-     *                                                                       *
-     *    Help yourself get started quickly while simultaneously helping     *
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
-     *    tutorial book, reference manual, or both:                          *
-     *    http://www.FreeRTOS.org/Documentation                              *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-    the FAQ page "My application does not run, what could be wrong?".  Have you
-    defined configASSERT()?
-
-    http://www.FreeRTOS.org/support - In return for receiving this top quality
-    embedded software for free we request you assist our global community by
-    participating in the support forum.
-
-    http://www.FreeRTOS.org/training - Investing in training allows your team to
-    be as productive as possible as early as possible.  Now you can receive
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-    Ltd, and the world's leading authority on the world's leading RTOS.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and commercial middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-#ifndef ALT_BLOCK_Q_H
-#define ALT_BLOCK_Q_H
-
-void vStartAltBlockingQueueTasks( UBaseType_t uxPriority );
-BaseType_t xAreAltBlockingQueuesStillRunning( void );
-
-#endif
-
-

FreeRTOS/Demo/Common/include/AltBlock.h

@@ -1,78 +0,0 @@
-/*
-    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
-
-    ***************************************************************************
-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
-    >>!   distribute a combined work that includes FreeRTOS without being   !<<
-    >>!   obliged to provide the source code for proprietary components     !<<
-    >>!   outside of the FreeRTOS kernel.                                   !<<
-    ***************************************************************************
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
-    link: http://www.freertos.org/a00114.html
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that is more than just the market leader, it     *
-     *    is the industry's de facto standard.                               *
-     *                                                                       *
-     *    Help yourself get started quickly while simultaneously helping     *
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
-     *    tutorial book, reference manual, or both:                          *
-     *    http://www.FreeRTOS.org/Documentation                              *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-    the FAQ page "My application does not run, what could be wrong?".  Have you
-    defined configASSERT()?
-
-    http://www.FreeRTOS.org/support - In return for receiving this top quality
-    embedded software for free we request you assist our global community by
-    participating in the support forum.
-
-    http://www.FreeRTOS.org/training - Investing in training allows your team to
-    be as productive as possible as early as possible.  Now you can receive
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-    Ltd, and the world's leading authority on the world's leading RTOS.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and commercial middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-#ifndef FAST_BLOCK_TIME_TEST_H
-#define FAST_BLOCK_TIME_TEST_H
-
-void vCreateAltBlockTimeTasks( void );
-BaseType_t xAreAltBlockTimeTestTasksStillRunning( void );
-
-#endif
-
-

FreeRTOS/Demo/Common/include/AltQTest.h

@@ -1,79 +0,0 @@
-/*
-    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.
-    All rights reserved
-
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
-
-    This file is part of the FreeRTOS distribution.
-
-    FreeRTOS is free software; you can redistribute it and/or modify it under
-    the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
-
-    ***************************************************************************
-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<
-    >>!   distribute a combined work that includes FreeRTOS without being   !<<
-    >>!   obliged to provide the source code for proprietary components     !<<
-    >>!   outside of the FreeRTOS kernel.                                   !<<
-    ***************************************************************************
-
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following
-    link: http://www.freertos.org/a00114.html
-
-    ***************************************************************************
-     *                                                                       *
-     *    FreeRTOS provides completely free yet professionally developed,    *
-     *    robust, strictly quality controlled, supported, and cross          *
-     *    platform software that is more than just the market leader, it     *
-     *    is the industry's de facto standard.                               *
-     *                                                                       *
-     *    Help yourself get started quickly while simultaneously helping     *
-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *
-     *    tutorial book, reference manual, or both:                          *
-     *    http://www.FreeRTOS.org/Documentation                              *
-     *                                                                       *
-    ***************************************************************************
-
-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-    the FAQ page "My application does not run, what could be wrong?".  Have you
-    defined configASSERT()?
-
-    http://www.FreeRTOS.org/support - In return for receiving this top quality
-    embedded software for free we request you assist our global community by
-    participating in the support forum.
-
-    http://www.FreeRTOS.org/training - Investing in training allows your team to
-    be as productive as possible as early as possible.  Now you can receive
-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-    Ltd, and the world's leading authority on the world's leading RTOS.
-
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.
-
-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
-
-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
-    licenses offer ticketed support, indemnification and commercial middleware.
-
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety
-    engineered and independently SIL3 certified version for use in safety and
-    mission critical applications that require provable dependability.
-
-    1 tab == 4 spaces!
-*/
-
-#ifndef FAST_GEN_Q_TEST_H
-#define FAST_GEN_Q_TEST_H
-
-void vStartAltGenericQueueTasks( UBaseType_t uxPriority );
-BaseType_t xAreAltGenericQueueTasksStillRunning( void );
-
-#endif /* GEN_Q_TEST_H */
-
-
-

FreeRTOS/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h

@@ -104,7 +104,7 @@
 #define configUSE_MALLOC_FAILED_HOOK	1
 #define configUSE_APPLICATION_TASK_TAG	0
 #define configUSE_COUNTING_SEMAPHORES	1
-#define configUSE_ALTERNATIVE_API		1
+#define configUSE_ALTERNATIVE_API		0
 
 #define configUSE_TIMERS				1
 #define configTIMER_TASK_PRIORITY		2
@@ -134,7 +134,7 @@ to exclude the API function. */
 
 /* This demo makes use of one or more example stats formatting functions.  These
 format the raw data provided by the xTaskGetSystemState() function in to human
-readable ASCII form.  See the notes in the implementation of vTaskList() within 
+readable ASCII form.  See the notes in the implementation of vTaskList() within
 FreeRTOS/Source/tasks.c for limitations. */
 #define configINCLUDE_STATS_FORMATTING_FUNCTIONS	1
 

FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h

@@ -89,7 +89,7 @@
 #define configUSE_DAEMON_TASK_STARTUP_HOOK		1
 #define configTICK_RATE_HZ						( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
 #define configMINIMAL_STACK_SIZE				( ( unsigned short ) 50 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
-#define configTOTAL_HEAP_SIZE					( ( size_t ) ( 24 * 1024 ) )
+#define configTOTAL_HEAP_SIZE					( ( size_t ) ( 30 * 1024 ) )
 #define configMAX_TASK_NAME_LEN					( 12 )
 #define configUSE_TRACE_FACILITY				1
 #define configUSE_16_BIT_TICKS					0
@@ -101,7 +101,7 @@
 #define configUSE_MALLOC_FAILED_HOOK			1
 #define configUSE_APPLICATION_TASK_TAG			1
 #define configUSE_COUNTING_SEMAPHORES			1
-#define configUSE_ALTERNATIVE_API				1
+#define configUSE_ALTERNATIVE_API				0
 #define configUSE_QUEUE_SETS					1
 #define configUSE_TASK_NOTIFICATIONS			1
 #define configSUPPORT_STATIC_ALLOCATION			1
@@ -150,6 +150,7 @@ functions anyway. */
 #define INCLUDE_eTaskGetState					1
 #define INCLUDE_xSemaphoreGetMutexHolder		1
 #define INCLUDE_xTimerPendFunctionCall			1
+#define INCLUDE_xTaskAbortDelay					1
 
 /* It is a good idea to define configASSERT() while developing.  configASSERT()
 uses the same semantics as the standard C assert() macro. */

FreeRTOS/Demo/WIN32-MSVC/Trace_Recorder_Configuration/trcConfig.h

@@ -168,13 +168,13 @@
  * check the actual usage by selecting View menu -> Trace Details ->
  * Resource Usage -> Object Table.
  ******************************************************************************/
-#define NTask			100
-#define NISR			60
-#define NQueue			60
-#define NSemaphore		60
-#define NMutex			60
-#define NTimer			200
-#define NEventGroup		60
+#define NTask			150
+#define NISR			90
+#define NQueue			90
+#define NSemaphore		90
+#define NMutex			90
+#define NTimer			300
+#define NEventGroup		90
 
 /******************************************************************************
  * INCLUDE_MEMMANG_EVENTS

FreeRTOS/Demo/WIN32-MSVC/WIN32.sln

@@ -1,16 +1,21 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WIN32", "WIN32.vcxproj", "{C686325E-3261-42F7-AEB1-DDE5280E1CEB}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RTOSDemo", "WIN32.vcxproj", "{C686325E-3261-42F7-AEB1-DDE5280E1CEB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Optimised|Win32 = Optimised|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|Win32.Build.0 = Debug|Win32
+		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Optimised|Win32.ActiveCfg = Optimised|Win32
+		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Optimised|Win32.Build.0 = Optimised|Win32
 		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|Win32.ActiveCfg = Release|Win32
 		{C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection

FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Optimised|Win32">
+      <Configuration>Optimised</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -19,11 +23,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -36,12 +48,19 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">.\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -81,6 +100,49 @@
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/WIN32.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/WIN32.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-Trace\Include;.\Trace_Recorder_Configuration;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/WIN32.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <AdditionalOptions>/wd4210 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0c09</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>.\Debug/RTOSDemo.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/WIN32.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,6 +196,7 @@
     <ClCompile Include="..\..\Source\event_groups.c" />
     <ClCompile Include="..\..\Source\portable\MemMang\heap_5.c" />
     <ClCompile Include="..\..\Source\timers.c" />
+    <ClCompile Include="..\Common\Minimal\AbortDelay.c" />
     <ClCompile Include="..\Common\Minimal\BlockQ.c" />
     <ClCompile Include="..\Common\Minimal\blocktim.c" />
     <ClCompile Include="..\Common\Minimal\countsem.c" />
@@ -156,27 +219,37 @@
     <ClCompile Include="..\Common\Minimal\timerdemo.c" />
     <ClCompile Include="main.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\Source\list.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\Source\portable\MSVC-MingW\port.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\Source\queue.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\Source\tasks.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Optimised|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="main_blinky.c" />

FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters

@@ -151,6 +151,9 @@
     <ClCompile Include="..\Common\Minimal\StaticAllocation.c">
       <Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>
     </ClCompile>
+    <ClCompile Include="..\Common\Minimal\AbortDelay.c">
+      <Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FreeRTOSConfig.h">

FreeRTOS/Demo/WIN32-MSVC/main.c

@@ -118,9 +118,9 @@ that make up the total heap.  heap_5 is only used for test and example purposes
 as this demo could easily create one large heap region instead of multiple
 smaller heap regions - in which case heap_4.c would be the more appropriate
 choice.  See http://www.freertos.org/a00111.html for an explanation. */
-#define mainREGION_1_SIZE	4001
+#define mainREGION_1_SIZE	7001
 #define mainREGION_2_SIZE	18105
-#define mainREGION_3_SIZE	1807
+#define mainREGION_3_SIZE	2807
 
 /*-----------------------------------------------------------*/
 
@@ -175,7 +175,7 @@ StackType_t uxTimerTaskStack[ configTIMER_TASK_STACK_DEPTH ];
 /* The user trace event posted to the trace recording on each tick interrupt.
 Note:  This project runs under Windows, and Windows will not be executing the
 RTOS threads continuously.  Therefore tick events will not appear with a regular
-interval within the the trace recording. */
+interval within the trace recording. */
 traceLabel xTickTraceUserEvent;
 static portBASE_TYPE xTraceRunning = pdTRUE;
 

FreeRTOS/Demo/WIN32-MSVC/main_full.c

@@ -136,6 +136,8 @@
 #include "TaskNotify.h"
 #include "QueueSetPolling.h"
 #include "StaticAllocation.h"
+#include "blocktim.h"
+#include "AbortDelay.h"
 
 /* Priorities at which the tasks are created. */
 #define mainCHECK_TASK_PRIORITY			( configMAX_PRIORITIES - 2 )
@@ -181,6 +183,12 @@ static void prvPendedFunction( void *pvParameter1, uint32_t ulParameter2 );
  */
 static void prvDemoQueueSpaceFunctions( void *pvParameters );
 
+/*
+ * Tasks that ensure indefinite delays are truly indefinite.
+ */
+static void prvPermanentlyBlockingSemaphoreTask( void *pvParameters );
+static void prvPermanentlyBlockingNotificationTask( void *pvParameters );
+
 /*-----------------------------------------------------------*/
 
 /* The variable into which error messages are latched. */
@@ -214,7 +222,11 @@ int main_full( void )
 	vStartEventGroupTasks();
 	vStartInterruptSemaphoreTasks();
 	vStartQueueSetPollingTask();
+	vCreateBlockTimeTasks();
+	vCreateAbortDelayTasks();
 	xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
+	xTaskCreate( prvPermanentlyBlockingSemaphoreTask, "BlockSem", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
+	xTaskCreate( prvPermanentlyBlockingNotificationTask, "BlockNoti", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
 
 	#if( configSUPPORT_STATIC_ALLOCATION == 1 )
 	{
@@ -242,9 +254,9 @@ int main_full( void )
 	/* Start the scheduler itself. */
 	vTaskStartScheduler();
 
-    /* Should never get here unless there was not enough heap space to create
+	/* Should never get here unless there was not enough heap space to create
 	the idle and other system tasks. */
-    return 0;
+	return 0;
 }
 /*-----------------------------------------------------------*/
 
@@ -344,6 +356,14 @@ const TickType_t xCycleFrequency = pdMS_TO_TICKS( 2500UL );
 		{
 			pcStatusMessage = "Error: Queue set polling";
 		}
+		else if( xAreBlockTimeTestTasksStillRunning() != pdPASS )
+		{
+			pcStatusMessage = "Error: Block time";
+		}
+		else if( xAreAbortDelayTestTasksStillRunning() != pdPASS )
+		{
+			pcStatusMessage = "Error: Abort delay";
+		}
 
 		#if( configSUPPORT_STATIC_ALLOCATION == 1 )
 			else if( xAreStaticAllocationTasksStillRunning() != pdPASS )
@@ -671,5 +691,35 @@ unsigned portBASE_TYPE uxReturn, x;
 		#endif
 	}
 }
+/*-----------------------------------------------------------*/
+
+static void prvPermanentlyBlockingSemaphoreTask( void *pvParameters )
+{
+SemaphoreHandle_t xSemaphore;
+
+	/* This task should block on a semaphore, and never return. */
+	xSemaphore = xSemaphoreCreateBinary();
+	configASSERT( xSemaphore );
+
+	xSemaphoreTake( xSemaphore, portMAX_DELAY );
+
+	/* The above xSemaphoreTake() call should never return, force an assert if
+	it does. */
+	configASSERT( pvParameters != NULL );
+	vTaskDelete( NULL );
+}
+/*-----------------------------------------------------------*/
+
+static void prvPermanentlyBlockingNotificationTask( void *pvParameters )
+{
+	/* This task should block on a task notification, and never return. */
+	ulTaskNotifyTake( pdTRUE, portMAX_DELAY );
+
+	/* The above ulTaskNotifyTake() call should never return, force an assert
+	if it does. */
+	configASSERT( pvParameters != NULL );
+	vTaskDelete( NULL );
+}
+
 
 

FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h

@@ -99,7 +99,7 @@
 #define configUSE_MALLOC_FAILED_HOOK			1
 #define configUSE_APPLICATION_TASK_TAG			1
 #define configUSE_COUNTING_SEMAPHORES			1
-#define configUSE_ALTERNATIVE_API				1
+#define configUSE_ALTERNATIVE_API				0
 #define configUSE_QUEUE_SETS					1
 #define configUSE_TASK_NOTIFICATIONS			1
 

FreeRTOS/Source/event_groups.c

@@ -126,7 +126,7 @@ typedef struct xEventGroupDefinition
  * wait condition is met if any of the bits set in uxBitsToWait for are also set
  * in uxCurrentEventBits.
  */
-static BaseType_t prvTestWaitCondition( const EventBits_t uxCurrentEventBits, const EventBits_t uxBitsToWaitFor, const BaseType_t xWaitForAllBits );
+static BaseType_t prvTestWaitCondition( const EventBits_t uxCurrentEventBits, const EventBits_t uxBitsToWaitFor, const BaseType_t xWaitForAllBits ) PRIVILEGED_FUNCTION;
 
 /*-----------------------------------------------------------*/
 

FreeRTOS/Source/include/FreeRTOS.h

@@ -839,6 +839,10 @@ V8 if desired. */
 	#define xList List_t
 #endif /* configENABLE_BACKWARD_COMPATIBILITY */
 
+#if( configUSE_ALTERNATIVE_API != 0 )
+	#error The alternative API was deprecated some time ago, and was removed in FreeRTOS V9.0 0
+#endif
+
 /* Set configUSE_TASK_FPU_SUPPORT to 0 to omit floating point support even
 if floating point hardware is otherwise supported by the FreeRTOS port in use.
 This constant is not supported by all FreeRTOS ports that include floating

FreeRTOS/Source/include/event_groups.h

@@ -725,7 +725,7 @@ void vEventGroupClearBitsCallback( void *pvEventGroup, const uint32_t ulBitsToCl
  * Generic version of the event group creation function, which is in turn called
  * by the event group creation macros.
  */
-EventGroupHandle_t xEventGroupGenericCreate( StaticEventGroup_t *pxStaticEventGroup );
+EventGroupHandle_t xEventGroupGenericCreate( StaticEventGroup_t *pxStaticEventGroup ) PRIVILEGED_FUNCTION;
 
 #if (configUSE_TRACE_FACILITY == 1)
 	UBaseType_t uxEventGroupGetNumber( void* xEventGroup ) PRIVILEGED_FUNCTION;

FreeRTOS/Source/include/mpu_wrappers.h

@@ -113,8 +113,6 @@ only for ports that are using the MPU. */
 		#define xQueueTakeMutexRecursive		MPU_xQueueTakeMutexRecursive
 		#define xQueueCreateCountingSemaphore	MPU_xQueueCreateCountingSemaphore
 		#define xQueueGenericSend				MPU_xQueueGenericSend
-		#define xQueueAltGenericSend			MPU_xQueueAltGenericSend
-		#define xQueueAltGenericReceive			MPU_xQueueAltGenericReceive
 		#define xQueueGenericReceive			MPU_xQueueGenericReceive
 		#define uxQueueMessagesWaiting			MPU_uxQueueMessagesWaiting
 		#define vQueueDelete					MPU_vQueueDelete
@@ -124,7 +122,6 @@ only for ports that are using the MPU. */
 		#define xQueueAddToSet					MPU_xQueueAddToSet
 		#define xQueueRemoveFromSet				MPU_xQueueRemoveFromSet
 		#define xQueueGetMutexHolder			MPU_xQueueGetMutexHolder
-		#define xQueueGetMutexHolder			MPU_xQueueGetMutexHolder
 
 		#define pvPortMalloc					MPU_pvPortMalloc
 		#define vPortFree						MPU_vPortFree

FreeRTOS/Source/include/queue.h

@@ -1543,28 +1543,6 @@ BaseType_t xQueueIsQueueEmptyFromISR( const QueueHandle_t xQueue ) PRIVILEGED_FU
 BaseType_t xQueueIsQueueFullFromISR( const QueueHandle_t xQueue ) PRIVILEGED_FUNCTION;
 UBaseType_t uxQueueMessagesWaitingFromISR( const QueueHandle_t xQueue ) PRIVILEGED_FUNCTION;
 
-
-/*
- * xQueueAltGenericSend() is an alternative version of xQueueGenericSend().
- * Likewise xQueueAltGenericReceive() is an alternative version of
- * xQueueGenericReceive().
- *
- * The source code that implements the alternative (Alt) API is much
- * simpler	because it executes everything from within a critical section.
- * This is	the approach taken by many other RTOSes, but FreeRTOS.org has the
- * preferred fully featured API too.  The fully featured API has more
- * complex	code that takes longer to execute, but makes much less use of
- * critical sections.  Therefore the alternative API sacrifices interrupt
- * responsiveness to gain execution speed, whereas the fully featured API
- * sacrifices execution speed to ensure better interrupt responsiveness.
- */
-BaseType_t xQueueAltGenericSend( QueueHandle_t xQueue, const void * const pvItemToQueue, TickType_t xTicksToWait, BaseType_t xCopyPosition ) PRIVILEGED_FUNCTION;
-BaseType_t xQueueAltGenericReceive( QueueHandle_t xQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking ) PRIVILEGED_FUNCTION;
-#define xQueueAltSendToFront( xQueue, pvItemToQueue, xTicksToWait ) xQueueAltGenericSend( ( xQueue ), ( pvItemToQueue ), ( xTicksToWait ), queueSEND_TO_FRONT )
-#define xQueueAltSendToBack( xQueue, pvItemToQueue, xTicksToWait ) xQueueAltGenericSend( ( xQueue ), ( pvItemToQueue ), ( xTicksToWait ), queueSEND_TO_BACK )
-#define xQueueAltReceive( xQueue, pvBuffer, xTicksToWait ) xQueueAltGenericReceive( ( xQueue ), ( pvBuffer ), ( xTicksToWait ), pdFALSE )
-#define xQueueAltPeek( xQueue, pvBuffer, xTicksToWait ) xQueueAltGenericReceive( ( xQueue ), ( pvBuffer ), ( xTicksToWait ), pdTRUE )
-
 /*
  * The functions defined above are for passing data to and from tasks.  The
  * functions below are the equivalents for passing data to and from
@@ -1653,7 +1631,7 @@ BaseType_t xQueueGiveMutexRecursive( QueueHandle_t pxMutex ) PRIVILEGED_FUNCTION
  * returned.
  */
 #if( configQUEUE_REGISTRY_SIZE > 0 )
-	const char *pcQueueGetQueueName( QueueHandle_t xQueue ); /*lint !e971 Unqualified char types are allowed for strings and single characters only. */
+	const char *pcQueueGetQueueName( QueueHandle_t xQueue ) PRIVILEGED_FUNCTION; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */
 #endif
 
 /*

FreeRTOS/Source/include/semphr.h

@@ -430,21 +430,6 @@ typedef QueueHandle_t SemaphoreHandle_t;
  */
 #define xSemaphoreTakeRecursive( xMutex, xBlockTime )	xQueueTakeMutexRecursive( ( xMutex ), ( xBlockTime ) )
 
-
-/*
- * xSemaphoreAltTake() is an alternative version of xSemaphoreTake().
- *
- * The source code that implements the alternative (Alt) API is much
- * simpler	because it executes everything from within a critical section.
- * This is	the approach taken by many other RTOSes, but FreeRTOS.org has the
- * preferred fully featured API too.  The fully featured API has more
- * complex	code that takes longer to execute, but makes much less use of
- * critical sections.  Therefore the alternative API sacrifices interrupt
- * responsiveness to gain execution speed, whereas the fully featured API
- * sacrifices execution speed to ensure better interrupt responsiveness.
- */
-#define xSemaphoreAltTake( xSemaphore, xBlockTime )		xQueueAltGenericReceive( ( QueueHandle_t ) ( xSemaphore ), NULL, ( xBlockTime ), pdFALSE )
-
 /**
  * semphr. h
  * <pre>xSemaphoreGive( SemaphoreHandle_t xSemaphore )</pre>
@@ -592,20 +577,6 @@ typedef QueueHandle_t SemaphoreHandle_t;
  */
 #define xSemaphoreGiveRecursive( xMutex )	xQueueGiveMutexRecursive( ( xMutex ) )
 
-/*
- * xSemaphoreAltGive() is an alternative version of xSemaphoreGive().
- *
- * The source code that implements the alternative (Alt) API is much
- * simpler	because it executes everything from within a critical section.
- * This is	the approach taken by many other RTOSes, but FreeRTOS.org has the
- * preferred fully featured API too.  The fully featured API has more
- * complex	code that takes longer to execute, but makes much less use of
- * critical sections.  Therefore the alternative API sacrifices interrupt
- * responsiveness to gain execution speed, whereas the fully featured API
- * sacrifices execution speed to ensure better interrupt responsiveness.
- */
-#define xSemaphoreAltGive( xSemaphore )		xQueueAltGenericSend( ( QueueHandle_t ) ( xSemaphore ), NULL, semGIVE_BLOCK_TIME, queueSEND_TO_BACK )
-
 /**
  * semphr. h
  * <pre>

FreeRTOS/Source/include/task.h

@@ -767,7 +767,7 @@ void vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, const TickType_t xT
  * \defgroup xTaskAbortDelay xTaskAbortDelay
  * \ingroup TaskCtrl
  */
-BaseType_t xTaskAbortDelay( TaskHandle_t xTask );
+BaseType_t xTaskAbortDelay( TaskHandle_t xTask ) PRIVILEGED_FUNCTION;
 
 /**
  * task. h
@@ -896,7 +896,7 @@ eTaskState eTaskGetState( TaskHandle_t xTask ) PRIVILEGED_FUNCTION;
  * \defgroup vTaskGetTaskInfo vTaskGetTaskInfo
  * \ingroup TaskCtrl
  */
-void vTaskGetTaskInfo( TaskHandle_t xTask, TaskStatus_t *pxTaskStatus, BaseType_t xGetFreeStackSpace, eTaskState eState );
+void vTaskGetTaskInfo( TaskHandle_t xTask, TaskStatus_t *pxTaskStatus, BaseType_t xGetFreeStackSpace, eTaskState eState ) PRIVILEGED_FUNCTION;
 
 /**
  * task. h

FreeRTOS/Source/portable/CCS/ARM_CM4F/port.c

@@ -518,7 +518,7 @@ void xPortSysTickHandler( void )
 
 				/* The reload value is set to whatever fraction of a single tick
 				period remains. */
-				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
+				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
 			}
 
 			/* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG

FreeRTOS/Source/portable/GCC/ARM_CA9/portmacro.h

@@ -182,7 +182,7 @@ void vPortTaskUsesFPU( void );
 
 	/*-----------------------------------------------------------*/
 
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31 - __builtin_clz( uxReadyPriorities ) )
+	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - __builtin_clz( uxReadyPriorities ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 

FreeRTOS/Source/portable/GCC/ARM_CM3/port.c

@@ -624,7 +624,7 @@ void xPortSysTickHandler( void )
 
 				/* The reload value is set to whatever fraction of a single tick
 				period remains. */
-				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
+				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
 			}
 
 			/* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG

FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h

@@ -181,7 +181,7 @@ not necessary for to use this port.  They are defined so the common demo files
 
 	/*-----------------------------------------------------------*/
 
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31 - ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
+	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( uint32_t ) ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 

FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c

@@ -207,8 +207,6 @@ QueueHandle_t MPU_xQueueCreateMutex( void );
 QueueHandle_t MPU_xQueueCreateCountingSemaphore( UBaseType_t uxCountValue, UBaseType_t uxInitialCount );
 BaseType_t MPU_xQueueTakeMutexRecursive( QueueHandle_t xMutex, TickType_t xBlockTime );
 BaseType_t MPU_xQueueGiveMutexRecursive( QueueHandle_t xMutex );
-BaseType_t MPU_xQueueAltGenericSend( QueueHandle_t pxQueue, const void * const pvItemToQueue, TickType_t xTicksToWait, BaseType_t xCopyPosition );
-BaseType_t MPU_xQueueAltGenericReceive( QueueHandle_t pxQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking );
 void MPU_vQueueAddToRegistry( QueueHandle_t xQueue, char *pcName );
 void MPU_vQueueDelete( QueueHandle_t xQueue );
 void *MPU_pvPortMalloc( size_t xSize );
@@ -1136,32 +1134,6 @@ void * xReturn;
 #endif
 /*-----------------------------------------------------------*/
 
-#if configUSE_ALTERNATIVE_API == 1
-	BaseType_t MPU_xQueueAltGenericSend( QueueHandle_t pxQueue, const void * const pvItemToQueue, TickType_t xTicksToWait, BaseType_t xCopyPosition )
-	{
-   	BaseType_t xReturn;
-	BaseType_t xRunningPrivileged = prvRaisePrivilege();
-
-		xReturn = 	BaseType_t xQueueAltGenericSend( pxQueue, pvItemToQueue, xTicksToWait, xCopyPosition );
-		portRESET_PRIVILEGE( xRunningPrivileged );
-		return xReturn;
-	}
-#endif
-/*-----------------------------------------------------------*/
-
-#if configUSE_ALTERNATIVE_API == 1
-	BaseType_t MPU_xQueueAltGenericReceive( QueueHandle_t pxQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking )
-	{
-    BaseType_t xReturn;
-	BaseType_t xRunningPrivileged = prvRaisePrivilege();
-
-		xReturn = xQueueAltGenericReceive( pxQueue, pvBuffer, xTicksToWait, xJustPeeking );
-		portRESET_PRIVILEGE( xRunningPrivileged );
-		return xReturn;
-	}
-#endif
-/*-----------------------------------------------------------*/
-
 #if configQUEUE_REGISTRY_SIZE > 0
 	void MPU_vQueueAddToRegistry( QueueHandle_t xQueue, char *pcName )
 	{

FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c

@@ -279,7 +279,7 @@ void vPortSVCHandler( void )
 					"	msr	basepri, r0					\n"
 					"	bx r14							\n"
 					"									\n"
-					"	.align 2						\n"
+					"	.align 4						\n"
 					"pxCurrentTCBConst2: .word pxCurrentTCB				\n"
 				);
 }
@@ -479,7 +479,7 @@ void xPortPendSVHandler( void )
 	"										\n"
 	"	bx r14								\n"
 	"										\n"
-	"	.align 2							\n"
+	"	.align 4							\n"
 	"pxCurrentTCBConst: .word pxCurrentTCB	\n"
 	::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY)
 	);
@@ -492,7 +492,7 @@ void xPortSysTickHandler( void )
 	executes all interrupts must be unmasked.  There is therefore no need to
 	save and then restore the interrupt mask value as its value is already
 	known. */
-	( void ) portSET_INTERRUPT_MASK_FROM_ISR();
+	portDISABLE_INTERRUPTS();
 	{
 		/* Increment the RTOS tick. */
 		if( xTaskIncrementTick() != pdFALSE )
@@ -502,7 +502,7 @@ void xPortSysTickHandler( void )
 			portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
 		}
 	}
-	portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
+	portENABLE_INTERRUPTS();
 }
 /*-----------------------------------------------------------*/
 
@@ -636,7 +636,7 @@ void xPortSysTickHandler( void )
 
 				/* The reload value is set to whatever fraction of a single tick
 				period remains. */
-				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
+				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
 			}
 
 			/* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG

FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h

@@ -188,7 +188,7 @@ not necessary for to use this port.  They are defined so the common demo files
 
 	/*-----------------------------------------------------------*/
 
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31 - ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
+	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( uint32_t ) ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 

FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c

@@ -626,7 +626,7 @@ void xPortSysTickHandler( void )
 
 				/* The reload value is set to whatever fraction of a single tick
 				period remains. */
-				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
+				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
 			}
 
 			/* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG

FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/portmacro.h

@@ -188,7 +188,7 @@ not necessary for to use this port.  They are defined so the common demo files
 
 	/*-----------------------------------------------------------*/
 
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31 - ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
+	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( uint32_t ) ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 

FreeRTOS/Source/portable/GCC/IA32_flat/port.c

@@ -619,14 +619,14 @@ volatile uint32_t ulErrorStatus = 0;
 	{
 	BaseType_t xReturn;
 
-		if( prvCheckValidityOfVectorNumber( ulVectorNumber ) != pdFAIL )
+		xReturn = prvCheckValidityOfVectorNumber( ulVectorNumber );
+
+		if( xReturn != pdFAIL )
 		{
 			/* Save the handler passed in by the application in the vector number
 			passed in.  The addresses are then called from the central interrupt
 			handler. */
 			xInterruptHandlerTable[ ulVectorNumber ] = pxHandler;
-
-			xReturn = pdPASS;
 		}
 
 		return xReturn;
@@ -639,7 +639,9 @@ BaseType_t xPortInstallInterruptHandler( ISR_Handler_t pxHandler, uint32_t ulVec
 {
 BaseType_t xReturn;
 
-	if( prvCheckValidityOfVectorNumber( ulVectorNumber ) != pdFAIL )
+	xReturn = prvCheckValidityOfVectorNumber( ulVectorNumber );
+	
+	if( xReturn != pdFAIL )
 	{
 		taskENTER_CRITICAL();
 		{
@@ -647,8 +649,6 @@ BaseType_t xReturn;
 			prvSetInterruptGate( ( uint8_t ) ulVectorNumber, ( ISR_Handler_t ) pxHandler, portIDT_FLAGS );
 		}
 		taskEXIT_CRITICAL();
-
-		xReturn = pdPASS;
 	}
 
 	return xReturn;

FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h

@@ -180,7 +180,7 @@ extern volatile uint32_t ulTaskSwitchRequested;
 
 	/*-----------------------------------------------------------*/
 
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31 - ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
+	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( uint32_t ) ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 

FreeRTOS/Source/portable/IAR/ARM_CM3/port.c

@@ -505,7 +505,7 @@ void xPortSysTickHandler( void )
 
 				/* The reload value is set to whatever fraction of a single tick
 				period remains. */
-				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
+				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
 			}
 
 			/* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG

FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h

@@ -145,7 +145,7 @@ extern void vPortYield( void );
 	/*-----------------------------------------------------------*/
 
 	#include <intrinsics.h>
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31 - __CLZ( ( uxReadyPriorities ) ) )
+	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( ( uint32_t ) __CLZ( ( uxReadyPriorities ) ) ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 /*-----------------------------------------------------------*/

FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c

@@ -533,7 +533,7 @@ void xPortSysTickHandler( void )
 
 				/* The reload value is set to whatever fraction of a single tick
 				period remains. */
-				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1 ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
+				portNVIC_SYSTICK_LOAD_REG = ( ( ulCompleteTickPeriods + 1UL ) * ulTimerCountsForOneTick ) - ulCompletedSysTickDecrements;
 			}
 
 			/* Restart SysTick so it runs from portNVIC_SYSTICK_LOAD_REG