Merge pull request #2 from anangl/nrf52_nrf51_unified_integration

Fixed RTC1_IRQHandler linking problem.
nxp-archive · Jul 22, 2016 · 1f53752 · 1f53752
2 parents 50ce4fd + 42d9898
commit 1f53752
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