***IMMINENT RELEASE NOTICE***

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

diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-full.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-full.c
index 03fcfa97926916b5fce0d1502b0ab1b5ab4a21fa..dfbba8e9899c5eb0cf4e8ec548b4d6acb88475f9 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-full.c
+++ b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-full.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.0 - 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
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -131,20 +131,20 @@
 \r
 /* The period after which the check timer will expire provided no errors have\r
 been reported by any of the standard demo tasks.  ms are converted to the\r
-equivalent in ticks using the portTICK_RATE_MS constant. */\r
-#define mainCHECK_TIMER_PERIOD_MS                      ( 3000UL / portTICK_RATE_MS )\r
+equivalent in ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainCHECK_TIMER_PERIOD_MS                      ( 3000UL / portTICK_PERIOD_MS )\r
 \r
 /* The period at which the check timer will expire if an error has been\r
 reported in one of the standard demo tasks.  ms are converted to the equivalent\r
-in ticks using the portTICK_RATE_MS constant. */\r
-#define mainERROR_CHECK_TIMER_PERIOD_MS        ( 200UL / portTICK_RATE_MS )\r
+in ticks using the portTICK_PERIOD_MS constant. */\r
+#define mainERROR_CHECK_TIMER_PERIOD_MS        ( 200UL / portTICK_PERIOD_MS )\r
 \r
 /* A block time of zero simply means "don't block". */\r
 #define mainDONT_BLOCK                                         ( 0UL )\r
 \r
 /* The base toggle rate used by the flash timers.  Each toggle rate is a\r
 multiple of this. */\r
-#define mainFLASH_TIMER_BASE_RATE                      ( 200UL / portTICK_RATE_MS )\r
+#define mainFLASH_TIMER_BASE_RATE                      ( 200UL / portTICK_PERIOD_MS )\r
 \r
 /* The LED toggle by the check timer. */\r
 #define mainCHECK_LED                                          ( 4 )\r
@@ -170,13 +170,13 @@ extern void vMainToggleLED( void );
 /*\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
  * The flash timer callback function, as described at the top of this file.\r
  * This callback function is assigned to three separate software timers.\r
  */\r
-static void prvFlashTimerCallback( xTimerHandle xTimer );\r
+static void prvFlashTimerCallback( TimerHandle_t xTimer );\r
 \r
 /*\r
  * The task that toggles an LED each time the semaphore 'given' by the tick\r
@@ -201,12 +201,12 @@ volatile unsigned long ulRegTest1LoopCounter = 0UL, ulRegTest2LoopCounter = 0UL;
 /* The semaphore that is given by the tick hook function (defined in main.c)\r
 and taken by the task implemented by the prvSemaphoreTakeTask() function.  The\r
 task toggles LED mainSEMAPHORE_LED each time the semaphore is taken. */\r
-xSemaphoreHandle xLEDSemaphore = NULL;\r
+SemaphoreHandle_t xLEDSemaphore = NULL;\r
 /*-----------------------------------------------------------*/\r
 \r
 void main_full( void )\r
 {\r
-xTimerHandle xTimer = NULL;\r
+TimerHandle_t xTimer = NULL;\r
 unsigned long ulTimer;\r
 const unsigned long ulTimersToCreate = 3L;\r
 /* The register test tasks are asm functions that don't use a stack.  The\r
@@ -297,7 +297,7 @@ const size_t xRegTestStackSize = 25U;
 /*-----------------------------------------------------------*/\r
 \r
 /* See the description at the top of this file. */\r
-static void prvCheckTimerCallback( xTimerHandle xTimer )\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer )\r
 {\r
 static long lChangedTimerPeriodAlready = pdFALSE;\r
 static unsigned long ulLastRegTest1Value = 0, ulLastRegTest2Value = 0;\r
@@ -387,7 +387,7 @@ static void prvSemaphoreTakeTask( void *pvParameters )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvFlashTimerCallback( xTimerHandle xTimer )\r
+static void prvFlashTimerCallback( TimerHandle_t xTimer )\r
 {\r
 unsigned long ulLED;\r
 \r