\r
/* The period at which the check timer will expire, in ms, provided no errors\r
have 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, in ms, if an error has been\r
reported in one of the standard demo tasks, the check tasks, or the demo timer.\r
-ms are converted to the equivalent in ticks using the portTICK_RATE_MS\r
+ms are converted to the equivalent in ticks using the portTICK_PERIOD_MS\r
constant. */\r
-#define mainERROR_CHECK_TIMER_PERIOD_MS ( 200UL / portTICK_RATE_MS )\r
+#define mainERROR_CHECK_TIMER_PERIOD_MS ( 200UL / portTICK_PERIOD_MS )\r
\r
/* These two definitions are used to set the period of the demo timer. The demo\r
timer period is always relative to the check timer period, so the check timer\r
/*\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 'demo' timer callback function, as described at the top of this file.\r
*/\r
-static void prvDemoTimerCallback( xTimerHandle xTimer );\r
+static void prvDemoTimerCallback( TimerHandle_t xTimer );\r
\r
/*\r
* Functions that define the RegTest tasks, as described at the top of this\r
\r
/* The check timer. This uses prvCheckTimerCallback() as its callback\r
function. */\r
-static xTimerHandle xCheckTimer = NULL;\r
+static TimerHandle_t xCheckTimer = NULL;\r
\r
/* The demo timer. This uses prvDemoTimerCallback() as its callback function. */\r
-static xTimerHandle xDemoTimer = NULL;\r
+static TimerHandle_t xDemoTimer = NULL;\r
\r
/* This variable is incremented each time the demo timer expires. */\r
static volatile unsigned long ulDemoSoftwareTimerCounter = 0UL;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvDemoTimerCallback( xTimerHandle xTimer )\r
+static void prvDemoTimerCallback( TimerHandle_t xTimer )\r
{\r
/* Remove compiler warning about unused parameter. */\r
( void ) xTimer;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvCheckTimerCallback( xTimerHandle xTimer )\r
+static void prvCheckTimerCallback( TimerHandle_t xTimer )\r
{\r
static portBASE_TYPE xChangedTimerPeriodAlready = pdFALSE, xErrorStatus = pdPASS;\r
static unsigned short usLastRegTest1Counter = 0, usLastRegTest2Counter = 0;\r