Ensure warning free compilation under GCC.

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

diff --git a/Demo/Common/Minimal/GenQTest.c b/Demo/Common/Minimal/GenQTest.c
index 1f8eac5d77232b7efc71278a65e88f86b377b0c2..906fea42c5506ac8036afb15491b7555a8fdc500 100644 (file)
--- a/Demo/Common/Minimal/GenQTest.c
+++ b/Demo/Common/Minimal/GenQTest.c
@@ -124,7 +124,7 @@ xSemaphoreHandle xMutex;
        /* Create the demo task and pass it the queue just created.  We are\r
        passing the queue handle by value so it does not matter that it is\r
        declared on the stack here. */\r
-       xTaskCreate( prvSendFrontAndBackTest, "GenQ", configMINIMAL_STACK_SIZE, ( void * ) xQueue, uxPriority, NULL );\r
+       xTaskCreate( prvSendFrontAndBackTest, ( signed portCHAR * )"GenQ", configMINIMAL_STACK_SIZE, ( void * ) xQueue, uxPriority, NULL );\r
 \r
        /* Create the mutex used by the prvMutexTest task. */\r
        xMutex = xSemaphoreCreateMutex();\r
@@ -132,9 +132,9 @@ xSemaphoreHandle xMutex;
        /* Create the mutex demo tasks and pass it the mutex just created.  We are\r
        passing the mutex handle by value so it does not matter that it is declared\r
        on the stack here. */\r
