Update the ucQueueNumber member of the queue structure (used with FreeRTOS+Trace...

[freertos] / FreeRTOS / Source / queue.c

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index 023aa41240e7009ed163e126e9d7770f12272c8e..83a5b919be3b70c1a67104086488486edf8729bb 100644 (file)
--- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c
@@ -146,7 +146,7 @@ typedef struct QueueDefinition
        volatile signed portBASE_TYPE xTxLock;  /*< Stores the number of items transmitted to the queue (added to the queue) while the queue was locked.  Set to queueUNLOCKED when the queue is not locked. */\r
 \r
        #if ( configUSE_TRACE_FACILITY == 1 )\r
-               unsigned char ucQueueNumber;\r
+               unsigned portBASE_TYPE uxQueueNumber;\r
                unsigned char ucQueueType;\r
        #endif\r
 \r
@@ -418,7 +418,7 @@ xQueueHandle xReturn = NULL;
        void *pxReturn;\r
 \r
                /* This function is called by xSemaphoreGetMutexHolder(), and should not\r
-               be called directly.  Note:  This is is a good way of determining if the\r
+               be called directly.  Note:  This is a good way of determining if the\r
                calling task is the mutex holder, but not a good way of determining the\r
                identity of the mutex holder, as the holder may change between the\r
                following critical section exiting and the function returning. */\r
@@ -909,11 +909,11 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                                {\r
                                                        if( pxQueue->uxQueueType == queueQUEUE_IS_MUTEX )\r
                                                        {\r
-                                                               portENTER_CRITICAL();\r
+                                                               taskENTER_CRITICAL();\r
                                                                {\r
                                                                        vTaskPriorityInherit( ( void * ) pxQueue->pxMutexHolder );\r
                                                                }\r
-                                                               portEXIT_CRITICAL();\r
+                                                               taskEXIT_CRITICAL();\r
                                                        }\r
                                                }\r
                                                #endif\r
@@ -949,7 +949,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
 \r
        /* RTOS ports that support interrupt nesting have the concept of a maximum\r
        system call (or maximum API call) interrupt priority.  Interrupts that are\r
-       above the maximum system call priority are keep permanently enabled, even\r
+       above the maximum system call priority are kept permanently enabled, even\r
        when the RTOS kernel is in a critical section, but cannot make any calls to\r
        FreeRTOS API functions.  If configASSERT() is defined in FreeRTOSConfig.h\r
        then portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion\r
@@ -1175,11 +1175,11 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
                                {\r
                                        if( pxQueue->uxQueueType == queueQUEUE_IS_MUTEX )\r
                                        {\r
-                                               portENTER_CRITICAL();\r
+                                               taskENTER_CRITICAL();\r
                                                {\r
                                                        vTaskPriorityInherit( ( void * ) pxQueue->pxMutexHolder );\r
                                                }\r
-                                               portEXIT_CRITICAL();\r
+                                               taskEXIT_CRITICAL();\r
                                        }\r
                                }\r
                                #endif\r
@@ -1220,7 +1220,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
 \r
        /* RTOS ports that support interrupt nesting have the concept of a maximum\r
        system call (or maximum API call) interrupt priority.  Interrupts that are\r
-       above the maximum system call priority are keep permanently enabled, even\r
+       above the maximum system call priority are kept permanently enabled, even\r
        when the RTOS kernel is in a critical section, but cannot make any calls to\r
        FreeRTOS API functions.  If configASSERT() is defined in FreeRTOSConfig.h\r
        then portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion\r
@@ -1296,7 +1296,7 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
 \r
        /* RTOS ports that support interrupt nesting have the concept of a maximum\r
        system call (or maximum API call) interrupt priority.  Interrupts that are\r
-       above the maximum system call priority are keep permanently enabled, even\r
+       above the maximum system call priority are kept permanently enabled, even\r
        when the RTOS kernel is in a critical section, but cannot make any calls to\r
        FreeRTOS API functions.  If configASSERT() is defined in FreeRTOSConfig.h\r
        then portASSERT_IF_INTERRUPT_PRIORITY_INVALID() will result in an assertion\r
@@ -1398,9 +1398,9 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
 \r
 #if ( configUSE_TRACE_FACILITY == 1 )\r
 \r
-       unsigned char ucQueueGetQueueNumber( xQueueHandle xQueue )\r
+       unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle xQueue )\r
        {\r
-               return ( ( xQUEUE * ) xQueue )->ucQueueNumber;\r
+               return ( ( xQUEUE * ) xQueue )->uxQueueNumber;\r
        }\r
 \r
 #endif /* configUSE_TRACE_FACILITY */\r
@@ -1408,9 +1408,9 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
 \r
 #if ( configUSE_TRACE_FACILITY == 1 )\r
 \r
-       void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned char ucQueueNumber )\r
+       void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned portBASE_TYPE uxQueueNumber )\r
        {\r
-               ( ( xQUEUE * ) xQueue )->ucQueueNumber = ucQueueNumber;\r
+               ( ( xQUEUE * ) xQueue )->uxQueueNumber = uxQueueNumber;\r
        }\r
 \r
 #endif /* configUSE_TRACE_FACILITY */\r