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

[freertos] / FreeRTOS / Demo / WIN32-MingW / main_full.c

diff --git a/FreeRTOS/Demo/WIN32-MingW/main_full.c b/FreeRTOS/Demo/WIN32-MingW/main_full.c
index dcc496bf6cb0b5af9d823724c5259fda5dc21508..099a8aead079ca2028536573787113d983e89ffc 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MingW/main_full.c
@@ -185,7 +185,7 @@ static char *pcStatusMessage = "OK";
 \r
 /* This semaphore is created purely to test using the vSemaphoreDelete() and\r
 semaphore tracing API functions.  It has no other purpose. */\r
-static xSemaphoreHandle xMutexToDelete = NULL;\r
+static SemaphoreHandle_t xMutexToDelete = NULL;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -238,8 +238,8 @@ int main_full( void )
 \r
 static void prvCheckTask( void *pvParameters )\r
 {\r
-portTickType xNextWakeTime;\r
-const portTickType xCycleFrequency = 2500 / portTICK_RATE_MS;\r
+TickType_t xNextWakeTime;\r
+const TickType_t xCycleFrequency = 2500 / portTICK_PERIOD_MS;\r
 \r
        /* Just to remove compiler warning. */\r
        ( void ) pvParameters;\r
@@ -355,11 +355,11 @@ void *pvAllocated;
 \r
 /* These three functions are only meant for use by trace code, and not for\r
 direct use from application code, hence their prototypes are not in queue.h. */\r
-extern void vQueueSetQueueNumber( xQueueHandle pxQueue, unsigned portBASE_TYPE uxQueueNumber );\r
-extern unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle pxQueue );\r
-extern uint8_t ucQueueGetQueueType( xQueueHandle pxQueue );\r
-extern void vTaskSetTaskNumber( xTaskHandle xTask, unsigned portBASE_TYPE uxHandle );\r
-extern unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask );\r
+extern void vQueueSetQueueNumber( QueueHandle_t pxQueue, unsigned portBASE_TYPE uxQueueNumber );\r
+extern unsigned portBASE_TYPE uxQueueGetQueueNumber( QueueHandle_t pxQueue );\r
+extern uint8_t ucQueueGetQueueType( QueueHandle_t pxQueue );\r
+extern void vTaskSetTaskNumber( TaskHandle_t xTask, unsigned portBASE_TYPE uxHandle );\r
+extern unsigned portBASE_TYPE uxTaskGetTaskNumber( TaskHandle_t xTask );\r
 \r
        /* Sleep to reduce CPU load, but don't sleep indefinitely in case there are\r
        tasks waiting to be terminated by the idle task. */\r
@@ -458,11 +458,11 @@ const TickType_t xDontBlock = 0; /* This is called from the idle task so must *n
 \r
 static void prvDemonstrateTaskStateAndHandleGetFunctions( void )\r
 {\r
-xTaskHandle xIdleTaskHandle, xTimerTaskHandle;\r
+TaskHandle_t xIdleTaskHandle, xTimerTaskHandle;\r
 const unsigned char ucConstTaskNumber = 0x55U;\r
 char *pcTaskName;\r
 static portBASE_TYPE xPerformedOneShotTests = pdFALSE;\r
-xTaskHandle xTestTask;\r
+TaskHandle_t xTestTask;\r
 \r
        /* Demonstrate the use of the xTimerGetTimerDaemonTaskHandle() and\r
        xTaskGetIdleTaskHandle() functions.  Also try using the function that sets\r
@@ -535,7 +535,7 @@ xTaskHandle xTestTask;
 \r
 static void prvDemoQueueSpaceFunctions( void *pvParameters )\r
 {\r
-xQueueHandle xQueue = NULL;\r
+QueueHandle_t xQueue = NULL;\r
 const unsigned portBASE_TYPE uxQueueLength = 10;\r
 unsigned portBASE_TYPE uxReturn, x;\r
 \r