X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS-Plus%2FSource%2FFreeRTOS-Plus-Trace%2FtrcKernelPort.c;h=38251c40e7aea7773b34ef34a47fb381a7f5064f;hb=28320337a97dd9bb0cca9397db807c0ea930230f;hp=a4217e071e1f96eb573c27893eea41a958d95233;hpb=b254c7a9d4ad1859162633843c84ce2a0e6cba44;p=freertos

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