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

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2132 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
index a775883b2622f4566b04fe305c85778f7f52e1cc..211878a5db21f0960fd817c510c7b480b9473c28 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
@@ -358,7 +358,7 @@ void* prvTraceGetCurrentTaskHandle(void);
 #define TRACE_GET_OBJECT_TRACE_CLASS(CLASS, pxObject) TRACE_GET_CLASS_TRACE_CLASS(CLASS, prvTraceGetObjectType(pxObject))\r
 \r
 #define TRACE_GET_OBJECT_NUMBER(CLASS, pxObject) (prvTraceGetObjectNumber(pxObject))\r
-#define TRACE_SET_OBJECT_NUMBER(CLASS, pxObject) pxObject->ucQueueNumber = xTraceGetObjectHandle(TRACE_GET_OBJECT_TRACE_CLASS(CLASS, pxObject));\r
+#define TRACE_SET_OBJECT_NUMBER(CLASS, pxObject) pxObject->uxQueueNumber = xTraceGetObjectHandle(TRACE_GET_OBJECT_TRACE_CLASS(CLASS, pxObject));\r
 \r
 #define TRACE_GET_CLASS_EVENT_CODE(SERVICE, RESULT, CLASS, kernelClass) (uint8_t)(EVENTGROUP_##SERVICE##_##RESULT + TRACE_GET_CLASS_TRACE_CLASS(CLASS, kernelClass))\r
 #define TRACE_GET_OBJECT_EVENT_CODE(SERVICE, RESULT, CLASS, pxObject) (uint8_t)(EVENTGROUP_##SERVICE##_##RESULT + TRACE_GET_OBJECT_TRACE_CLASS(CLASS, pxObject))\r

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
index 610b3b39cbaf1ce73530a9d1302adb1b74762492..91b6a8156af53c8aeae8117de1e6d3ad24164846 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
@@ -52,11 +52,11 @@ traceObjectClass TraceObjectClassTable[5] = {
 };\r
 \r
 extern unsigned char ucQueueGetQueueType(void*);\r
-extern unsigned char ucQueueGetQueueNumber(void*);\r
+extern unsigned portBASE_TYPE uxQueueGetQueueNumber(void*);\r
 \r
 objectHandleType prvTraceGetObjectNumber(void* handle)\r
 {\r
-       return ucQueueGetQueueNumber(handle);   \r
+       return uxQueueGetQueueNumber(handle);   \r
 }\r
 \r
 unsigned char prvTraceGetObjectType(void* handle)\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
index 62600fee46e163fce5e0159ee41ab64099101268..11ac892ae06d7fd3b97ff2456d784034d3498fe5 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
@@ -338,13 +338,13 @@ const unsigned long ulMSToSleep = 5;
 void vFullDemoIdleFunction( void )\r
 {\r
 const unsigned long ulMSToSleep = 15;\r
-const unsigned char ucConstQueueNumber = 0xaaU;\r
+const unsigned portBASE_TYPE uxConstQueueNumber = 0xaaU;\r
 void *pvAllocated;\r
 \r
 /* These three functions are only meant for use by trace code, and not for\r
 direct use from application code, hence their prototypes are not in queue.h. */\r
-extern void vQueueSetQueueNumber( xQueueHandle pxQueue, unsigned char ucQueueNumber );\r
-extern unsigned char ucQueueGetQueueNumber( xQueueHandle pxQueue );\r
+extern void vQueueSetQueueNumber( xQueueHandle pxQueue, unsigned portBASE_TYPE uxQueueNumber );\r
+extern unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle pxQueue );\r
 extern unsigned char ucQueueGetQueueType( xQueueHandle pxQueue );\r
 extern void vTaskSetTaskNumber( xTaskHandle xTask, unsigned portBASE_TYPE uxHandle );\r
 extern unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask );\r
@@ -366,12 +366,12 @@ extern unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask );
                /* Before deleting the semaphore, test the function used to set its\r
                number.  This would normally only be done from trace software, rather\r
                than application code. */\r
-               vQueueSetQueueNumber( xMutexToDelete, ucConstQueueNumber );\r
+               vQueueSetQueueNumber( xMutexToDelete, uxConstQueueNumber );\r
 \r
                /* Before deleting the semaphore, test the functions used to get its\r
                type and number.  Again, these would normally only be done from trace\r
                software, rather than application code. */\r
-               configASSERT( ucQueueGetQueueNumber( xMutexToDelete ) == ucConstQueueNumber );\r
+               configASSERT( uxQueueGetQueueNumber( xMutexToDelete ) == uxConstQueueNumber );\r
                configASSERT( ucQueueGetQueueType( xMutexToDelete ) == queueQUEUE_TYPE_MUTEX );\r
                vSemaphoreDelete( xMutexToDelete );\r
                xMutexToDelete = NULL;\r

diff --git a/FreeRTOS/Source/include/queue.h b/FreeRTOS/Source/include/queue.h
index c67d315ddc1b3b36b7b95a812e53c7ec13451621..6b20211efeb969685bca94a799382047e5e2fe75 100644 (file)
--- a/FreeRTOS/Source/include/queue.h
+++ b/FreeRTOS/Source/include/queue.h
@@ -1674,8 +1674,8 @@ xQueueSetMemberHandle xQueueSelectFromSetFromISR( xQueueSetHandle xQueueSet ) PR
 /* Not public API functions. */\r
 void vQueueWaitForMessageRestricted( xQueueHandle xQueue, portTickType xTicksToWait ) PRIVILEGED_FUNCTION;\r
 portBASE_TYPE xQueueGenericReset( xQueueHandle xQueue, portBASE_TYPE xNewQueue ) PRIVILEGED_FUNCTION;\r
-void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned char ucQueueNumber ) PRIVILEGED_FUNCTION;\r
-unsigned char ucQueueGetQueueNumber( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;\r
+void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned portBASE_TYPE uxQueueNumber ) PRIVILEGED_FUNCTION;\r
+unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;\r
 unsigned char ucQueueGetQueueType( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;\r
 \r
 \r

diff --git a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
index 03a9bc981d91fc0862621fd2c69108fabf0fcde2..d8dd2f57ab6f9791ea989b9fd5ab6f9557298248 100644 (file)
--- a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
+++ b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
@@ -95,8 +95,10 @@
 \r
 #define portYIELD()                                    vPortGenerateSimulatedInterrupt( portINTERRUPT_YIELD )\r
 \r
+void vPortCloseRunningThread( void *pvTaskToDelete, volatile portBASE_TYPE *pxPendYield );\r
 void vPortDeleteThread( void *pvThreadToDelete );\r
 #define portCLEAN_UP_TCB( pxTCB )      vPortDeleteThread( pxTCB )\r
+#define portPRE_TASK_DELETE_HOOK( pvTaskToDelete, pxPendYield ) vPortCloseRunningThread( ( pvTaskToDelete ), ( pxPendYield ) )\r
 #define portDISABLE_INTERRUPTS()\r
 #define portENABLE_INTERRUPTS()\r
 \r

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index 43ceaca9279003fb25648d304481d61c9bb2f293..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
@@ -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