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

5 files changed, 17 insertions, 17 deletions

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c
index bb28bb5d9..63273b752 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Blinky-Demo/main_blinky.c
@@ -117,8 +117,8 @@
 #define	mainQUEUE_SEND_TASK_PRIORITY		( tskIDLE_PRIORITY + 1 )

 

 /* The rate at which data is sent to the queue.  The 200ms value is converted

-to ticks using the portTICK_RATE_MS constant. */

-#define mainQUEUE_SEND_FREQUENCY_MS			( 200 / portTICK_RATE_MS )

+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

@@ -147,7 +147,7 @@ void main_blinky( void );
 /*-----------------------------------------------------------*/

 

 /* The queue used by both tasks. */

-static xQueueHandle xQueue = NULL;

+static QueueHandle_t xQueue = NULL;

 

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

 

@@ -184,7 +184,7 @@ void main_blinky( void )
 

 static void prvQueueSendTask( void *pvParameters )

 {

-portTickType xNextWakeTime;

+TickType_t xNextWakeTime;

 const unsigned long ulValueToSend = 100UL;

 

 	/* Check the task parameter is as expected. */

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h
index 32a94cd79..531301853 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h
@@ -107,7 +107,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_IDLE_HOOK				1

 #define configUSE_TICK_HOOK				0

 #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 ) 80 )

 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 25000 ) )

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c
index 9cc962ba8..af815a41b 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/UARTCommandConsole.c
@@ -83,7 +83,7 @@
 #define cmdMAX_INPUT_SIZE		50

 

 /* The maximum time in ticks to wait for the UART access mutex. */

-#define cmdMAX_MUTEX_WAIT		( 200 / portTICK_RATE_MS )

+#define cmdMAX_MUTEX_WAIT		( 200 / portTICK_PERIOD_MS )

 

 /* Characters are only ever received slowly on the CLI so it is ok to pass

 received characters from the UART interrupt to the task on a queue.  This sets

@@ -129,7 +129,7 @@ static const char * const pcNewLine = "\r\n";
 /* Because characters are received slowly (at the speed somebody can type) then

 it is ok to pass received characters from the Rx interrupt to the task on a

 queue.  This is the queue used for that purpose. */

-static xQueueHandle xRxedChars = NULL;

+static QueueHandle_t xRxedChars = NULL;

 

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

 

@@ -251,7 +251,7 @@ portBASE_TYPE xReturned;
 

 static void prvSendBuffer( const char * pcBuffer, size_t xBufferLength )

 {

-const portTickType xVeryShortDelay = 2UL;

+const TickType_t xVeryShortDelay = 2UL;

 

 	if( xBufferLength > 0 )

 	{

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c
index 851654531..a3cf956c5 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/main_full.c
@@ -151,13 +151,13 @@
 

 /* The period after 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 )

 

 /* The standard demo flash timers can be used to flash any number of LEDs.  In

 this case, because only three LEDs are available, and one is in use by the

@@ -178,7 +178,7 @@ task. */
 /*

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

  */

-static void prvCheckTimerCallback( xTimerHandle xTimer );

+static void prvCheckTimerCallback( TimerHandle_t xTimer );

 

 /*

  * Register commands that can be used with FreeRTOS+CLI.  The commands are

@@ -203,7 +203,7 @@ extern void vCreateAndVerifySampleFiles( void );
 

 void main_full( void )

 {

-xTimerHandle xCheckTimer = NULL;

+TimerHandle_t xCheckTimer = NULL;

 

 	/* Prepare to run the full demo: Configure the IO, register the CLI

 	commands, and depending on configuration, generate a set of sample files on

@@ -259,7 +259,7 @@ xTimerHandle xCheckTimer = NULL;
 }

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

 

-static void prvCheckTimerCallback( xTimerHandle xTimer )

+static void prvCheckTimerCallback( TimerHandle_t xTimer )

 {

 static long lChangedTimerPeriodAlready = pdFALSE;

 unsigned long ulErrorFound = pdFALSE;

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c
index 3185525f8..f0d40a2a5 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/main.c
@@ -103,7 +103,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 );

 

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

@@ -196,7 +196,7 @@ void vApplicationIdleHook( void )
 }

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

 

-void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )

+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )

 {

 	( void ) pcTaskName;

 	( void ) pxTask;