Remove test of trace functions from the Win32/GCC build as it messes up the trace...

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

diff --git a/FreeRTOS/Demo/WIN32-MingW/main_full.c b/FreeRTOS/Demo/WIN32-MingW/main_full.c
index 099a8aead079ca2028536573787113d983e89ffc..8bedc2ccce58fdfa4a0775babeb65890569db1bf 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MingW/main_full.c
@@ -350,17 +350,8 @@ const unsigned long ulMSToSleep = 5;
 void vFullDemoIdleFunction( void )\r
 {\r
 const unsigned long ulMSToSleep = 15;\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( QueueHandle_t pxQueue, unsigned portBASE_TYPE uxQueueNumber );\r
-extern unsigned portBASE_TYPE uxQueueGetQueueNumber( QueueHandle_t pxQueue );\r
-extern uint8_t ucQueueGetQueueType( QueueHandle_t pxQueue );\r
-extern void vTaskSetTaskNumber( TaskHandle_t xTask, unsigned portBASE_TYPE uxHandle );\r
-extern unsigned portBASE_TYPE uxTaskGetTaskNumber( TaskHandle_t xTask );\r
-\r
        /* Sleep to reduce CPU load, but don't sleep indefinitely in case there are\r
        tasks waiting to be terminated by the idle task. */\r
        Sleep( ulMSToSleep );\r
@@ -379,16 +370,6 @@ extern unsigned portBASE_TYPE uxTaskGetTaskNumber( TaskHandle_t xTask );
        that has tasks blocked on it. */\r
        if( xMutexToDelete != NULL )\r
        {\r
-               /* 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, 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( uxQueueGetQueueNumber( xMutexToDelete ) == uxConstQueueNumber );\r
-               configASSERT( ucQueueGetQueueType( xMutexToDelete ) == queueQUEUE_TYPE_MUTEX );\r
                vSemaphoreDelete( xMutexToDelete );\r
                xMutexToDelete = NULL;\r
        }\r
@@ -459,7 +440,6 @@ const TickType_t xDontBlock = 0; /* This is called from the idle task so must *n
 static void prvDemonstrateTaskStateAndHandleGetFunctions( void )\r
 {\r
 TaskHandle_t xIdleTaskHandle, xTimerTaskHandle;\r
-const unsigned char ucConstTaskNumber = 0x55U;\r
 char *pcTaskName;\r
 static portBASE_TYPE xPerformedOneShotTests = pdFALSE;\r
 TaskHandle_t xTestTask;\r
@@ -469,8 +449,6 @@ TaskHandle_t xTestTask;
        the task number. */\r
        xIdleTaskHandle = xTaskGetIdleTaskHandle();\r
        xTimerTaskHandle = xTimerGetTimerDaemonTaskHandle();\r
-       vTaskSetTaskNumber( xIdleTaskHandle, ( unsigned long ) ucConstTaskNumber );\r
-       configASSERT( uxTaskGetTaskNumber( xIdleTaskHandle ) == ucConstTaskNumber );\r
 \r
        /* This is the idle hook, so the current task handle should equal the\r
        returned idle task handle. */\r