ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mbed_rtx_idle: fix ticker macro checks 

If a ticker is unavailable, its macro is undefined and cannot
be checked with MBED_STATIC_ASSERT.
pull/10597/head
Lingkai Dong 2019-05-13 14:35:45 +01:00
parent 9fc54c9774
commit 427c7db627
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtos/TARGET_CORTEX/mbed_rtx_idle.cpp
View File

@ -38,10 +38,13 @@ extern "C" {
#ifdef MBED_TICKLESS #ifdef MBED_TICKLESS
MBED_STATIC_ASSERT(!MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER || DEVICE_USTICKER, #if MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER && !DEVICE_USTICKER
"Microsecond ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is true"); #error Microsecond ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is true
MBED_STATIC_ASSERT(MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER || DEVICE_LPTICKER, #endif
"Low power ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is false");
#if !MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER && !DEVICE_LPTICKER
#error Low power ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is false
#endif
#include "rtos/TARGET_CORTEX/SysTimer.h" #include "rtos/TARGET_CORTEX/SysTimer.h"
@ -137,7 +140,7 @@ extern "C" {
} }
#else #else // MBED_TICKLESS
static void default_idle_hook(void) static void default_idle_hook(void)
{ {
@ -149,7 +152,7 @@ extern "C" {
core_util_critical_section_exit(); core_util_critical_section_exit();
} }
#endif // (defined(MBED_TICKLESS) && DEVICE_LPTICKER) #endif // MBED_TICKLESS
static void (*idle_hook_fptr)(void) = &default_idle_hook; static void (*idle_hook_fptr)(void) = &default_idle_hook;