From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Mon, 17 Feb 2014 12:56:05 +0000 (+0000)
Subject: Remove test of trace functions from the Win32/GCC build as it messes up the trace... 
X-Git-Tag: V8.0.0~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=23628eaa2215845f31b76d180e8c81559ba78b37;p=freertos

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

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 099a8aead..8bedc2ccc 100644
--- 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 )
 {
 const unsigned long ulMSToSleep = 15;
-const unsigned portBASE_TYPE uxConstQueueNumber = 0xaaU;
 void *pvAllocated;
 
-/* These three functions are only meant for use by trace code, and not for
-direct use from application code, hence their prototypes are not in queue.h. */
-extern void vQueueSetQueueNumber( QueueHandle_t pxQueue, unsigned portBASE_TYPE uxQueueNumber );
-extern unsigned portBASE_TYPE uxQueueGetQueueNumber( QueueHandle_t pxQueue );
-extern uint8_t ucQueueGetQueueType( QueueHandle_t pxQueue );
-extern void vTaskSetTaskNumber( TaskHandle_t xTask, unsigned portBASE_TYPE uxHandle );
-extern unsigned portBASE_TYPE uxTaskGetTaskNumber( TaskHandle_t xTask );
-
 	/* Sleep to reduce CPU load, but don't sleep indefinitely in case there are
 	tasks waiting to be terminated by the idle task. */
 	Sleep( ulMSToSleep );
@@ -379,16 +370,6 @@ extern unsigned portBASE_TYPE uxTaskGetTaskNumber( TaskHandle_t xTask );
 	that has tasks blocked on it. */
 	if( xMutexToDelete != NULL )
 	{
-		/* Before deleting the semaphore, test the function used to set its
-		number.  This would normally only be done from trace software, rather
-		than application code. */
-		vQueueSetQueueNumber( xMutexToDelete, uxConstQueueNumber );
-
-		/* Before deleting the semaphore, test the functions used to get its
-		type and number.  Again, these would normally only be done from trace
-		software, rather than application code. */
-		configASSERT( uxQueueGetQueueNumber( xMutexToDelete ) == uxConstQueueNumber );
-		configASSERT( ucQueueGetQueueType( xMutexToDelete ) == queueQUEUE_TYPE_MUTEX );
 		vSemaphoreDelete( xMutexToDelete );
 		xMutexToDelete = NULL;
 	}
@@ -459,7 +440,6 @@ const TickType_t xDontBlock = 0; /* This is called from the idle task so must *n
 static void prvDemonstrateTaskStateAndHandleGetFunctions( void )
 {
 TaskHandle_t xIdleTaskHandle, xTimerTaskHandle;
-const unsigned char ucConstTaskNumber = 0x55U;
 char *pcTaskName;
 static portBASE_TYPE xPerformedOneShotTests = pdFALSE;
 TaskHandle_t xTestTask;
@@ -469,8 +449,6 @@ TaskHandle_t xTestTask;
 	the task number. */
 	xIdleTaskHandle = xTaskGetIdleTaskHandle();
 	xTimerTaskHandle = xTimerGetTimerDaemonTaskHandle();
-	vTaskSetTaskNumber( xIdleTaskHandle, ( unsigned long ) ucConstTaskNumber );
-	configASSERT( uxTaskGetTaskNumber( xIdleTaskHandle ) == ucConstTaskNumber );
 
 	/* This is the idle hook, so the current task handle should equal the
 	returned idle task handle. */