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

@ -103,7 +103,7 @@ contained in such a queue. */
there to be space to post each character to the queue of characters waiting
transmission. NOTE! This is the time to wait per character - not the time to
wait for the entire string. */
#define serPUT_STRING_CHAR_DELAY ( 5 / portTICK_RATE_MS )
#define serPUT_STRING_CHAR_DELAY ( 5 / portTICK_PERIOD_MS )
/*-----------------------------------------------------------*/
@ -111,10 +111,10 @@ wait for the entire string. */
static USART_TypeDef * const xUARTS[ serNUM_COM_PORTS ] = { ( ( USART_TypeDef * ) USART1_BASE ), ( ( USART_TypeDef * ) USART2_BASE ) };
/* Queues used to hold characters waiting to be transmitted - one queue per port. */
static xQueueHandle xCharsForTx[ serNUM_COM_PORTS ] = { 0 };
static QueueHandle_t xCharsForTx[ serNUM_COM_PORTS ] = { 0 };
/* Queues holding received characters - one queue per port. */
static xQueueHandle xRxedChars[ serNUM_COM_PORTS ] = { 0 };
static QueueHandle_t xRxedChars[ serNUM_COM_PORTS ] = { 0 };
/*-----------------------------------------------------------*/
@ -229,7 +229,7 @@ GPIO_InitTypeDef GPIO_InitStructure;
}
/*-----------------------------------------------------------*/
signed long xSerialGetChar( long lPort, signed char *pcRxedChar, portTickType xBlockTime )
signed long xSerialGetChar( long lPort, signed char *pcRxedChar, TickType_t xBlockTime )
{
long lReturn = pdFAIL;
@ -279,7 +279,7 @@ unsigned long ul;
}
/*-----------------------------------------------------------*/
signed long xSerialPutChar( long lPort, signed char cOutChar, portTickType xBlockTime )
signed long xSerialPutChar( long lPort, signed char cOutChar, TickType_t xBlockTime )
{
long lReturn;

View file

@ -84,7 +84,7 @@ long lCOMPortInit( unsigned long ulPort, unsigned long ulWantedBaud );
* waiting in the Blocked state for up to xBlockTime ticks), otherwise pdFAIL
* will be returned.
*/
signed long xSerialPutChar( long lPort, signed char cOutChar, portTickType xBlockTime );
signed long xSerialPutChar( long lPort, signed char cOutChar, TickType_t xBlockTime );
/*
* Retrieve a character from the queue of received characters. As supplied 2
@ -96,7 +96,7 @@ signed long xSerialPutChar( long lPort, signed char cOutChar, portTickType xBloc
* character is successfully returned (possible after waiting in the Blocked
* state for up to xBlockTime ticks), otherwise pdFAIL will be returned.
*/
signed long xSerialGetChar( long lPort, signed char *pcRxedChar, portTickType xBlockTime );
signed long xSerialGetChar( long lPort, signed char *pcRxedChar, TickType_t xBlockTime );
/*
* Send a string of characters to a COM port. As supplied 2 COM ports are

View file

@ -82,7 +82,7 @@
#define configUSE_IDLE_HOOK 0
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned long ) 72000000 )
#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMAX_PRIORITIES ( 5 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 120 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 18 * 1024 ) )

View file

@ -126,8 +126,8 @@
/* The time between cycles of the 'check' task - which depends on whether the
check task has detected an error or not. */
#define mainCHECK_DELAY_NO_ERROR ( ( portTickType ) 5000 / portTICK_RATE_MS )
#define mainCHECK_DELAY_ERROR ( ( portTickType ) 500 / portTICK_RATE_MS )
#define mainCHECK_DELAY_NO_ERROR ( ( TickType_t ) 5000 / portTICK_PERIOD_MS )
#define mainCHECK_DELAY_ERROR ( ( TickType_t ) 500 / portTICK_PERIOD_MS )
/* The LED controlled by the 'check' task. */
#define mainCHECK_LED ( 3 )
@ -198,7 +198,7 @@ int main( void )
/* Described at the top of this file. */
static void prvCheckTask( void *pvParameters )
{
portTickType xLastExecutionTime;
TickType_t xLastExecutionTime;
unsigned long ulTicksToWait = mainCHECK_DELAY_NO_ERROR;
/* Just to remove the compiler warning about the unused parameter. */
@ -351,7 +351,7 @@ static void prvSetupHardware( void )
}
/*-----------------------------------------------------------*/
void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )
void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )
{
/* This function will get called if a task overflows its stack. If the
parameters are corrupt then inspect pxCurrentTCB to find which was the