Update the demo directory to use the version 8 type naming conventions.

This commit is contained in:
Richard Barry 2014-02-11 12:04:59 +00:00
parent c6d8892b0d
commit 5a2a8fc319
639 changed files with 3127 additions and 3470 deletions

View file

@ -106,7 +106,7 @@
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ICLK_HZ ) /* Set in mcu_info.h. */
#define configPERIPHERAL_CLOCK_HZ ( PCLKB_HZ ) /* Set in muc_info.h. */
#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 100 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 9 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 12 )

View file

@ -96,7 +96,7 @@ extern void main_full( void );
within this file. */
void vApplicationMallocFailedHook( void );
void vApplicationIdleHook( void );
void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName );
void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName );
void vApplicationTickHook( void );
/*-----------------------------------------------------------*/
@ -155,7 +155,7 @@ void vApplicationIdleHook( void )
}
/*-----------------------------------------------------------*/
void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )
void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )
{
( void ) pcTaskName;
( void ) pxTask;

View file

@ -144,13 +144,13 @@ The tasks check that the values are passed in correctly. */
/* The period at which the check timer will expire, in ms, provided no errors
have been reported by any of the standard demo tasks. ms are converted to the
equivalent in ticks using the portTICK_RATE_MS constant. */
#define mainCHECK_TIMER_PERIOD_MS ( 3000UL / portTICK_RATE_MS )
equivalent in ticks using the portTICK_PERIOD_MS constant. */
#define mainCHECK_TIMER_PERIOD_MS ( 3000UL / portTICK_PERIOD_MS )
/* The period at which the check timer will expire, in ms, if an error has been
reported in one of the standard demo tasks. ms are converted to the equivalent
in ticks using the portTICK_RATE_MS constant. */
#define mainERROR_CHECK_TIMER_PERIOD_MS ( 200UL / portTICK_RATE_MS )
in ticks using the portTICK_PERIOD_MS constant. */
#define mainERROR_CHECK_TIMER_PERIOD_MS ( 200UL / portTICK_PERIOD_MS )
/* A block time of zero simple means "Don't Block". */
#define mainDONT_BLOCK ( 0UL )
@ -171,7 +171,7 @@ static void prvRegTest2Implementation( void );
/*
* The check timer callback function, as described at the top of this file.
*/
static void prvCheckTimerCallback( xTimerHandle xTimer );
static void prvCheckTimerCallback( TimerHandle_t xTimer );
/*-----------------------------------------------------------*/
@ -184,7 +184,7 @@ unsigned long ulRegTest1CycleCount = 0UL, ulRegTest2CycleCount = 0UL;
/* The check timer. This uses prvCheckTimerCallback() as its callback
function. */
static xTimerHandle xCheckTimer = NULL;
static TimerHandle_t xCheckTimer = NULL;
/*-----------------------------------------------------------*/
@ -230,7 +230,7 @@ void main_full( void )
}
/*-----------------------------------------------------------*/
static void prvCheckTimerCallback( xTimerHandle xTimer )
static void prvCheckTimerCallback( TimerHandle_t xTimer )
{
static long lChangedTimerPeriodAlready = pdFALSE, lErrorStatus = pdPASS;
static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL;

View file

@ -213,10 +213,10 @@ void vButtonInterruptCallback( void );
/*-----------------------------------------------------------*/
/* The queue to pass data from the Tx task to the Rx task. */
static xQueueHandle xQueue = NULL;
static QueueHandle_t xQueue = NULL;
/* The semaphore that is 'given' by interrupts generated from button pushes. */
static xSemaphoreHandle xSemaphore = NULL;
static SemaphoreHandle_t xSemaphore = NULL;
/*-----------------------------------------------------------*/
@ -257,7 +257,7 @@ void main_low_power( void )
static void prvQueueSendTask( void *pvParameters )
{
portTickType xDelay;
TickType_t xDelay;
const unsigned long ulValueToSend = mainQUEUED_VALUE;
/* Remove compiler warning about unused parameter. */
@ -267,7 +267,7 @@ const unsigned long ulValueToSend = mainQUEUED_VALUE;
{
/* The delay period between successive sends to the queue is set by
the potentiometer reading. */
xDelay = ( portTickType ) prvReadPOT();
xDelay = ( TickType_t ) prvReadPOT();
/* If the block time is greater than 3000 milliseconds then block
indefinitely waiting for a button push. */
@ -280,7 +280,7 @@ const unsigned long ulValueToSend = mainQUEUED_VALUE;
else
{
/* Convert a time in milliseconds to a time in ticks. */
xDelay /= portTICK_RATE_MS;
xDelay /= portTICK_PERIOD_MS;
/* Place this task in the blocked state until it is time to run
again. As this is not an indefinite sleep the kernel will place