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

[freertos] / FreeRTOS / Demo / CORTEX_A2F200_SoftConsole / main-full.c

diff --git a/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/main-full.c b/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/main-full.c
index 09a527babf6f5e8ad0498f244521102c3f4a8e5d..a83da7aa17d1e4f107bfb8ef1d69e8b0d9915c66 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/main-full.c
+++ b/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/main-full.c
@@ -174,8 +174,8 @@
 #define        mainQUEUE_SEND_TASK_PRIORITY            ( tskIDLE_PRIORITY + 1 )\r
 \r
 /* The rate at which data is sent to the queue, specified in milliseconds, and\r
-converted to ticks using the portTICK_RATE_MS constant. */\r
-#define mainQUEUE_SEND_FREQUENCY_MS                    ( 200 / portTICK_RATE_MS )\r
+converted to ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainQUEUE_SEND_FREQUENCY_MS                    ( 200 / portTICK_PERIOD_MS )\r
 \r
 /* The number of items the queue can hold.  This is 1 as the receive task\r
 will remove items as they are added, meaning the send task should always find\r
@@ -212,19 +212,19 @@ stack than most of the other tasks. */
 \r
 /* The period at which the check timer will expire, in ms, provided no errors\r
 have been reported by any of the standard demo tasks. */\r
-#define mainCHECK_TIMER_PERIOD_MS      ( 3000UL / portTICK_RATE_MS )\r
+#define mainCHECK_TIMER_PERIOD_MS      ( 3000UL / portTICK_PERIOD_MS )\r
 \r
 /* The period at which the OLED timer will expire.  Each time it expires, it's\r
 callback function updates the OLED text. */\r
-#define mainOLED_PERIOD_MS                     ( 75UL / portTICK_RATE_MS )\r
+#define mainOLED_PERIOD_MS                     ( 75UL / portTICK_PERIOD_MS )\r
 \r
 /* The period at which the check timer will expire, in ms, if an error has been\r
 reported in one of the standard demo tasks. */\r
-#define mainERROR_CHECK_TIMER_PERIOD_MS ( 500UL / portTICK_RATE_MS )\r
+#define mainERROR_CHECK_TIMER_PERIOD_MS ( 500UL / portTICK_PERIOD_MS )\r
 \r
 /* The LED will remain on until the button has not been pushed for a full\r
 5000ms. */\r
-#define mainLED_TIMER_PERIOD_MS                ( 5000UL / portTICK_RATE_MS )\r
+#define mainLED_TIMER_PERIOD_MS                ( 5000UL / portTICK_PERIOD_MS )\r
 \r
 /* A zero block time. */\r
 #define mainDONT_BLOCK                         ( 0UL )\r
@@ -245,12 +245,12 @@ static void prvQueueSendTask( void *pvParameters );
  * The LED timer callback function.  This does nothing but switch the red LED\r
  * off.\r
  */\r
-static void prvLEDTimerCallback( xTimerHandle xTimer );\r
+static void prvLEDTimerCallback( TimerHandle_t xTimer );\r
 \r
 /*\r
  * The check timer callback function, as described at the top of this file.\r
  */\r
-static void prvCheckTimerCallback( xTimerHandle xTimer );\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer );\r
 \r
 /*\r
  * This is not a 'standard' partest function, so the prototype is not in\r
@@ -273,15 +273,15 @@ static void prvOLEDTask( void * pvParameters);
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used by both application specific demo tasks defined in this file. */\r
-static xQueueHandle xQueue = NULL;\r
+static QueueHandle_t xQueue = NULL;\r
 \r
 /* The LED software timer.  This uses prvLEDTimerCallback() as it's callback\r
 function. */\r
-static xTimerHandle xLEDTimer = NULL;\r
+static TimerHandle_t xLEDTimer = NULL;\r
 \r
 /* The check timer.  This uses prvCheckTimerCallback() as it's callback\r
 function. */\r
-static xTimerHandle xCheckTimer = NULL;\r
+static TimerHandle_t xCheckTimer = NULL;\r
 \r
 /* The status message that is displayed at the bottom of the "task stats" web\r
 page, which is served by the uIP task.  This will report any errors picked up\r
@@ -357,7 +357,7 @@ int main(void)
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvCheckTimerCallback( xTimerHandle xTimer )\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer )\r
 {\r
        /* Check the standard demo tasks are running without error.   Latch the\r
        latest reported error in the pcStatusMessage character pointer. */\r
@@ -420,7 +420,7 @@ static void prvCheckTimerCallback( xTimerHandle xTimer )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvLEDTimerCallback( xTimerHandle xTimer )\r
+static void prvLEDTimerCallback( TimerHandle_t xTimer )\r
 {\r
        /* The timer has expired - so no button pushes have occurred in the last\r
        five seconds - turn the LED off. */\r
@@ -457,7 +457,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 \r
 static void prvQueueSendTask( void *pvParameters )\r
 {\r
-portTickType xNextWakeTime;\r
+TickType_t xNextWakeTime;\r
 const unsigned long ulValueToSend = 100UL;\r
 \r
        /* The timer command queue will have been filled when the timer test tasks\r
@@ -512,7 +512,7 @@ static void prvOLEDTask( void * pvParameters)
 {\r
 static struct oled_data xOLEDData;\r
 static unsigned char ucOffset1 = 0, ucOffset2 = 5;\r
-static portTickType xLastScrollTime = 0UL;\r
+static TickType_t xLastScrollTime = 0UL;\r
 \r
        /* Initialise the display. */\r
        OLED_init();\r
@@ -580,7 +580,7 @@ void vApplicationMallocFailedHook( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vApplicationStackOverflowHook( xTaskHandle pxTask, char *pcTaskName )\r
+void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName )\r
 {\r
        ( void ) pcTaskName;\r
        ( void ) pxTask;\r