Change how volatile is used in some of the standard demos to remove compiler warnings...

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

diff --git a/FreeRTOS/Demo/Common/Minimal/QueueSet.c b/FreeRTOS/Demo/Common/Minimal/QueueSet.c
index f97ebb08306cbf9d9e148a09208b26a98f037697..473a88a28fcbedc7ebb834aedcd26e1a6e4bb3e9 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/QueueSet.c
+++ b/FreeRTOS/Demo/Common/Minimal/QueueSet.c
@@ -619,8 +619,9 @@ uint32_t ulReceived;
 static void prvSendToQueueInSetFromISR( void )\r
 {\r
 static BaseType_t xQueueToWriteTo = 0;\r
+uint32_t ulTxValueSnapshot = ulISRTxValue;\r
 \r
-       if( xQueueSendFromISR( xQueues[ xQueueToWriteTo ], ( void * ) &ulISRTxValue, NULL ) == pdPASS )\r
+       if( xQueueSendFromISR( xQueues[ xQueueToWriteTo ], ( void * ) &ulTxValueSnapshot, NULL ) == pdPASS )\r
        {\r
                ulISRTxValue++;\r
 \r

diff --git a/FreeRTOS/Demo/Common/Minimal/countsem.c b/FreeRTOS/Demo/Common/Minimal/countsem.c
index 575eded65ed4c1975d089dcae940c2eebdea7801..503d7b0f52b08a3b3154ec1ef0aa6ddda3154349 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/countsem.c
+++ b/FreeRTOS/Demo/Common/Minimal/countsem.c
@@ -115,13 +115,13 @@ static void prvCountingSemaphoreTask( void *pvParameters );
  * Utility function to increment the semaphore count value up from zero to\r
  * countMAX_COUNT_VALUE.\r
  */\r
-static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter );\r
+static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, volatile UBaseType_t *puxLoopCounter );\r
 \r
 /*\r
  * Utility function to decrement the semaphore count value up from\r
  * countMAX_COUNT_VALUE to zero.\r
  */\r
-static void prvDecrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter );\r
+static void prvDecrementSemaphoreCount( SemaphoreHandle_t xSemaphore, volatile UBaseType_t *puxLoopCounter );\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -138,11 +138,11 @@ typedef struct COUNT_SEM_STRUCT
 \r
        /* Incremented on each cycle of the demo task.  Used to detect a stalled\r
        task. */\r
-       UBaseType_t uxLoopCounter;\r
+       volatile UBaseType_t uxLoopCounter;\r
 } xCountSemStruct;\r
 \r
 /* Two structures are defined, one is passed to each test task. */\r
-static volatile xCountSemStruct xParameters[ countNUM_TEST_TASKS ];\r
+static xCountSemStruct xParameters[ countNUM_TEST_TASKS ];\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -178,7 +178,7 @@ void vStartCountingSemaphoreTasks( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvDecrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter )\r
+static void prvDecrementSemaphoreCount( SemaphoreHandle_t xSemaphore, volatile UBaseType_t *puxLoopCounter )\r
 {\r
 UBaseType_t ux;\r
 \r
@@ -217,7 +217,7 @@ UBaseType_t ux;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter )\r
+static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, volatile UBaseType_t *puxLoopCounter )\r
 {\r
 UBaseType_t ux;\r
 \r

diff --git a/FreeRTOS/Demo/Common/Minimal/dynamic.c b/FreeRTOS/Demo/Common/Minimal/dynamic.c
index 0c15710199097b4fb66fdecbe2447554e93430e1..4e1ab698cfa1e30ebea1f06e53dc6ee9d8481f61 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/dynamic.c
+++ b/FreeRTOS/Demo/Common/Minimal/dynamic.c
@@ -162,7 +162,7 @@ static TaskHandle_t xContinuousIncrementHandle, xLimitedIncrementHandle;
 \r
 /* The shared counter variable.  This is passed in as a parameter to the two\r
 counter variables for demonstration purposes. */\r
-static volatile uint32_t ulCounter;\r
+static uint32_t ulCounter;\r
 \r
 /* Variables used to check that the tasks are still operating without error.\r
 Each complete iteration of the controller task increments this variable\r
@@ -214,11 +214,11 @@ void vStartDynamicPriorityTasks( void )
  */\r
 static portTASK_FUNCTION( vLimitedIncrementTask, pvParameters )\r
 {\r
-uint32_t *pulCounter;\r
+volatile uint32_t *pulCounter;\r
 \r
        /* Take a pointer to the shared variable from the parameters passed into\r
        the task. */\r
-       pulCounter = ( uint32_t * ) pvParameters;\r
+       pulCounter = ( volatile uint32_t * ) pvParameters;\r
 \r
        /* This will run before the control task, so the first thing it does is\r
        suspend - the control task will resume it when ready. */\r
@@ -248,7 +248,7 @@ UBaseType_t uxOurPriority;
 \r
        /* Take a pointer to the shared variable from the parameters passed into\r
        the task. */\r
-       pulCounter = ( uint32_t * ) pvParameters;\r
+       pulCounter = ( volatile uint32_t * ) pvParameters;\r
 \r
        /* Query our priority so we can raise it when exclusive access to the\r
        shared variable is required. */\r

diff --git a/FreeRTOS/Demo/Common/Minimal/flop.c b/FreeRTOS/Demo/Common/Minimal/flop.c
index 0c107b7b67453ef55cbb4bb26946025e9829a5e0..f5755cf8b92da02d3fcb5eec163e86d5b1e9dca1 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/flop.c
+++ b/FreeRTOS/Demo/Common/Minimal/flop.c
@@ -106,7 +106,7 @@ static portTASK_FUNCTION_PROTO( vCompetingMathTask4, pvParameters );
 \r
 /* These variables are used to check that all the tasks are still running.  If a\r
 task gets a calculation wrong it will stop setting its check variable. */\r
-static volatile uint16_t usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( uint16_t ) 0 };\r
+static uint16_t usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( uint16_t ) 0 };\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -139,7 +139,7 @@ short sError = pdFALSE;
 \r
        /* The variable this task increments to show it is still running is passed in\r
        as the parameter. */\r
