You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by st...@apache.org on 2016/09/28 00:58:11 UTC
incubator-mynewt-core git commit: avoid symbol conflicts in split
mode by renaming wdt irq handler. this will need a revisit if we locate
interrupt vectors in .text, as WDT_IRQHandler is a weak symbol, however,
we can cross that bridge when we reach it.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 0216c73e5 -> 1f5baafdb
avoid symbol conflicts in split mode by renaming wdt irq handler. this will need a revisit if we locate interrupt vectors in .text, as WDT_IRQHandler is a weak symbol, however, we can cross that bridge when we reach it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/1f5baafd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/1f5baafd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/1f5baafd
Branch: refs/heads/develop
Commit: 1f5baafdb75a0c64e17903e55d724bf43cf46586
Parents: 0216c73
Author: Sterling Hughes <st...@apache.org>
Authored: Tue Sep 27 17:58:05 2016 -0700
Committer: Sterling Hughes <st...@apache.org>
Committed: Tue Sep 27 17:58:05 2016 -0700
----------------------------------------------------------------------
hw/mcu/nordic/nrf51xxx/src/hal_watchdog.c | 4 ++--
hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/1f5baafd/hw/mcu/nordic/nrf51xxx/src/hal_watchdog.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/hal_watchdog.c b/hw/mcu/nordic/nrf51xxx/src/hal_watchdog.c
index 4bc9d2a..e67f4bc 100644
--- a/hw/mcu/nordic/nrf51xxx/src/hal_watchdog.c
+++ b/hw/mcu/nordic/nrf51xxx/src/hal_watchdog.c
@@ -35,7 +35,7 @@ nrf51_hal_wdt_default_handler(void)
/**@brief WDT interrupt handler. */
static void
-WDT_IRQHandler(void)
+nrf51_wdt_irq_handler(void)
{
if (nrf_wdt_int_enable_check(NRF_WDT_INT_TIMEOUT_MASK) == true) {
nrf_wdt_event_clear(NRF_WDT_EVENT_TIMEOUT);
@@ -46,7 +46,7 @@ WDT_IRQHandler(void)
int
hal_watchdog_init(uint32_t expire_msecs)
{
- NVIC_SetVector(WDT_IRQn, (uint32_t) WDT_IRQHandler);
+ NVIC_SetVector(WDT_IRQn, (uint32_t) nrf51_wdt_irq_handler);
nrf_wdt_behaviour_set(NRF_WDT_BEHAVIOUR_RUN_SLEEP);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/1f5baafd/hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c b/hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c
index 1bdf7ee..4b0111b 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c
@@ -35,7 +35,7 @@ nrf52_hal_wdt_default_handler(void)
/**@brief WDT interrupt handler. */
static void
-WDT_IRQHandler(void)
+nrf52_wdt_irq_handler(void)
{
if (nrf_wdt_int_enable_check(NRF_WDT_INT_TIMEOUT_MASK) == true) {
nrf_wdt_event_clear(NRF_WDT_EVENT_TIMEOUT);
@@ -46,7 +46,7 @@ WDT_IRQHandler(void)
int
hal_watchdog_init(uint32_t expire_msecs)
{
- NVIC_SetVector(WDT_IRQn, (uint32_t) WDT_IRQHandler);
+ NVIC_SetVector(WDT_IRQn, (uint32_t) nrf52_wdt_irq_handler);
nrf_wdt_behaviour_set(NRF_WDT_BEHAVIOUR_RUN_SLEEP);