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

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

pull/4021/head
Brian Daniels 2017-03-24 10:14:55 -05:00
parent 35a561217a
commit 1019cb0bfe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c
View File

@ -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

4
targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c
View File

@ -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