Skip to content

Commit 4205a39

Browse files
committed
Fix DEVICE_[US|LP]TICKER checks
If a ticker is unavailable its macro is undefined.
1 parent 99bc11f commit 4205a39

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

rtos/TARGET_CORTEX/mbed_rtx_idle.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,13 @@ extern "C" {
3838

3939
#ifdef MBED_TICKLESS
4040

41-
MBED_STATIC_ASSERT(!MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER || DEVICE_USTICKER,
42-
"Microsecond ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is true");
43-
MBED_STATIC_ASSERT(MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER || DEVICE_LPTICKER,
44-
"Low power ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is false");
41+
#if MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER && !DEVICE_USTICKER
42+
#error Microsecond ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is true
43+
#endif
44+
45+
#if !MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER && !DEVICE_LPTICKER
46+
#error Low power ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is false
47+
#endif
4548

4649
#include "rtos/TARGET_CORTEX/SysTimer.h"
4750

@@ -137,7 +140,7 @@ extern "C" {
137140
}
138141

139142

140-
#else
143+
#else // MBED_TICKLESS
141144

142145
static void default_idle_hook(void)
143146
{
@@ -149,7 +152,7 @@ extern "C" {
149152
core_util_critical_section_exit();
150153
}
151154

152-
#endif // (defined(MBED_TICKLESS) && DEVICE_LPTICKER)
155+
#endif // MBED_TICKLESS
153156

154157
static void (*idle_hook_fptr)(void) = &default_idle_hook;
155158

0 commit comments

Comments
 (0)