Merge branch 'nrf52_nrf51_unified_integration' of https://github.com/…

…pan-/mbed into refactored_serial_api # Conflicts: # hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/sdk/drivers_nrf/uart/nrf_drv_uart.c
ARMmbed · Jul 25, 2016 · 91bd396 · 91bd396
2 parents a8a7df0 + 5206add
commit 91bd396
Show file tree

Hide file tree

Showing 3 changed files with 345 additions and 381 deletions.
diff --git a/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/common_rtc.h b/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/common_rtc.h
@@ -24,7 +24,7 @@
 // Instance 0 is reserved for SoftDevice.
 // Instance 1 is used as a common one for us_ticker, lp_ticker and (in case
 // of NRF51) as an alternative tick source for RTOS.
-// ["os_tick.c" uses hard coded addresses of the 'NRF_RTC1->EVENT_COMPARE[1]'
+// ["us_ticker.c" uses hard coded addresses of the 'NRF_RTC1->EVENT_COMPARE[1]'
 //  register in inline assembly implementations of COMMON_RTC_IRQ_HANDLER,
 //  please remember to update those in case of doing changes here]
 #define COMMON_RTC_INSTANCE     NRF_RTC1

diff --git a/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/os_tick.c b/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/os_tick.c