Update FreeRTOS+Trace recorder library to v3.0.2

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-Trace / trcKernel.c

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
index cf624c850b07b89a842cec2676c9f6e96578a50f..30d405cbe34b311e8b2e97ecbac684426a3d6236 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Tracealyzer v2.7.7 Recorder Library\r
+ * Tracealyzer v3.0.2 Recorder Library\r
  * Percepio AB, www.percepio.com\r
  *\r
  * trcKernel.c\r
@@ -33,7 +33,7 @@
  *\r
  * Tabs are used for indent in this file (1 tab = 4 spaces)\r
  *\r
- * Copyright Percepio AB, 2012-2015.\r
+ * Copyright Percepio AB, 2014.\r
  * www.percepio.com\r
  ******************************************************************************/\r
 \r
@@ -48,9 +48,9 @@ int8_t nISRactive = 0;
 objectHandleType handle_of_last_logged_task = 0;\r
 uint8_t inExcludedTask = 0;\r
 \r
-#if (INCLUDE_MEMMANG_EVENTS == 1)\r
-/* Current heap usage. Always updated. */\r
-static uint32_t heapMemUsage = 0;\r
+#if (INCLUDE_MEMMANG_EVENTS == 1) && (TRACE_SCHEDULING_ONLY == 0)\r
+ /* Current heap usage. Always updated. */\r
+ static uint32_t heapMemUsage = 0;\r
 #endif\r
 \r
 #if (TRACE_SCHEDULING_ONLY == 0)\r
@@ -639,9 +639,9 @@ void vTraceSetPriorityProperty(uint8_t objectclass, objectHandleType id, uint8_t
 uint8_t uiTraceGetPriorityProperty(uint8_t objectclass, objectHandleType id)\r
 {\r
        TRACE_ASSERT(objectclass < TRACE_NCLASSES,\r
-               "uiTraceGetPriorityProperty: Invalid objectclass number (>= TRACE_NCLASSES)", 0);\r
+               "uiTraceGetPriorityProperty: objectclass >= TRACE_NCLASSES", 0);\r
        TRACE_ASSERT(id <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass],\r
-               "uiTraceGetPriorityProperty: Task handle exceeds NTask. You may need to increase this constant in trcConfig.h.", 0);\r
+               "uiTraceGetPriorityProperty: Invalid value for id", 0);\r
 \r
        return TRACE_PROPERTY_ACTOR_PRIORITY(objectclass, id);\r
 }\r