You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2017/03/30 21:12:46 UTC
[29/37] incubator-mynewt-core git commit: No jira ticket: fixed
compilation error if the only timer allowed by syscfg was the RTC (TIMER_3).
No jira ticket: fixed compilation error if the only timer
allowed by syscfg was the RTC (TIMER_3).
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/28df4dd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/28df4dd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/28df4dd6
Branch: refs/heads/nrf_cputime
Commit: 28df4dd62b6b6f22f0c2893f3aefa65f1d2179ca
Parents: bf90105
Author: William San Filippo <wi...@runtime.io>
Authored: Wed Mar 29 20:20:07 2017 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Wed Mar 29 20:21:07 2017 -0700
----------------------------------------------------------------------
hw/mcu/nordic/nrf51xxx/src/hal_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/28df4dd6/hw/mcu/nordic/nrf51xxx/src/hal_timer.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/hal_timer.c b/hw/mcu/nordic/nrf51xxx/src/hal_timer.c
index 1776406..f2f5957 100644
--- a/hw/mcu/nordic/nrf51xxx/src/hal_timer.c
+++ b/hw/mcu/nordic/nrf51xxx/src/hal_timer.c
@@ -365,7 +365,7 @@ hal_timer_chk_queue(struct nrf51_hal_timer *bsptimer)
* This is the global timer interrupt routine.
*
*/
-#if NRF51_TIMER_DEFINED
+#if (MYNEWT_VAL(TIMER_0) || MYNEWT_VAL(TIMER_1) || MYNEWT_VAL(TIMER_2))
static void
hal_timer_irq_handler(struct nrf51_hal_timer *bsptimer)
{