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

[freertos] / FreeRTOS / Demo / dsPIC_MPLAB / main.c

diff --git a/FreeRTOS/Demo/dsPIC_MPLAB/main.c b/FreeRTOS/Demo/dsPIC_MPLAB/main.c
index 9e7ee37620eb6ab82bc1c923cf133b1d9d9d19d9..02b71693c9bb65b7085ab75a23ade16d81c68b96 100644 (file)
--- a/FreeRTOS/Demo/dsPIC_MPLAB/main.c
+++ b/FreeRTOS/Demo/dsPIC_MPLAB/main.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r
@@ -69,27 +70,27 @@
  * defined and/or created within this file:\r
  *\r
  * "Fast Interrupt Test" - A high frequency periodic interrupt is generated\r
- * using a free running timer to demonstrate the use of the \r
- * configKERNEL_INTERRUPT_PRIORITY configuration constant.  The interrupt \r
+ * using a free running timer to demonstrate the use of the\r
+ * configKERNEL_INTERRUPT_PRIORITY configuration constant.  The interrupt\r
  * service routine measures the number of processor clocks that occur between\r
- * each interrupt - and in so doing measures the jitter in the interrupt \r
- * timing.  The maximum measured jitter time is latched in the usMaxJitter \r
- * variable, and displayed on the LCD by the 'Check' as described below.  \r
- * The fast interrupt is configured and handled in the timer_test.c source \r
+ * each interrupt - and in so doing measures the jitter in the interrupt\r
+ * timing.  The maximum measured jitter time is latched in the usMaxJitter\r
+ * variable, and displayed on the LCD by the 'Check' as described below.\r
+ * The fast interrupt is configured and handled in the timer_test.c source\r
  * file.\r
  *\r
  * "LCD" task - the LCD task is a 'gatekeeper' task.  It is the only task that\r
  * is permitted to access the LCD directly.  Other tasks wishing to write a\r
- * message to the LCD send the message on a queue to the LCD task instead of \r
- * accessing the LCD themselves.  The LCD task just blocks on the queue waiting \r
+ * message to the LCD send the message on a queue to the LCD task instead of\r
+ * accessing the LCD themselves.  The LCD task just blocks on the queue waiting\r
  * for messages - waking and displaying the messages as they arrive.  The LCD\r
- * task is defined in lcd.c.  \r
- * \r
- * "Check" task -  This only executes every three seconds but has the highest \r
- * priority so is guaranteed to get processor time.  Its main function is to \r
+ * task is defined in lcd.c.\r
+ *\r
+ * "Check" task -  This only executes every three seconds but has the highest\r
+ * priority so is guaranteed to get processor time.  Its main function is to\r
  * check that all the standard demo tasks are still operational.  Should any\r
  * unexpected behaviour within a demo task be discovered the 'check' task will\r
- * write "FAIL #n" to the LCD (via the LCD task).  If all the demo tasks are \r
+ * write "FAIL #n" to the LCD (via the LCD task).  If all the demo tasks are\r
  * executing with their expected behaviour then the check task writes the max\r
  * jitter time to the LCD (again via the LCD task), as described above.\r
  */\r
@@ -122,7 +123,7 @@
 #define mainCHECK_TAKS_STACK_SIZE                      ( configMINIMAL_STACK_SIZE * 2 )\r
 \r
 /* The execution period of the check task. */\r
-#define mainCHECK_TASK_PERIOD                          ( ( portTickType ) 3000 / portTICK_RATE_MS )\r
+#define mainCHECK_TASK_PERIOD                          ( ( TickType_t ) 3000 / portTICK_PERIOD_MS )\r
 \r
 /* The number of flash co-routines to create. */\r
 #define mainNUM_FLASH_COROUTINES                       ( 5 )\r
@@ -163,7 +164,7 @@ static void prvSetupHardware( void );
 /*-----------------------------------------------------------*/\r
 \r
 /* The queue used to send messages to the LCD task. */\r
-static xQueueHandle xLCDQueue;\r
+static QueueHandle_t xLCDQueue;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -176,14 +177,14 @@ int main( void )
        prvSetupHardware();\r
 \r
        /* Create the standard demo tasks. */\r
-       vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );       \r
+       vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
        vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vStartFlashCoRoutines( mainNUM_FLASH_COROUTINES );\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
        vCreateBlockTimeTasks();\r
 \r
        /* Create the test tasks defined within this file. */\r
-       xTaskCreate( vCheckTask, ( signed char * ) "Check", mainCHECK_TAKS_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+       xTaskCreate( vCheckTask, "Check", mainCHECK_TAKS_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
 \r
        /* Start the task that will control the LCD.  This returns the handle\r
        to the queue used to write text out to the task. */\r
@@ -210,7 +211,7 @@ static void prvSetupHardware( void )
 static void vCheckTask( void *pvParameters )\r
 {\r
 /* Used to wake the task at the correct frequency. */\r
-portTickType xLastExecutionTime; \r
+TickType_t xLastExecutionTime;\r
 \r
 /* The maximum jitter time measured by the fast interrupt test. */\r
 extern unsigned short usMaxJitter ;\r
@@ -243,7 +244,7 @@ unsigned short usErrorDetected = pdFALSE;
                        usErrorDetected = pdTRUE;\r
                        sprintf( cStringBuffer, "FAIL #1" );\r
                }\r
-       \r
+\r
                if( xAreComTestTasksStillRunning() != pdTRUE )\r
                {\r
                        usErrorDetected = pdTRUE;\r