-       xTaskCreate( prvLowPriorityMutexTask, "MuLow", configMINIMAL_STACK_SIZE, ( void * ) xMutex, genqMUTEX_LOW_PRIORITY, NULL );\r
-       xTaskCreate( prvMediumPriorityMutexTask, "MuMed", configMINIMAL_STACK_SIZE, NULL, genqMUTEX_MEDIUM_PRIORITY, &xMediumPriorityMutexTask );\r
-       xTaskCreate( prvHighPriorityMutexTask, "MuHigh", configMINIMAL_STACK_SIZE, ( void * ) xMutex, genqMUTEX_HIGH_PRIORITY, &xHighPriorityMutexTask );\r
+       xTaskCreate( prvLowPriorityMutexTask, ( signed portCHAR * )"MuLow", configMINIMAL_STACK_SIZE, ( void * ) xMutex, genqMUTEX_LOW_PRIORITY, NULL );\r
+       xTaskCreate( prvMediumPriorityMutexTask, ( signed portCHAR * )"MuMed", configMINIMAL_STACK_SIZE, NULL, genqMUTEX_MEDIUM_PRIORITY, &xMediumPriorityMutexTask );\r
+       xTaskCreate( prvHighPriorityMutexTask, ( signed portCHAR * )"MuHigh", configMINIMAL_STACK_SIZE, ( void * ) xMutex, genqMUTEX_HIGH_PRIORITY, &xHighPriorityMutexTask );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -466,6 +466,8 @@ xSemaphoreHandle xMutex = ( xSemaphoreHandle ) pvParameters;
 \r
 static void prvMediumPriorityMutexTask( void *pvParameters )\r
 {\r
+       ( void ) pvParameters;\r
+\r
        for( ;; )\r
        {\r
                /* The medium priority task starts by suspending itself.  The low\r

diff --git a/Demo/Common/Minimal/QPeek.c b/Demo/Common/Minimal/QPeek.c
index 41e40b3e68ab2eeead4739971ffcce40b49fde79..45c5feb86ad1a6a363379281699d3b7e78b5c252 100644 (file)
--- a/Demo/Common/Minimal/QPeek.c
+++ b/Demo/Common/Minimal/QPeek.c
@@ -97,10 +97,10 @@ xQueueHandle xQueue;
        /* Create the demo tasks and pass it the queue just created.  We are\r
        passing the queue handle by value so it does not matter that it is declared\r
        on the stack here. */\r
-       xTaskCreate( prvLowPriorityPeekTask, "PeekL", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekLOW_PRIORITY, NULL );\r
-       xTaskCreate( prvMediumPriorityPeekTask, "PeekM", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekMEDIUM_PRIORITY, &xMediumPriorityTask );\r
-       xTaskCreate( prvHighPriorityPeekTask, "PeekH1", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekHIGH_PRIORITY, &xHighPriorityTask );\r
-       xTaskCreate( prvHighestPriorityPeekTask, "PeekH2", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekHIGHEST_PRIORITY, &xHighestPriorityTask );\r
+       xTaskCreate( prvLowPriorityPeekTask, ( signed portCHAR * )"PeekL", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekLOW_PRIORITY, NULL );\r
+       xTaskCreate( prvMediumPriorityPeekTask, ( signed portCHAR * )"PeekM", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekMEDIUM_PRIORITY, &xMediumPriorityTask );\r
+       xTaskCreate( prvHighPriorityPeekTask, ( signed portCHAR * )"PeekH1", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekHIGH_PRIORITY, &xHighPriorityTask );\r
+       xTaskCreate( prvHighestPriorityPeekTask, ( signed portCHAR * )"PeekH2", configMINIMAL_STACK_SIZE, ( void * ) xQueue, qpeekHIGHEST_PRIORITY, &xHighestPriorityTask );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/Common/Minimal/blocktim.c b/Demo/Common/Minimal/blocktim.c
index 0b369a861910e3aea4e3e7911a13ade53c572ab8..70166bc3b54226198a36f3c251386fc703cfb705 100644 (file)
--- a/Demo/Common/Minimal/blocktim.c
+++ b/Demo/Common/Minimal/blocktim.c
@@ -99,6 +99,8 @@ portBASE_TYPE xItem, xData;
 portTickType xTimeWhenBlocking;\r
 portTickType xTimeToBlock, xBlockedTime;\r
 \r
+       ( void ) pvParameters;\r
+\r
        for( ;; )\r
        {\r
                /*********************************************************************\r
@@ -354,6 +356,8 @@ static void vSecondaryBlockTimeTestTask( void *pvParameters )
 portTickType xTimeWhenBlocking, xBlockedTime;\r
 portBASE_TYPE xData;\r
 \r
+       ( void ) pvParameters;\r
+\r
        for( ;; )\r
        {\r
                /*********************************************************************\r

diff --git a/Demo/Common/Minimal/countsem.c b/Demo/Common/Minimal/countsem.c
index dab2c0dc21868e75424d5e29ff05b422da80958a..4d6d1deb4f0b91cd5f25317327bbe83370af69ba 100644 (file)
--- a/Demo/Common/Minimal/countsem.c
+++ b/Demo/Common/Minimal/countsem.c
@@ -130,8 +130,8 @@ void vStartCountingSemaphoreTasks( void )
        if( ( xParameters[ 0 ].xSemaphore != NULL ) || ( xParameters[ 1 ].xSemaphore != NULL ) )\r
        {\r
                /* Create the demo tasks, passing in the semaphore to use as the parameter. */\r
-               xTaskCreate( prvCountingSemaphoreTask, "CNT1", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 0 ] ), tskIDLE_PRIORITY, NULL );\r
-               xTaskCreate( prvCountingSemaphoreTask, "CNT2", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 1 ] ), tskIDLE_PRIORITY, NULL );            \r
+               xTaskCreate( prvCountingSemaphoreTask, ( signed portCHAR * ) "CNT1", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 0 ] ), tskIDLE_PRIORITY, NULL );\r
+               xTaskCreate( prvCountingSemaphoreTask, ( signed portCHAR * ) "CNT2", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 1 ] ), tskIDLE_PRIORITY, NULL );              \r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r

diff --git a/Source/include/FreeRTOS.h b/Source/include/FreeRTOS.h
index 35e4426e981cd5a01526b1ef746dcf36b2eab198..ea8b46ad4ea7944b1a65af77eecfeb0d2d611418 100644 (file)
--- a/Source/include/FreeRTOS.h
+++ b/Source/include/FreeRTOS.h
@@ -112,14 +112,14 @@
        #error Missing definition:  configUSE_16_BIT_TICKS should be defined in FreeRTOSConfig.h as either 1 or 0.  See the Configuration section of the FreeRTOS API documentation for details.\r
 #endif\r
 \r
-#ifndef configUSE_MUTEXES\r
-       #define configUSE_MUTEXES 0\r
-#endif\r
-\r
 #ifndef configUSE_COUNTING_SEMAPHORES\r
        #define configUSE_COUNTING_SEMAPHORES 0\r
 #endif\r
 \r
+#ifndef configUSE_MUTEXES\r
+       #define configUSE_MUTEXES 0\r
+#endif\r
+\r
 #if ( configUSE_MUTEXES == 1 )\r
        /* xTaskGetCurrentTaskHandle is used by the priority inheritance mechanism\r
        within the mutex implementation so must be available if mutexes are used. */\r