Fix queue monitoring and trace for FreeRTOS 8

bitcraze · Nov 26, 2015 · 6630b3a · 6630b3a
1 parent 2ead4bf
commit 6630b3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/config/trace.h b/config/trace.h
@@ -49,9 +49,9 @@
 #define ITM_BLOCKING_ON_QUEUE_RECEIVE 0x0300
 #define ITM_BLOCKING_ON_QUEUE_SEND 0x0400
 
-// #define traceQUEUE_SEND(xQueue) ITM_SEND(3, ITM_QUEUE_SEND | ((xQUEUE *) xQueue)->ucQueueNumber)
-// #define traceQUEUE_SEND_FAILED(xQueue) ITM_SEND(3, ITM_QUEUE_FAILED | ((xQUEUE *) xQueue)->ucQueueNumber)
-// #define traceBLOCKING_ON_QUEUE_RECEIVE(xQueue) ITM_SEND(3, ITM_BLOCKING_ON_QUEUE_RECEIVE | ((xQUEUE *) xQueue)->ucQueueNumber)
-// #define traceBLOCKING_ON_QUEUE_SEND(xQueue) ITM_SEND(3, ITM_BLOCKING_ON_QUEUE_SEND | ((xQUEUE *) xQueue)->ucQueueNumber)
+#define traceQUEUE_SEND(xQueue) ITM_SEND(3, ITM_QUEUE_SEND | ((xQUEUE *) xQueue)->uxQueueNumber)
+#define traceQUEUE_SEND_FAILED(xQueue) ITM_SEND(3, ITM_QUEUE_FAILED | ((xQUEUE *) xQueue)->uxQueueNumber)
+#define traceBLOCKING_ON_QUEUE_RECEIVE(xQueue) ITM_SEND(3, ITM_BLOCKING_ON_QUEUE_RECEIVE | ((xQUEUE *) xQueue)->uxQueueNumber)
+#define traceBLOCKING_ON_QUEUE_SEND(xQueue) ITM_SEND(3, ITM_BLOCKING_ON_QUEUE_SEND | ((xQUEUE *) xQueue)->uxQueueNumber)
 
 #endif
diff --git a/modules/src/queuemonitor.c b/modules/src/queuemonitor.c
@@ -109,7 +109,7 @@ void qmRegisterQueue(xQueueHandle* xQueue, char* fileName, char* queueName) {
 }
 
 static Data* getQueueData(xQueueHandle* xQueue) {
-  unsigned char number = ucQueueGetQueueNumber(xQueue);
+  unsigned char number = uxQueueGetQueueNumber(xQueue);
   ASSERT(number < MAX_NR_OF_QUEUES);
   return &data[number];
 }
@@ -170,4 +170,4 @@ static void timerHandler(xTimerHandle timer) {
   debugPrint();
 }
 
-#endif // DEBUG_QUEUE_MONITOR
+#endif // DEBUG_QUEUE_MONITOR