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

4 files changed, 37 insertions, 37 deletions

diff --git a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h
index eeaf3ec3b..090a9014a 100644
--- a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h
@@ -90,7 +90,7 @@ assembly files that include this header file. */
 #define configUSE_IDLE_HOOK				1

 #define configUSE_TICK_HOOK				1

 #define configCPU_CLOCK_HZ				( SystemCoreClock )

-#define configTICK_RATE_HZ				( ( portTickType ) 1000 )

+#define configTICK_RATE_HZ				( ( TickType_t ) 1000 )

 #define configMAX_PRIORITIES			( 5 )

 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 90 )

 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 60 * 1024 ) )

diff --git a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main-full.c b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main-full.c
index e326b3c04..b1addc7ba 100644
--- a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main-full.c
+++ b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main-full.c
@@ -175,8 +175,8 @@
 #include "dynamic.h"

 

 /* The rate at which data is sent to the queue, specified in milliseconds, and

-converted to ticks using the portTICK_RATE_MS constant. */

-#define mainQUEUE_SEND_FREQUENCY_MS	( 200 / portTICK_RATE_MS )

+converted to ticks using the portTICK_PERIOD_MS constant. */

+#define mainQUEUE_SEND_FREQUENCY_MS	( 200 / portTICK_PERIOD_MS )

 

 /* The number of items the queue can hold.  This is 1 as the receive task

 will remove items as they are added, meaning the send task should always find

@@ -225,21 +225,21 @@ FreeRTOS.org web site to see which LEDs this relates to. */
 

 /* 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 	( 500UL / portTICK_RATE_MS )

+in ticks using the portTICK_PERIOD_MS constant. */

+#define mainERROR_CHECK_TIMER_PERIOD_MS 	( 500UL / portTICK_PERIOD_MS )

 

 /* The period at which the digit counter timer will expire, in ms, and converted

-to ticks using the portTICK_RATE_MS constant. */

-#define mainDIGIT_COUNTER_TIMER_PERIOD_MS 	( 250UL / portTICK_RATE_MS )

+to ticks using the portTICK_PERIOD_MS constant. */

+#define mainDIGIT_COUNTER_TIMER_PERIOD_MS 	( 250UL / portTICK_PERIOD_MS )

 

 /* The LED will remain on until the button has not been pushed for a full

 5000ms. */

-#define mainLED_TIMER_PERIOD_MS				( 5000UL / portTICK_RATE_MS )

+#define mainLED_TIMER_PERIOD_MS				( 5000UL / portTICK_PERIOD_MS )

 

 /* A zero block time. */

 #define mainDONT_BLOCK						( 0UL )

@@ -264,17 +264,17 @@ static void prvQueueSendTask( void *pvParameters );
 /*

  * The LED timer callback function.  This does nothing but switch an LED off.

  */

-static void prvLEDTimerCallback( xTimerHandle xTimer );

+static void prvLEDTimerCallback( TimerHandle_t xTimer );

 

 /*

  * The check timer callback function, as described at the top of this file.

  */

-static void prvCheckTimerCallback( xTimerHandle xTimer );

+static void prvCheckTimerCallback( TimerHandle_t xTimer );

 

 /*

  * The digit counter callback function, as described at the top of this file.

  */

-static void prvDigitCounterTimerCallback( xTimerHandle xTimer );

+static void prvDigitCounterTimerCallback( TimerHandle_t xTimer );

 

 /*

  * This is not a 'standard' partest function, so the prototype is not in

@@ -285,19 +285,19 @@ void vParTestSetLEDFromISR( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE x
 /*-----------------------------------------------------------*/

 

 /* The queue used by both application specific demo tasks defined in this file. */

-static xQueueHandle xQueue = NULL;

+static QueueHandle_t xQueue = NULL;

 

 /* The LED software timer.  This uses prvLEDTimerCallback() as it's callback

 function. */

-static xTimerHandle xLEDTimer = NULL;

+static TimerHandle_t xLEDTimer = NULL;

 

 /* The digit counter software timer.  This displays a counting digit on one half

 of the seven segment displays. */

-static xTimerHandle xDigitCounterTimer = NULL;

+static TimerHandle_t xDigitCounterTimer = NULL;

 

 /* The check timer.  This uses prvCheckTimerCallback() as its callback

 function. */

-static xTimerHandle xCheckTimer = NULL;

+static TimerHandle_t xCheckTimer = NULL;

 

 /* If an error is detected in a standard demo task, then pcStatusMessage will

 be set to point to a string that identifies the offending task.  This is just

@@ -384,7 +384,7 @@ int main(void)
 }

 /*-----------------------------------------------------------*/

 

-static void prvCheckTimerCallback( xTimerHandle xTimer )

+static void prvCheckTimerCallback( TimerHandle_t xTimer )

 {

 	/* Check the standard demo tasks are running without error.   Latch the

 	latest reported error in the pcStatusMessage character pointer. */

@@ -467,7 +467,7 @@ static void prvCheckTimerCallback( xTimerHandle xTimer )
 }

 /*-----------------------------------------------------------*/

 

-static void prvLEDTimerCallback( xTimerHandle xTimer )

+static void prvLEDTimerCallback( TimerHandle_t xTimer )

 {

 	/* The timer has expired - so no button pushes have occurred in the last

 	five seconds - turn the LED off. */

@@ -475,7 +475,7 @@ static void prvLEDTimerCallback( xTimerHandle xTimer )
 }

 /*-----------------------------------------------------------*/

 

