Remove compiler warnings.

git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@369 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

1 files changed, 49 insertions, 36 deletions

diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c
index 51e1c5f6..557ecafe 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c
@@ -94,8 +94,8 @@
 #include "death.h"
 #include "partest.h"
 #include "countsem.h"
-#include "recmutex.h"

-#include "flop.h"

+#include "recmutex.h"
+#include "flop.h"
 #include "flop-reg-test.h"
 
 /* Priorities assigned to the demo tasks. */
@@ -106,7 +106,7 @@
 #define mainDEATH_PRIORITY 				( tskIDLE_PRIORITY + 1 )
 #define mainLED_TASK_PRIORITY			( tskIDLE_PRIORITY + 1 )
 #define mainGENERIC_QUEUE_PRIORITY		( tskIDLE_PRIORITY )
-#define mainQUEUE_POLL_PRIORITY			( tskIDLE_PRIORITY + 1 )

+#define mainQUEUE_POLL_PRIORITY			( tskIDLE_PRIORITY + 1 )
 #define mainFLOP_PRIORITY				( tskIDLE_PRIORITY )
 
 /* The first LED used by the COM test and check tasks respectively. */
@@ -137,7 +137,7 @@ static void prvErrorChecks( void *pvParameters );
  * Called by the 'check' task to inspect all the standard demo tasks within
  * the system, as described within the comments at the head of this page.
  */
-static portSHORT prvCheckOtherTasksAreStillRunning( void );
+static portBASE_TYPE prvCheckOtherTasksAreStillRunning( void );
 
 /*
  * Perform any hardware initialisation required by the demo application.
@@ -148,16 +148,16 @@ static void prvSetupHardware( void );
 
 /* xRegTestStatus will get set to pdFAIL by the regtest tasks if they
 discover an unexpected value. */
-static unsigned portBASE_TYPE xRegTestStatus = pdPASS;
+static volatile unsigned portBASE_TYPE xRegTestStatus = pdPASS;
 
 /* Counters used to ensure the regtest tasks are still running. */
 static volatile unsigned portLONG ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL;
 
 /*-----------------------------------------------------------*/
-

+
 int main( void )
-{

-

+{
+
 	/* Must be called prior to installing any interrupt handlers! */
 	vPortSetupInterruptController();
 
@@ -178,17 +178,17 @@ int main( void )
 	vStartQueuePeekTasks();
 	vCreateBlockTimeTasks();
 	vStartCountingSemaphoreTasks();
-	vStartRecursiveMutexTasks();

-

-	#if ( configUSE_FPU == 1 )

-		vStartMathTasks( mainFLOP_PRIORITY );

-		vStartFlopRegTests();

+	vStartRecursiveMutexTasks();
+
+	#if ( configUSE_FPU == 1 )
+		vStartMathTasks( mainFLOP_PRIORITY );
+		vStartFlopRegTests();
 	#endif
 
 	/* Create the tasks defined within this file. */
-	xTaskCreate( prvRegTestTask1, "Regtest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
-	xTaskCreate( prvRegTestTask2, "Regtest2", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
-	xTaskCreate( prvErrorChecks, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
+	xTaskCreate( prvRegTestTask1, ( signed portCHAR * ) "Regtest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
+	xTaskCreate( prvRegTestTask2, ( signed portCHAR * ) "Regtest2", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
+	xTaskCreate( prvErrorChecks, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
 
 	/* The suicide tasks must be started last as they record the number of other
 	tasks that exist within the system.  The value is then used to ensure at run
@@ -197,7 +197,7 @@ int main( void )
 
 	/* Now start the scheduler.  Following this call the created tasks should
 	be executing. */	
-	vTaskStartScheduler( );
+	vTaskStartScheduler();
 
 	/* vTaskStartScheduler() will only return if an error occurs while the 
 	idle task is being created. */
@@ -207,7 +207,7 @@ int main( void )
 }
 /*-----------------------------------------------------------*/
 
-static portSHORT prvCheckOtherTasksAreStillRunning( void )
+static portBASE_TYPE prvCheckOtherTasksAreStillRunning( void )
 {
 portBASE_TYPE lReturn = pdPASS;
 static unsigned portLONG ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL;
@@ -272,18 +272,18 @@ static unsigned portLONG ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL
 	{
 		lReturn = pdFAIL;
 	}
-

-	#if ( configUSE_FPU == 1 )

-		if( xAreMathsTaskStillRunning() != pdTRUE )

-		{

-			lReturn = pdFAIL;

-		}

-

-		if( xAreFlopRegisterTestsStillRunning() != pdTRUE )

-		{

-			lReturn = pdFAIL;

-		}

-	#endif

+
+	#if ( configUSE_FPU == 1 )
+		if( xAreMathsTaskStillRunning() != pdTRUE )
+		{
+			lReturn = pdFAIL;
+		}
+
+		if( xAreFlopRegisterTestsStillRunning() != pdTRUE )
+		{
+			lReturn = pdFAIL;
+		}
+	#endif
 
 	/* Have the register test tasks found any errors? */
 	if( xRegTestStatus != pdPASS )
@@ -318,6 +318,9 @@ static void prvErrorChecks( void *pvParameters )
 {
 portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY, xLastExecutionTime;
 volatile unsigned portBASE_TYPE uxFreeStack;
+

+	/* Just to remove compiler warning. */
+	( void ) pvParameters;
 
 	/* This call is just to demonstrate the use of the function - nothing is
 	done with the value.  You would expect the stack high water mark to be
@@ -393,7 +396,10 @@ void prvRegTestFail( void )
 /*-----------------------------------------------------------*/
 
 static void prvRegTestTask1( void *pvParameters )
-{
+{

+	/* Just to remove compiler warning. */
+	( void ) pvParameters;
+
 	/* The first register test task as described at the top of this file.  The
 	values used in the registers are different to those use in the second 
 	register test task.  Also, unlike the second register test task, this task
@@ -531,7 +537,10 @@ static void prvRegTestTask1( void *pvParameters )
 /*-----------------------------------------------------------*/
 
 static void prvRegTestTask2( void *pvParameters )
-{
+{

+	/* Just to remove compiler warning. */
+	( void ) pvParameters;
+
 	/* The second register test task as described at the top of this file.  
 	Note that this task fills the registers with different values to the
 	first register test task. */
@@ -668,10 +677,14 @@ An overflow can cause the task name to be corrupted, in which case the task
 handle needs to be used to determine the offending task. */
 void vApplicationStackOverflowHook( xTaskHandle xTask, signed portCHAR *pcTaskName );
 void vApplicationStackOverflowHook( xTaskHandle xTask, signed portCHAR *pcTaskName )
-{

-/* To prevent the optimiser removing the variables. */

-volatile xTaskHandle xTaskIn = xTask;

-volatile signed portCHAR *pcTaskNameIn = pcTaskName;

+{
+/* To prevent the optimiser removing the variables. */
+volatile xTaskHandle xTaskIn = xTask;
+volatile signed portCHAR *pcTaskNameIn = pcTaskName;
+

+	/* Remove compiler warnings. */

+	( void ) xTaskIn;

+	( void ) pcTaskNameIn;

 
 	/* The following three calls are simply to stop compiler warnings about the
 	functions not being used - they are called from the inline assembly. */