Update the demo directory to use the version 8 type naming conventions.

4 files changed, 12 insertions, 12 deletions

diff --git a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/AT91Lib/components/hx8347/hx8347.c b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/AT91Lib/components/hx8347/hx8347.c
index 6c99d52c0..61d44cbcc 100644
--- a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/AT91Lib/components/hx8347/hx8347.c
+++ b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/AT91Lib/components/hx8347/hx8347.c
@@ -158,7 +158,7 @@ typedef volatile unsigned short REG16;
 // External delay 1 ms function

 #include "FreeRTOS.h"

 #include "task.h"

-#define Delay(ms) vTaskDelay(ms/portTICK_RATE_MS)

+#define Delay(ms) vTaskDelay(ms/portTICK_PERIOD_MS)

 

 //------------------------------------------------------------------------------

 //         Global functions

diff --git a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h
index 552d70aed..46caf2daf 100644
--- a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h
@@ -82,7 +82,7 @@
 #define configUSE_IDLE_HOOK				0

 #define configUSE_TICK_HOOK				1

 #define configCPU_CLOCK_HZ				( ( unsigned long ) 48000000 )

-#define configTICK_RATE_HZ				( ( portTickType ) 1000 )

+#define configTICK_RATE_HZ				( ( TickType_t ) 1000 )

 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 70 )

 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 24000 ) )

 #define configMAX_TASK_NAME_LEN			( 12 )

diff --git a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/main.c b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/main.c
index 3e6a8cf5d..67d8f1167 100644
--- a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/main.c
+++ b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/main.c
@@ -123,7 +123,7 @@
 

 /* The time between cycles of the 'check' functionality (defined within the

 tick hook). */

-#define mainCHECK_DELAY						( ( portTickType ) 5000 / portTICK_RATE_MS )

+#define mainCHECK_DELAY						( ( TickType_t ) 5000 / portTICK_PERIOD_MS )

 

 /* The LCD task uses the sprintf function so requires a little more stack too. */

 #define mainLCD_TASK_STACK_SIZE				( configMINIMAL_STACK_SIZE * 2 )

@@ -163,7 +163,7 @@ static void prvLCDTask( void *pvParameters );
  * Hook functions that can get called by the kernel.  The 'check' functionality

  * is implemented within the tick hook.

  */

-void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName );

+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName );

 

 /*

  * The tick hook function as described in the comments at the top of this file.

@@ -177,7 +177,7 @@ void vApplicationTickHook( void );
 /*-----------------------------------------------------------*/

 

 /* The queue used to send messages to the LCD task. */

-static xQueueHandle xLCDQueue;

+static QueueHandle_t xLCDQueue;

 

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

 

@@ -280,7 +280,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 }

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

 

-void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )

+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )

 {

 	( void ) pxTask;

 	( void ) pcTaskName;

diff --git a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c
index d907f66bf..a27dce261 100644
--- a/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c
+++ b/FreeRTOS/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c
@@ -91,17 +91,17 @@
 #define vInterruptOff()					BOARD_USART_BASE->US_IDR = AT91C_US_TXRDY

 

 /* Misc constants. */

-#define serINVALID_QUEUE				( ( xQueueHandle ) 0 )

+#define serINVALID_QUEUE				( ( QueueHandle_t ) 0 )

 #define serHANDLE						( ( xComPortHandle ) 1 )

-#define serNO_BLOCK						( ( portTickType ) 0 )

+#define serNO_BLOCK						( ( TickType_t ) 0 )

 #define serNO_TIMEGUARD					( ( unsigned long ) 0 )

 #define serNO_PERIPHERAL_B_SETUP		( ( unsigned long ) 0 )

 

 

 /* 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;

 

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

 

@@ -161,7 +161,7 @@ const Pin xUSART_Pins[] = { BOARD_PIN_USART_RXD, BOARD_PIN_USART_TXD };
 }

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

 

-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;

@@ -203,7 +203,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 )

 {

 	/* Place the character in the queue of characters to be transmitted. */

 	if( xQueueSend( xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )