Changes to the FreeRTOS code:

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

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index 7d34ec63bb51796ff02f130e26c23ccd0f291e3d..a0e55e6d8f0b4ab88d26267811f6367bcf80e343 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -247,10 +247,6 @@ extern "C" {
        #define INCLUDE_xTaskResumeFromISR 1\r
 #endif\r
 \r
-#ifndef INCLUDE_xEventGroupSetBitFromISR\r
-       #define INCLUDE_xEventGroupSetBitFromISR 0\r
-#endif\r
-\r
 #ifndef INCLUDE_xTimerPendFunctionCall\r
        #define INCLUDE_xTimerPendFunctionCall 0\r
 #endif\r
@@ -315,6 +311,7 @@ extern "C" {
 #if ( configQUEUE_REGISTRY_SIZE < 1 )\r
        #define vQueueAddToRegistry( xQueue, pcName )\r
        #define vQueueUnregisterQueue( xQueue )\r
+       #define pcQueueGetQueueName( xQueue )\r
 #endif\r
 \r
 #ifndef portPOINTER_SIZE_TYPE\r
@@ -405,6 +402,10 @@ extern "C" {
        #define traceMOVED_TASK_TO_READY_STATE( pxTCB )\r
 #endif\r
 \r
+#ifndef tracePOST_MOVED_TASK_TO_READY_STATE\r
+       #define tracePOST_MOVED_TASK_TO_READY_STATE( pxTCB )\r
+#endif\r
+\r
 #ifndef traceQUEUE_CREATE\r
        #define traceQUEUE_CREATE( pxNewQueue )\r
 #endif\r
@@ -680,7 +681,7 @@ extern "C" {
 #endif\r
 \r
 #ifndef pvPortMallocAligned\r
-       #define pvPortMallocAligned( x, puxStackBuffer ) ( ( ( puxStackBuffer ) == NULL ) ? ( pvPortMalloc( ( x ) ) ) : ( puxStackBuffer ) )\r
+       #define pvPortMallocAligned( x, puxPreallocatedBuffer ) ( ( ( puxPreallocatedBuffer ) == NULL ) ? ( pvPortMalloc( ( x ) ) ) : ( puxPreallocatedBuffer ) )\r
 #endif\r
 \r
 #ifndef vPortFreeAligned\r
@@ -771,6 +772,10 @@ extern "C" {
        #define portTICK_TYPE_IS_ATOMIC 0\r
 #endif\r
 \r
+#ifndef configSUPPORT_STATIC_ALLOCATION\r
+       #define configSUPPORT_STATIC_ALLOCATION 0\r
+#endif\r
+\r
 #if( portTICK_TYPE_IS_ATOMIC == 0 )\r
        /* Either variables of tick type cannot be read atomically, or\r
        portTICK_TYPE_IS_ATOMIC was not set - map the critical sections used when\r
@@ -821,7 +826,7 @@ V8 if desired. */
 \r
 /* Set configUSE_TASK_FPU_SUPPORT to 0 to omit floating point support even\r
 if floating point hardware is otherwise supported by the FreeRTOS port in use.\r
-This constant is not supported by all FreeRTOS ports that include floating \r
+This constant is not supported by all FreeRTOS ports that include floating\r
 point support. */\r
 #ifndef configUSE_TASK_FPU_SUPPORT\r
        #define configUSE_TASK_FPU_SUPPORT 1\r