Final commit before tagging - cosmetic changes only.

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

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
index a4217e071e1f96eb573c27893eea41a958d95233..38251c40e7aea7773b34ef34a47fb381a7f5064f 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Tracealyzer v2.6.0 Recorder Library\r
+ * Tracealyzer v2.7.7 Recorder Library\r
  * Percepio AB, www.percepio.com\r
  *\r
  * trcKernelPort.c\r
@@ -31,7 +31,9 @@
  * damages, or the exclusion of implied warranties or limitations on how long an \r
  * implied warranty may last, so the above limitations may not apply to you.\r
  *\r
- * Copyright Percepio AB, 2013.\r
+ * Tabs are used for indent in this file (1 tab = 4 spaces)\r
+ *\r
+ * Copyright Percepio AB, 2012-2015.\r
  * www.percepio.com\r
  ******************************************************************************/\r
 \r
@@ -56,13 +58,27 @@ traceObjectClass TraceObjectClassTable[5] = {
 int uiInEventGroupSetBitsFromISR = 0;\r
 \r
 extern unsigned char ucQueueGetQueueType(void*);\r
-extern BaseType_t uxQueueGetQueueNumber(void*);\r
+\r
+#if (FREERTOS_VERSION < FREERTOS_VERSION_8_0_OR_LATER)\r
+\r
+extern portBASE_TYPE ucQueueGetQueueNumber(void*);\r
+\r
+objectHandleType prvTraceGetObjectNumber(void* handle)\r
+{\r
+       return (objectHandleType) ucQueueGetQueueNumber(handle);\r
+}\r
+\r
+#else\r
+\r
+extern portBASE_TYPE uxQueueGetQueueNumber(void*);\r
 \r
 objectHandleType prvTraceGetObjectNumber(void* handle)\r
 {\r
-       return ( objectHandleType ) uxQueueGetQueueNumber(handle);      \r
+       return (objectHandleType) uxQueueGetQueueNumber(handle);\r
 }\r
 \r
+#endif\r
+\r
 unsigned char prvTraceGetObjectType(void* handle)\r
 {\r
        return ucQueueGetQueueType(handle);\r
@@ -139,7 +155,7 @@ void vTraceInitObjectHandleStack()
        objectHandleStacks.indexOfNextAvailableHandle[5] = objectHandleStacks.lowestIndexOfClass[5] = NQueue + NSemaphore + NMutex + NTask + NISR;\r
        objectHandleStacks.indexOfNextAvailableHandle[6] = objectHandleStacks.lowestIndexOfClass[6] = NQueue + NSemaphore + NMutex + NTask + NISR + NTimer;\r
 \r
-    objectHandleStacks.highestIndexOfClass[0] = NQueue - 1;\r
+       objectHandleStacks.highestIndexOfClass[0] = NQueue - 1;\r
        objectHandleStacks.highestIndexOfClass[1] = NQueue + NSemaphore - 1;\r
        objectHandleStacks.highestIndexOfClass[2] = NQueue + NSemaphore + NMutex - 1;\r
        objectHandleStacks.highestIndexOfClass[3] = NQueue + NSemaphore + NMutex + NTask - 1;\r