Fixing a macro to detect when RTOS was in use for the NRF52840_DK

bridadan · bridadan · commit 1019cb0bfe6f · 2017-03-24T10:16:13.000-05:00
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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`36`	`36`	`*`
`37`	`37`	`*/`
`38`		`-#ifndef __MBED_CMSIS_RTOS_CM`
	`38`	`+#ifndef MBED_CONF_RTOS_PRESENT`
`39`	`39`
`40`	`40`	`#include "sdk_common.h"`
`41`	`41`	`#if NRF_MODULE_ENABLED(APP_TIMER)`
`@@ -1076,4 +1076,4 @@ uint8_t app_timer_op_queue_utilization_get(void)`
`1076`	`1076`	`}`
`1077`	`1077`	`#endif`
`1078`	`1078`	`#endif //NRF_MODULE_ENABLED(APP_TIMER)`
`1079`		`-#endif // __MBED_CMSIS_RTOS_CM`
	`1079`	`+#endif // MBED_CONF_RTOS_PRESENT`