***IMMINENT RELEASE NOTICE***

[freertos] / FreeRTOS / Source / include / FreeRTOS.h

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index 43d7f7191e6726381530fa35f2b1bdc7c80ecc7d..0c820eccbf8bcd7ce8e1353f8949deb462a24558 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -90,12 +90,12 @@
 extern "C" {\r
 #endif\r
 \r
-/* Basic FreeRTOS definitions. */\r
-#include "projdefs.h"\r
-\r
 /* Application specific configuration options. */\r
 #include "FreeRTOSConfig.h"\r
 \r
+/* Basic FreeRTOS definitions. */\r
+#include "projdefs.h"\r
+\r
 /* configUSE_PORT_OPTIMISED_TASK_SELECTION must be defined before portable.h\r
 is included as it is used by the port layer. */\r
 #ifndef configUSE_PORT_OPTIMISED_TASK_SELECTION\r
@@ -249,8 +249,8 @@ is included as it is used by the port layer. */
        #define INCLUDE_xEventGroupSetBitFromISR 0\r
 #endif\r
 \r
-#ifndef INCLUDE_xTimerPendFunctionCallFromISR\r
-       #define INCLUDE_xTimerPendFunctionCallFromISR 0\r
+#ifndef INCLUDE_xTimerPendFunctionCall\r
+       #define INCLUDE_xTimerPendFunctionCall 0\r
 #endif\r
 \r
 #ifndef configASSERT\r
@@ -567,20 +567,20 @@ is included as it is used by the port layer. */
        #define traceEVENT_GROUP_CREATE_FAILED()\r
 #endif\r
 \r
-#ifndef traceEVENT_GROUP_SYNC_START\r
-       #define traceEVENT_GROUP_SYNC_START( xEventGroup, uxBitsToSet )\r
+#ifndef traceEVENT_GROUP_SYNC_BLOCK\r
+       #define traceEVENT_GROUP_SYNC_BLOCK( xEventGroup, uxBitsToSet, uxBitsToWaitFor )\r
 #endif\r
 \r
 #ifndef traceEVENT_GROUP_SYNC_END\r
-       #define traceEVENT_GROUP_SYNC_END( xEventGroup, uxReturn )\r
+       #define traceEVENT_GROUP_SYNC_END( xEventGroup, uxBitsToSet, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) xTimeoutOccurred\r
 #endif\r
 \r
-#ifndef traceEVENT_GROUP_WAIT_BITS_START\r
-       #define traceEVENT_GROUP_WAIT_BITS_START( xEventGroup, uxBitsToWaitFor )\r
+#ifndef traceEVENT_GROUP_WAIT_BITS_BLOCK\r
+       #define traceEVENT_GROUP_WAIT_BITS_BLOCK( xEventGroup, uxBitsToWaitFor )\r
 #endif\r
 \r
 #ifndef traceEVENT_GROUP_WAIT_BITS_END\r
-       #define traceEVENT_GROUP_WAIT_BITS_END( xEventGroup, uxReturn )\r
+       #define traceEVENT_GROUP_WAIT_BITS_END( xEventGroup, uxBitsToWaitFor, xTimeoutOccurred ) ( void ) xTimeoutOccurred\r
 #endif\r
 \r
 #ifndef traceEVENT_GROUP_CLEAR_BITS\r
@@ -595,10 +595,26 @@ is included as it is used by the port layer. */
        #define traceEVENT_GROUP_SET_BITS( xEventGroup, uxBitsToSet )\r
 #endif\r
 \r
+#ifndef traceEVENT_GROUP_SET_BITS_FROM_ISR\r
+       #define traceEVENT_GROUP_SET_BITS_FROM_ISR( xEventGroup, uxBitsToSet )\r
+#endif\r
+\r
 #ifndef traceEVENT_GROUP_DELETE\r
        #define traceEVENT_GROUP_DELETE( xEventGroup )\r
 #endif\r
 \r
+#ifndef tracePEND_FUNC_CALL\r
+       #define tracePEND_FUNC_CALL(xFunctionToPend, pvParameter1, ulParameter2, ret)\r
+#endif\r
+\r
+#ifndef tracePEND_FUNC_CALL_FROM_ISR\r
+       #define tracePEND_FUNC_CALL_FROM_ISR(xFunctionToPend, pvParameter1, ulParameter2, ret)\r
+#endif \r
+\r
+#ifndef traceQUEUE_REGISTRY_ADD\r
+       #define traceQUEUE_REGISTRY_ADD(xQueue, pcQueueName)\r
+#endif\r
+\r
 #ifndef configGENERATE_RUN_TIME_STATS\r
        #define configGENERATE_RUN_TIME_STATS 0\r
 #endif\r
@@ -701,6 +717,10 @@ is included as it is used by the port layer. */
        #define mtCOVERAGE_TEST_MARKER()\r
 #endif\r
 \r
+#ifndef portASSERT_IF_IN_ISR\r
+       #define portASSERT_IF_IN_ISR()\r
+#endif\r
+\r
 /* Definitions to allow backward compatibility with FreeRTOS versions prior to\r
 V8 if desired. */\r
 #ifndef configENABLE_BACKWARD_COMPATIBILITY\r