Skip to content

Commit 91bd396

Browse files
committed
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
2 parents a8a7df0 + 5206add commit 91bd396

File tree

3 files changed

+345
-381
lines changed

3 files changed

+345
-381
lines changed

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/common_rtc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// Instance 0 is reserved for SoftDevice.
2525
// Instance 1 is used as a common one for us_ticker, lp_ticker and (in case
2626
// of NRF51) as an alternative tick source for RTOS.
27-
// ["os_tick.c" uses hard coded addresses of the 'NRF_RTC1->EVENT_COMPARE[1]'
27+
// ["us_ticker.c" uses hard coded addresses of the 'NRF_RTC1->EVENT_COMPARE[1]'
2828
// register in inline assembly implementations of COMMON_RTC_IRQ_HANDLER,
2929
// please remember to update those in case of doing changes here]
3030
#define COMMON_RTC_INSTANCE NRF_RTC1

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/os_tick.c

Lines changed: 0 additions & 379 deletions
This file was deleted.

0 commit comments

Comments
 (0)