Minor updates to ensure all kernel aware debuggers are happy with V8.

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

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index b571297254f92c1168bfead0d071cdcf8bcfa7c1..277bcc1fe5beef7994ae5f2da04cbf7c5e429e65 100644 (file)
--- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c
@@ -153,7 +153,12 @@ typedef struct QueueDefinition
                struct QueueDefinition *pxQueueSetContainer;\r
        #endif\r
 \r
-} Queue_t;\r
+} xQUEUE;\r
+\r
+/* The old xQUEUE name is maintained above then typedefed to the new Queue_t\r
+name below to enable the use of older kernel aware debuggers. */\r
+typedef xQUEUE Queue_t;\r
+\r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
@@ -169,7 +174,12 @@ typedef struct QueueDefinition
        {\r
                const char *pcQueueName; /*lint !e971 Unqualified char types are allowed for strings and single characters only. */\r
                QueueHandle_t xHandle;\r
-       } QueueRegistryItem_t;\r
+       } xQueueRegistryItem;\r
+\r
+       /* The old xQueueRegistryItem name is maintained above then typedefed to the\r
+       new xQueueRegistryItem name below to enable the use of older kernel aware\r
+       debuggers. */\r
+       typedef xQueueRegistryItem QueueRegistryItem_t;\r
 \r
        /* The queue registry is simply an array of QueueRegistryItem_t structures.\r
        The pcQueueName member of a structure being NULL is indicative of the\r
@@ -1040,8 +1050,8 @@ Queue_t * const pxQueue = ( Queue_t * ) xQueue;
 \r
        /* Similar to xQueueGenericSend, except without blocking if there is no room\r
        in the queue.  Also don't directly wake a task that was blocked on a queue\r
-       read, instead return a flag to say whether a context switch is required or \r
-       not (i.e. has a task with a higher priority than us been woken by this \r
+       read, instead return a flag to say whether a context switch is required or\r
+       not (i.e. has a task with a higher priority than us been woken by this\r
        post). */\r
        uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();\r
        {\r
@@ -2350,7 +2360,7 @@ BaseType_t xReturn;
        BaseType_t xReturn = pdFALSE;\r
 \r
                /* This function must be called form a critical section. */\r
-       \r
+\r
                configASSERT( pxQueueSetContainer );\r
                configASSERT( pxQueueSetContainer->uxMessagesWaiting < pxQueueSetContainer->uxLength );\r
 \r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index 12f16d674498a65ef04cb9cffaf95029ca24cbab..8773c356cf196f7228de42049a81ae58b95d177c 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -167,7 +167,11 @@ typedef struct tskTaskControlBlock
                struct  _reent xNewLib_reent;\r
        #endif\r
 \r
-} TCB_t;\r
+} tskTCB;\r
+\r
+/* The old tskTCB name is maintained above then typedefed to the new TCB_t name\r
+below to enable the use of older kernel aware debuggers. */\r
+typedef tskTCB TCB_t;\r
 \r
 /*\r
  * Some kernel aware debuggers require the data the debugger needs access to to\r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index 718766a918cc0b08da718854ccfbee24a8ae3550..a7625887480d618793628a5848f5e9bf9ce6b0f0 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -108,7 +108,11 @@ typedef struct tmrTimerControl
        #if( configUSE_TRACE_FACILITY == 1 )\r
                UBaseType_t                     uxTimerNumber;          /*<< An ID assigned by trace tools such as FreeRTOS+Trace */\r
        #endif\r
-} Timer_t;\r
+} xTIMER;\r
+\r
+/* The old xTIMER name is maintained above then typedefed to the new Timer_t\r
+name below to enable the use of older kernel aware debuggers. */\r
+typedef xTIMER Timer_t;\r
 \r
 /* The definition of messages that can be sent and received on the timer queue.\r
 Two types of message can be queued - messages that manipulate a software timer,\r