-       pusTaskCheckVariable = ( uint16_t * ) pvParameters;\r
+       pusTaskCheckVariable = ( volatile uint16_t * ) pvParameters;\r
 \r
        /* Keep performing a calculation and checking the result against a constant. */\r
        for(;;)\r
@@ -198,7 +198,7 @@ short sError = pdFALSE;
 \r
        /* The variable this task increments to show it is still running is passed in\r
        as the parameter. */\r
-       pusTaskCheckVariable = ( uint16_t * ) pvParameters;\r
+       pusTaskCheckVariable = ( volatile uint16_t * ) pvParameters;\r
 \r
        /* Keep performing a calculation and checking the result against a constant. */\r
        for( ;; )\r
@@ -250,7 +250,7 @@ short sError = pdFALSE;
 \r
        /* The variable this task increments to show it is still running is passed in\r
        as the parameter. */\r
-       pusTaskCheckVariable = ( uint16_t * ) pvParameters;\r
+       pusTaskCheckVariable = ( volatile uint16_t * ) pvParameters;\r
 \r
        pdArray = ( portDOUBLE * ) pvPortMalloc( xArraySize * sizeof( portDOUBLE ) );\r
 \r
@@ -313,7 +313,7 @@ short sError = pdFALSE;
 \r
        /* The variable this task increments to show it is still running is passed in\r
        as the parameter. */\r
-       pusTaskCheckVariable = ( uint16_t * ) pvParameters;\r
+       pusTaskCheckVariable = ( volatile uint16_t * ) pvParameters;\r
 \r
        pdArray = ( portDOUBLE * ) pvPortMalloc( xArraySize * sizeof( portDOUBLE ) );\r
 \r

diff --git a/FreeRTOS/Demo/Common/Minimal/integer.c b/FreeRTOS/Demo/Common/Minimal/integer.c
index 8e01ff1c8b37cc68ee5665a83eb9617562c907ff..d99ff52c2776d5c003a0195221e3a49c0bffeb43 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/integer.c
+++ b/FreeRTOS/Demo/Common/Minimal/integer.c
@@ -104,7 +104,7 @@ static portTASK_FUNCTION_PROTO( vCompeteingIntMathTask, pvParameters );
 that the task is still executing.  The check task sets the variable back to\r
 false, flagging an error if the variable is still false the next time it\r
 is called. */\r
-static volatile BaseType_t xTaskCheck[ intgNUMBER_OF_TASKS ] = { ( BaseType_t ) pdFALSE };\r
+static BaseType_t xTaskCheck[ intgNUMBER_OF_TASKS ] = { ( BaseType_t ) pdFALSE };\r
 \r
 /*-----------------------------------------------------------*/\r
 \r