Fix a few compiler warnings when compiling the QueueSet.c test code with GCC.

This commit is contained in:
Richard Barry 2013-02-08 17:05:42 +00:00
parent d328ae3bfc
commit 96218c34a1
5 changed files with 36 additions and 26 deletions

View file

@ -86,9 +86,9 @@
#include "FreeRTOS.h"
#include "task.h"
/* Standard demo includes - just needed for the LED (ParTest) initialisation
function. */
/* Standard demo includes. */
#include "partest.h"
#include "QueueSet.h"
/* Atmel library includes. */
#include <asf.h>
@ -200,3 +200,20 @@ void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName
}
/*-----------------------------------------------------------*/
void vApplicationTickHook( void )
{
/* This function will be called by each tick interrupt if
configUSE_TICK_HOOK is set to 1 in FreeRTOSConfig.h. User code can be
added here, but the tick hook is called from an interrupt context, so
code must not attempt to block, and only the interrupt safe FreeRTOS API
functions can be used (those that end in FromISR()). */
#if ( mainCREATE_SIMPLE_BLINKY_DEMO_ONLY == 0 )
{
/* In this case the tick hook is used as part of the queue set test. */
vQueueSetWriteToQueueFromISR();
}
#endif /* mainCREATE_SIMPLE_BLINKY_DEMO_ONLY */
}
/*-----------------------------------------------------------*/

View file

@ -240,13 +240,3 @@ unsigned long ulReceivedValue;
}
/*-----------------------------------------------------------*/
void vApplicationTickHook( void )
{
/* This function will be called by each tick interrupt if
configUSE_TICK_HOOK is set to 1 in FreeRTOSConfig.h. User code can be
added here, but the tick hook is called from an interrupt context, so
code must not attempt to block, and only the interrupt safe FreeRTOS API
functions can be used (those that end in FromISR()). */
}
/*-----------------------------------------------------------*/

View file

@ -314,15 +314,3 @@ unsigned long ulErrorFound = pdFALSE;
}
/*-----------------------------------------------------------*/
void vApplicationTickHook( void )
{
/* This function will be called by each tick interrupt if
configUSE_TICK_HOOK is set to 1 in FreeRTOSConfig.h. User code can be
added here, but the tick hook is called from an interrupt context, so
code must not attempt to block, and only the interrupt safe FreeRTOS API
functions can be used (those that end in FromISR()). In this case the tick
hook is used as part of the queue set test. */
vQueueSetWriteToQueueFromISR();
}
/*-----------------------------------------------------------*/

View file

@ -79,8 +79,11 @@
* queuesetINITIAL_ISR_TX_VALUE to 0xffffffffUL;
*/
/* Standard includes. */
#include <stdlib.h>
/* Kernel includes. */
#include <FreeRTOS.h>
#include "FreeRTOS.h"
#include "task.h"
#include "queue.h"
@ -245,7 +248,7 @@ static unsigned long ulCallCount = 0;
if( xQueues[ x ] != NULL )
{
/* xQueues[ x ] can be written to. Send the next value. */
if( xQueueSendFromISR( xQueues[ x ], &ulISRTxValue, NULL ) == pdPASS )
if( xQueueSendFromISR( xQueues[ x ], ( void * ) &ulISRTxValue, NULL ) == pdPASS )
{
ulISRTxValue++;