X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC%2Fmain-full.c;h=dfbba8e9899c5eb0cf4e8ec548b4d6acb88475f9;hb=01b0b5bd98770d9046145309f15c3eca37d2f8cb;hp=03fcfa97926916b5fce0d1502b0ab1b5ab4a21fa;hpb=758848cd92bc5b99ef94165052f0f537833ce1d7;p=freertos

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