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

[freertos] / FreeRTOS / Demo / MicroBlaze_Spartan-6_EthernetLite / SDKProjects / RTOSDemo / main-blinky.c

diff --git a/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/main-blinky.c b/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/main-blinky.c
index f3b4b92ce9786ec5acc38954d88f7862347c5168..0e7c873f141f1a2aa1bbfdb91af940f9abfdefb9 100644 (file)
--- a/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/main-blinky.c
+++ b/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/main-blinky.c
@@ -128,8 +128,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 because it has the higher priority, meaning\r
@@ -143,7 +143,7 @@ the send task should always find the queue empty. */
 #define mainTIMER_CONTROLLED_LED                       0x02UL\r
 \r
 /* A block time of 0 simply means, "don't block". */\r
-#define mainDONT_BLOCK                                         ( portTickType ) 0\r
+#define mainDONT_BLOCK                                         ( TickType_t ) 0\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -162,7 +162,7 @@ static void prvQueueSendTask( void *pvParameters );
  * The LED timer callback function.  This does nothing but switch off the\r
  * LED defined by the mainTIMER_CONTROLLED_LED constant.\r
  */\r
-static void vLEDTimerCallback( xTimerHandle xTimer );\r
+static void vLEDTimerCallback( TimerHandle_t xTimer );\r
 \r
 /*\r
  * The handler executed each time a button interrupt is generated.  This ensures\r
@@ -175,11 +175,11 @@ static void prvButtonInputInterruptHandler( void *pvUnused );
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used by the queue send and queue receive tasks. */\r
-static xQueueHandle xQueue = NULL;\r
+static QueueHandle_t xQueue = NULL;\r
 \r
 /* The LED software timer.  This uses vLEDTimerCallback() as its callback\r
 function. */\r
-static xTimerHandle xLEDTimer = NULL;\r
+static TimerHandle_t xLEDTimer = NULL;\r
 \r
 /* Maintains the current LED output state. */\r
 static volatile unsigned char ucGPIOState = 0U;\r
@@ -226,7 +226,7 @@ int main( void )
        this file.  The timer is not actually started until a button interrupt is\r
        pushed, as it is not until that point that the LED is turned on. */\r
        xLEDTimer = xTimerCreate(       "LEDTimer",                             /* A text name, purely to help debugging. */\r
-                                                               ( 5000 / portTICK_RATE_MS ),/* The timer period, in this case 5000ms (5s). */\r
+                                                               ( 5000 / portTICK_PERIOD_MS ),/* The timer period, in this case 5000ms (5s). */\r
                                                                pdFALSE,                                        /* This is a one shot timer, so xAutoReload is set to pdFALSE. */\r
                                                                ( void * ) 0,                           /* The ID is not used, so can be set to anything. */\r
                                                                vLEDTimerCallback                       /* The callback function that switches the LED off. */\r
@@ -245,7 +245,7 @@ int main( void )
 /*-----------------------------------------------------------*/\r
 \r
 /* The callback is executed when the LED timer expires. */\r
-static void vLEDTimerCallback( xTimerHandle xTimer )\r
+static void vLEDTimerCallback( 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.  NOTE - accessing the LED port should use\r
@@ -286,7 +286,7 @@ long lHigherPriorityTaskWoken = pdFALSE;
 \r
 static void prvQueueSendTask( void *pvParameters )\r
 {\r
-portTickType xNextWakeTime;\r
+TickType_t xNextWakeTime;\r
 const unsigned long ulValueToSend = 100UL;\r
 \r
        /* Initialise xNextWakeTime - this only needs to be done once. */\r
@@ -410,7 +410,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