From 012a7c9b61ece5aec5c3a98e728e59fdcc9329ae Mon Sep 17 00:00:00 2001 From: rtel Date: Tue, 11 Feb 2014 12:04:59 +0000 Subject: Update the demo directory to use the version 8 type naming conventions. git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2202 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h | 2 +- .../PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c | 2 +- FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c | 2 +- FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c | 12 ++++++------ .../Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo') diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h index 255b5e1aa..b3c7d6670 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h @@ -83,7 +83,7 @@ #define configUSE_TICK_HOOK 0 #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 250 ) #define configCPU_CLOCK_HZ ( ( unsigned long ) 200000000 ) /* Clock setup from start.asm in the demo application. */ -#define configTICK_RATE_HZ ( (portTickType) 1000 ) +#define configTICK_RATE_HZ ( (TickType_t) 1000 ) #define configMAX_PRIORITIES ( 6 ) #define configTOTAL_HEAP_SIZE ( (size_t) (80 * 1024) ) #define configMAX_TASK_NAME_LEN ( 20 ) diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c index 1e73f1386..20f3fe939 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c @@ -135,7 +135,7 @@ static volatile unsigned long ulFlop1CycleCount = 0, ulFlop2CycleCount = 0; void vStartFlopRegTests( void ) { -xTaskHandle xTaskJustCreated; +TaskHandle_t xTaskJustCreated; unsigned portBASE_TYPE x, y, z = flopSTART_VALUE; /* Fill the arrays into which the flop registers are to be saved with diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c index c5caff113..825d41a77 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c @@ -114,7 +114,7 @@ static unsigned long ulFlopRegisters[ mathNUMBER_OF_TASKS ][ portNO_FLOP_REGISTE void vStartMathTasks( unsigned portBASE_TYPE uxPriority ) { -xTaskHandle xTaskJustCreated; +TaskHandle_t xTaskJustCreated; portBASE_TYPE x, y; /* Place known values into the buffers into which the flop registers are diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c index 58592da68..00418e11f 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c @@ -137,8 +137,8 @@ baud rate parameters passed into the comtest initialisation has no effect. */ the check LED will toggle every mainNO_ERROR_CHECK_DELAY milliseconds. If an error has been found at any time then the toggle rate will increase to mainERROR_CHECK_DELAY milliseconds. */ -#define mainNO_ERROR_CHECK_DELAY ( ( portTickType ) 3000 / portTICK_RATE_MS ) -#define mainERROR_CHECK_DELAY ( ( portTickType ) 500 / portTICK_RATE_MS ) +#define mainNO_ERROR_CHECK_DELAY ( ( TickType_t ) 3000 / portTICK_PERIOD_MS ) +#define mainERROR_CHECK_DELAY ( ( TickType_t ) 500 / portTICK_PERIOD_MS ) /* @@ -338,7 +338,7 @@ static unsigned long ulLastRegTest1Counter= 0UL, ulLastRegTest2Counter = 0UL; static void prvErrorChecks( void *pvParameters ) { -portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY, xLastExecutionTime; +TickType_t xDelayPeriod = mainNO_ERROR_CHECK_DELAY, xLastExecutionTime; volatile unsigned portBASE_TYPE uxFreeStack; /* Just to remove compiler warning. */ @@ -697,11 +697,11 @@ static void prvRegTestTask2( void *pvParameters ) /* This hook function will get called if there is a suspected stack overflow. 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 char *pcTaskName ); -void vApplicationStackOverflowHook( xTaskHandle xTask, signed char *pcTaskName ) +void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ); +void vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) { /* To prevent the optimiser removing the variables. */ -volatile xTaskHandle xTaskIn = xTask; +volatile TaskHandle_t xTaskIn = xTask; volatile signed char *pcTaskNameIn = pcTaskName; /* Remove compiler warnings. */ diff --git a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c index 6838120ec..a79f2c594 100644 --- a/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c +++ b/FreeRTOS/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c @@ -85,8 +85,8 @@ /* Queues used to hold received characters, and characters waiting to be transmitted. */ -static xQueueHandle xRxedChars; -static xQueueHandle xCharsForTx; +static QueueHandle_t xRxedChars; +static QueueHandle_t xCharsForTx; /* Structure that maintains information on the UART being used. */ static XUartLite xUART; @@ -133,7 +133,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned port } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime ) { /* The port handle is not required as this driver only supports one UART. */ ( void ) pxPort; @@ -151,7 +151,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedC } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime ) { portBASE_TYPE xReturn = pdTRUE; -- cgit v1.2.1