Ensure queue functions go into the privileged code section when the MPU version is...

[freertos] / FreeRTOS / Source / queue.c

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index bdb25271f4f230545a87183a5f54ace920f79be8..4a6745b7befa15ddb5a50143a01aebb814bd8ee2 100644 (file)
--- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c
@@ -163,10 +163,6 @@ typedef struct QueueDefinition
        array position being vacant. */\r
        xQueueRegistryItem xQueueRegistry[ configQUEUE_REGISTRY_SIZE ];\r
 \r
-       /* Removes a queue from the registry by simply setting the pcQueueName\r
-       member to NULL. */\r
-       static void prvQueueUnregisterQueue( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;\r
-\r
 #endif /* configQUEUE_REGISTRY_SIZE */\r
 \r
 /*\r
@@ -209,7 +205,7 @@ static void prvCopyDataFromQueue( xQUEUE * const pxQueue, const void *pvBuffer )
         * Checks to see if a queue is a member of a queue set, and if so, notifies\r
         * the queue set that the queue contains data.\r
         */\r
-       static portBASE_TYPE prvNotifyQueueSetContainer( xQUEUE *pxQueue, portBASE_TYPE xCopyPosition );\r
+       static portBASE_TYPE prvNotifyQueueSetContainer( xQUEUE *pxQueue, portBASE_TYPE xCopyPosition ) PRIVILEGED_FUNCTION;\r
 #endif\r
 \r
 /*-----------------------------------------------------------*/\r
@@ -1259,7 +1255,7 @@ xQUEUE *pxQueue;
        traceQUEUE_DELETE( pxQueue );\r
        #if ( configQUEUE_REGISTRY_SIZE > 0 )\r
        {\r
-               prvQueueUnregisterQueue( pxQueue );\r
+               vQueueUnregisterQueue( pxQueue );\r
        }\r
        #endif\r
        vPortFree( pxQueue->pcHead );\r
@@ -1778,7 +1774,7 @@ signed portBASE_TYPE xReturn;
 \r
 #if ( configQUEUE_REGISTRY_SIZE > 0 )\r
 \r
-       static void prvQueueUnregisterQueue( xQueueHandle xQueue )\r
+       void vQueueUnregisterQueue( xQueueHandle xQueue )\r
        {\r
        unsigned portBASE_TYPE ux;\r
 \r