FreeRTOS source:

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-Trace / Include / trcKernelPort.h

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
index 7c8244137969340dbbb0680b7f076db03df9a58c..47b6fdcf86bd9f4dddb5b0587790cad38049cafb 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
@@ -56,7 +56,7 @@ extern int uiInEventGroupSetBitsFromISR;
 #define TRACE_CPU_CLOCK_HZ configCPU_CLOCK_HZ /* Defined in "FreeRTOSConfig.h" */\r
 \r
 #if (SELECTED_PORT == PORT_ARM_CortexM)\r
-       \r
+\r
        /* Uses CMSIS API */\r
 \r
        #define TRACE_SR_ALLOC_CRITICAL_SECTION() int __irq_status;\r
@@ -571,8 +571,8 @@ void* prvTraceGetCurrentTaskHandle(void);
 \r
 /* Called on vTaskDelayUntil - note the use of FreeRTOS variable xTimeToWake */\r
 #undef traceTASK_DELAY_UNTIL\r
-#define traceTASK_DELAY_UNTIL() \\r
-       trcKERNEL_HOOKS_TASK_DELAY(TASK_DELAY_UNTIL, pxCurrentTCB, xTimeToWake); \\r
+#define traceTASK_DELAY_UNTIL( xTickTimeToWake ) \\r
+       trcKERNEL_HOOKS_TASK_DELAY(TASK_DELAY_UNTIL, pxCurrentTCB, ( xTickTimeToWake)); \\r
        trcKERNEL_HOOKS_SET_TASK_INSTANCE_FINISHED();\r
 \r
 #if (INCLUDE_OBJECT_DELETE == 1)\r
@@ -819,7 +819,7 @@ else \
 \r
 #undef traceTASK_NOTIFY_TAKE\r
 #define traceTASK_NOTIFY_TAKE() \\r
-       if (pxCurrentTCB->eNotifyState == eNotified) \\r
+       if (pxCurrentTCB->ucNotifyState == taskNOTIFICATION_RECEIVED) \\r
                vTraceStoreKernelCallWithParam(TRACE_TASK_NOTIFY_TAKE, TRACE_CLASS_TASK, uxTaskGetTaskNumber(pxCurrentTCB), xTicksToWait); \\r
        else \\r
                vTraceStoreKernelCallWithParam(TRACE_TASK_NOTIFY_TAKE_FAILED, TRACE_CLASS_TASK, uxTaskGetTaskNumber(pxCurrentTCB), xTicksToWait);\r
@@ -831,7 +831,7 @@ else \
 \r
 #undef traceTASK_NOTIFY_WAIT\r
 #define traceTASK_NOTIFY_WAIT() \\r
-       if (pxCurrentTCB->eNotifyState == eNotified) \\r
+       if (pxCurrentTCB->ucNotifyState == taskNOTIFICATION_RECEIVED) \\r
                vTraceStoreKernelCallWithParam(TRACE_TASK_NOTIFY_WAIT, TRACE_CLASS_TASK, uxTaskGetTaskNumber(pxCurrentTCB), xTicksToWait); \\r
        else \\r
                vTraceStoreKernelCallWithParam(TRACE_TASK_NOTIFY_WAIT_FAILED, TRACE_CLASS_TASK, uxTaskGetTaskNumber(pxCurrentTCB), xTicksToWait);\r
@@ -848,7 +848,7 @@ else \
 #undef traceTASK_NOTIFY_FROM_ISR\r
 #define traceTASK_NOTIFY_FROM_ISR() \\r
        vTraceStoreKernelCall(TRACE_TASK_NOTIFY_FROM_ISR, TRACE_CLASS_TASK, uxTaskGetTaskNumber(xTaskToNotify));\r
-       \r
+\r
 #undef traceTASK_NOTIFY_GIVE_FROM_ISR\r
 #define traceTASK_NOTIFY_GIVE_FROM_ISR() \\r
        vTraceStoreKernelCall(TRACE_TASK_NOTIFY_GIVE_FROM_ISR, TRACE_CLASS_TASK, uxTaskGetTaskNumber(xTaskToNotify));\r