-static void prvDigitCounterTimerCallback( xTimerHandle xTimer )

+static void prvDigitCounterTimerCallback( TimerHandle_t xTimer )

 {

 /* Define the bit patterns that display numbers on the seven segment display. */

 static const unsigned short usNumbersPatterns[] = { 0xC000U, 0xF900U, 0xA400U, 0xB000U, 0x9900U, 0x9200U, 0x8200U, 0xF800U, 0x8000U, 0x9000U };

@@ -526,7 +526,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 

 static void prvQueueSendTask( void *pvParameters )

 {

-portTickType xNextWakeTime;

+TickType_t xNextWakeTime;

 const unsigned long ulValueToSend = 100UL;

 

 	/* The timer command queue will have been filled when the timer test tasks

@@ -622,7 +622,7 @@ void vApplicationMallocFailedHook( void )
 }

 /*-----------------------------------------------------------*/

 

-void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )

+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )

 {

 	( void ) pcTaskName;

 	( void ) pxTask;

diff --git a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main_blinky.c b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main_blinky.c
index 0f30ea94c..89a758cdf 100644
--- a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main_blinky.c
+++ b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/main_blinky.c
@@ -128,8 +128,8 @@
 #define	mainQUEUE_SEND_TASK_PRIORITY		( tskIDLE_PRIORITY + 1 )

 

 /* The rate at which data is sent to the queue, specified in milliseconds, and

-converted to ticks using the portTICK_RATE_MS constant. */

-#define mainQUEUE_SEND_FREQUENCY_MS			( 200 / portTICK_RATE_MS )

+converted to ticks using the portTICK_PERIOD_MS constant. */

+#define mainQUEUE_SEND_FREQUENCY_MS			( 200 / portTICK_PERIOD_MS )

 

 /* The number of items the queue can hold.  This is 1 as the receive task

 will remove items as they are added, meaning the send task should always find

@@ -159,16 +159,16 @@ static void prvQueueSendTask( void *pvParameters );
  * The LED timer callback function.  This does nothing but switch off the

  * LED defined by the mainTIMER_CONTROLLED_LED constant.

  */

-static void vLEDTimerCallback( xTimerHandle xTimer );

+static void vLEDTimerCallback( TimerHandle_t xTimer );

 

 /*-----------------------------------------------------------*/

 

 /* The queue used by both tasks. */

-static xQueueHandle xQueue = NULL;

+static QueueHandle_t xQueue = NULL;

 

 /* The LED software timer.  This uses vLEDTimerCallback() as its callback

 function. */

-static xTimerHandle xLEDTimer = NULL;

+static TimerHandle_t xLEDTimer = NULL;

 

 /*-----------------------------------------------------------*/

 

@@ -191,7 +191,7 @@ int main(void)
 		if the button is not pushed within 5000ms, as described at the top of

 		this file. */

 		xLEDTimer = xTimerCreate( 	"LEDTimer", 				/* A text name, purely to help debugging. */

-									( 5000 / portTICK_RATE_MS ),/* The timer period, in this case 5000ms (5s). */

+									( 5000 / portTICK_PERIOD_MS ),/* The timer period, in this case 5000ms (5s). */

 									pdFALSE,					/* This is a one shot timer, so xAutoReload is set to pdFALSE. */

 									( void * ) 0,				/* The ID is not used, so can be set to anything. */

 									vLEDTimerCallback			/* The callback function that switches the LED off. */

@@ -210,7 +210,7 @@ int main(void)
 }

 /*-----------------------------------------------------------*/

 

-static void vLEDTimerCallback( xTimerHandle xTimer )

+static void vLEDTimerCallback( TimerHandle_t xTimer )

 {

 	/* The timer has expired - so no button pushes have occurred in the last

 	five seconds - turn the LED off.  NOTE - accessing the LED port should use

@@ -251,7 +251,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 

 static void prvQueueSendTask( void *pvParameters )

 {

-portTickType xNextWakeTime;

+TickType_t xNextWakeTime;

 const unsigned long ulValueToSend = 100UL;

 

 	/* Initialise xNextWakeTime - this only needs to be done once. */

@@ -362,7 +362,7 @@ void vApplicationMallocFailedHook( void )
 }

 /*-----------------------------------------------------------*/

 

-void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )

+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )

 {

 	( void ) pcTaskName;

 	( void ) pxTask;

diff --git a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/serial.c b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/serial.c
index 387a6f2f3..590ebeef7 100644
--- a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/serial.c
+++ b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/serial.c
@@ -102,14 +102,14 @@
 #define serTX_INT				0x02

 

 /* Misc defines. */

-#define serINVALID_QUEUE				( ( xQueueHandle ) 0 )

-#define serNO_BLOCK						( ( portTickType ) 0 )

+#define serINVALID_QUEUE				( ( QueueHandle_t ) 0 )

+#define serNO_BLOCK						( ( TickType_t ) 0 )

 

 /*-----------------------------------------------------------*/

 

 /* The queue used to hold received characters. */

-static xQueueHandle xRxedChars;

-static xQueueHandle xCharsForTx;

+static QueueHandle_t xRxedChars;

+static QueueHandle_t xCharsForTx;

 

 /*-----------------------------------------------------------*/

 

@@ -176,7 +176,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 port. */

 	( void ) pxPort;

@@ -218,7 +218,7 @@ signed char *pxNext;
 }

 /*-----------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime )

 {

 signed portBASE_TYPE xReturn;