From 87cc3d599af9042ab7153c5bca886a29b2e08de8 Mon Sep 17 00:00:00 2001 From: Brian Daniels Date: Fri, 24 Mar 2017 10:14:55 -0500 Subject: [PATCH] Fixing a macro to detect when RTOS was in use for the NRF52840_DK --- .../TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c | 4 ++-- .../TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c index c18e42786d..33487310f6 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c @@ -35,7 +35,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#ifndef __MBED_CMSIS_RTOS_CM +#ifndef MBED_CONF_RTOS_PRESENT #include "sdk_common.h" #if NRF_MODULE_ENABLED(APP_TIMER) @@ -1076,4 +1076,4 @@ uint8_t app_timer_op_queue_utilization_get(void) } #endif #endif //NRF_MODULE_ENABLED(APP_TIMER) -#endif // __MBED_CMSIS_RTOS_CM +#endif // MBED_CONF_RTOS_PRESENT diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c index 7e9a7bc10f..acf9e566c5 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c @@ -35,7 +35,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#ifdef __MBED_CMSIS_RTOS_CM +#ifdef MBED_CONF_RTOS_PRESENT #include "sdk_common.h" #if NRF_MODULE_ENABLED(APP_TIMER) @@ -282,4 +282,4 @@ uint32_t app_timer_cnt_diff_compute(uint32_t ticks_to, } #endif //NRF_MODULE_ENABLED(APP_TIMER) -#endif // __MBED_CMSIS_RTOS_CM +#endif // MBED_CONF_RTOS_PRESENT