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

@ -85,7 +85,7 @@
#define configUSE_TICK_HOOK 1 /* Must be set to one for the timer interrupt to be cleared. */
#define configCPU_CLOCK_HZ ( 200000000UL )
#define configPERIPHERAL_CLOCK_HZ ( 50000000UL )
#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 140 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 36 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 12 )

View file

@ -128,7 +128,7 @@ int phyReset(void)
{
USHORT usData;
vTaskDelay( 2 / portTICK_RATE_MS );
vTaskDelay( 2 / portTICK_PERIOD_MS );
/* Read the status of the PHY */
usData = phyReadReg(PHY_BASIC_MODE_CONTROL);
@ -141,7 +141,7 @@ int phyReset(void)
phyWriteReg(PHY_BASIC_MODE_CONTROL, PHY_AN_ENABLE);
/* Auto negotiation will now take place wait for two seconds */
vTaskDelay( 2000 / portTICK_RATE_MS );
vTaskDelay( 2000 / portTICK_PERIOD_MS );
/* Success */
return 0;

View file

@ -109,7 +109,7 @@ static volatile unsigned short usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned
void vStartMathTasks( unsigned portBASE_TYPE uxPriority )
{
xTaskHandle xCreatedTask;
TaskHandle_t xCreatedTask;
/* Create one of the floating point tasks... */
xTaskCreate( vCompetingMathTask1, "Math1", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 0 ] ), uxPriority, &xCreatedTask );

View file

@ -175,11 +175,11 @@ stack than most of the other tasks. */
/* The rate at which mainCHECK_LED will toggle when all the tasks are running
without error. */
#define mainNO_ERROR_CYCLE_TIME ( 5000 / portTICK_RATE_MS )
#define mainNO_ERROR_CYCLE_TIME ( 5000 / portTICK_PERIOD_MS )
/* The rate at which mainCHECK_LED will toggle when an error has been reported
by at least one task. */
#define mainERROR_CYCLE_TIME ( 200 / portTICK_RATE_MS )
#define mainERROR_CYCLE_TIME ( 200 / portTICK_PERIOD_MS )
/*
* vApplicationMallocFailedHook() will only be called if
@ -254,7 +254,7 @@ unsigned long ulRunTime = 0UL;
*/
void main(void)
{
xTaskHandle xCreatedTask;
TaskHandle_t xCreatedTask;
prvSetupHardware();
@ -301,7 +301,7 @@ xTaskHandle xCreatedTask;
static void prvCheckTask( void *pvParameter )
{
portTickType xNextWakeTime, xCycleFrequency = mainNO_ERROR_CYCLE_TIME;
TickType_t xNextWakeTime, xCycleFrequency = mainNO_ERROR_CYCLE_TIME;
unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL;
/* Just to remove compiler warning. */
@ -413,7 +413,7 @@ void vApplicationIdleHook( void )
}
/*-----------------------------------------------------------*/
void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )
void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )
{
/* Just to remove compiler warnings. This function will only actually
get called if configCHECK_FOR_STACK_OVERFLOW is set to a non zero value.

View file

@ -87,7 +87,7 @@
/*-----------------------------------------------------------*/
/* How long to wait before attempting to connect the MAC again. */
#define uipINIT_WAIT ( 100 / portTICK_RATE_MS )
#define uipINIT_WAIT ( 100 / portTICK_PERIOD_MS )
/* Shortcut to the header within the Rx buffer. */
#define xHeader ((struct uip_eth_hdr *) &uip_buf[ 0 ])
@ -111,7 +111,7 @@ clock_time_t clock_time( void );
/*-----------------------------------------------------------*/
/* The semaphore used by the ISR to wake the uIP task. */
xSemaphoreHandle xEMACSemaphore = NULL;
SemaphoreHandle_t xEMACSemaphore = NULL;
/*-----------------------------------------------------------*/

View file

@ -78,7 +78,7 @@
#include "net/uip.h"
/* The time to wait between attempts to obtain a free buffer. */
#define emacBUFFER_WAIT_DELAY_ms ( 3 / portTICK_RATE_MS )
#define emacBUFFER_WAIT_DELAY_ms ( 3 / portTICK_PERIOD_MS )
/* The number of times emacBUFFER_WAIT_DELAY_ms should be waited before giving
up on attempting to obtain a free buffer all together. */
@ -95,7 +95,7 @@ more than two. */
#define emacNUM_BUFFERS ( emacNUM_RX_DESCRIPTORS + emacNUM_TX_BUFFERS )
/* The time to wait for the Tx descriptor to become free. */
#define emacTX_WAIT_DELAY_ms ( 10 / portTICK_RATE_MS )
#define emacTX_WAIT_DELAY_ms ( 10 / portTICK_PERIOD_MS )
/* The total number of times to wait emacTX_WAIT_DELAY_ms for the Tx descriptor to
become free. */
@ -503,7 +503,7 @@ static void prvSetupPortPinsAndReset( void )
EDMAC.EDMR.BIT.SWR = 1;
/* Crude wait for reset to complete. */
vTaskDelay( 500 / portTICK_RATE_MS );
vTaskDelay( 500 / portTICK_PERIOD_MS );
}
/*-----------------------------------------------------------*/
@ -543,7 +543,7 @@ void vEMAC_ISR_Handler( void )
{
unsigned long ul = EDMAC.EESR.LONG;
long lHigherPriorityTaskWoken = pdFALSE;
extern xSemaphoreHandle xEMACSemaphore;
extern SemaphoreHandle_t xEMACSemaphore;
static long ulTxEndInts = 0;
/* Has a Tx end occurred? */