\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 ( 3 )\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 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
* Called by main() to create the comprehensive test/demo application if\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
/*-----------------------------------------------------------*/\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
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvFlashTimerCallback( xTimerHandle xTimer )\r
+static void prvFlashTimerCallback( TimerHandle_t xTimer )\r
{\r
unsigned long ulLED;\r
\r