This is an automated email from the ASF dual-hosted git repository. raiden00 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0b6cca920bd89a112a43f36d0a8c07c35c0ee2ea Author: Matias N <[email protected]> AuthorDate: Mon Aug 24 14:19:41 2020 -0300 nrf52_rtc: unify irq and evt enums --- arch/arm/src/nrf52/nrf52_rtc.c | 36 ++++++++++++++++++------------------ arch/arm/src/nrf52/nrf52_rtc.h | 14 +------------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/arch/arm/src/nrf52/nrf52_rtc.c b/arch/arm/src/nrf52/nrf52_rtc.c index 9b5b01c..4492296 100644 --- a/arch/arm/src/nrf52/nrf52_rtc.c +++ b/arch/arm/src/nrf52/nrf52_rtc.c @@ -207,37 +207,37 @@ static uint32_t nrf52_rtc_irq2reg(FAR struct nrf52_rtc_dev_s *dev, uint8_t s) switch (s) { - case NRF52_RTC_INT_TICK: + case NRF52_RTC_EVT_TICK: { regval = RTC_INT_TICK; break; } - case NRF52_RTC_INT_OVRFLW: + case NRF52_RTC_EVT_OVRFLW: { regval = RTC_INT_OVRFLW; break; } - case NRF52_RTC_INT_COMPARE0: + case NRF52_RTC_EVT_COMPARE0: { regval = RTC_INT_COMPARE(0); break; } - case NRF52_RTC_INT_COMPARE1: + case NRF52_RTC_EVT_COMPARE1: { regval = RTC_INT_COMPARE(1); break; } - case NRF52_RTC_INT_COMPARE2: + case NRF52_RTC_EVT_COMPARE2: { regval = RTC_INT_COMPARE(2); break; } - case NRF52_RTC_INT_COMPARE3: + case NRF52_RTC_EVT_COMPARE3: { regval = RTC_INT_COMPARE(3); break; @@ -550,37 +550,37 @@ static int nrf52_rtc_checkint(FAR struct nrf52_rtc_dev_s *dev, uint8_t s) switch (s) { - case NRF52_RTC_INT_TICK: + case NRF52_RTC_EVT_TICK: { ret = nrf52_rtc_getreg(dev, NRF52_RTC_EVENTS_TICK_OFFSET); break; } - case NRF52_RTC_INT_OVRFLW: + case NRF52_RTC_EVT_OVRFLW: { ret = nrf52_rtc_getreg(dev, NRF52_RTC_EVENTS_OVRFLW_OFFSET); break; } - case NRF52_RTC_INT_COMPARE0: + case NRF52_RTC_EVT_COMPARE0: { ret = nrf52_rtc_getreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(0)); break; } - case NRF52_RTC_INT_COMPARE1: + case NRF52_RTC_EVT_COMPARE1: { ret = nrf52_rtc_getreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(0)); break; } - case NRF52_RTC_INT_COMPARE2: + case NRF52_RTC_EVT_COMPARE2: { ret = nrf52_rtc_getreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(2)); break; } - case NRF52_RTC_INT_COMPARE3: + case NRF52_RTC_EVT_COMPARE3: { ret = nrf52_rtc_getreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(3)); break; @@ -610,37 +610,37 @@ static int nrf52_rtc_ackint(FAR struct nrf52_rtc_dev_s *dev, uint8_t s) switch (s) { - case NRF52_RTC_INT_TICK: + case NRF52_RTC_EVT_TICK: { nrf52_rtc_putreg(dev, NRF52_RTC_EVENTS_TICK_OFFSET, 0); break; } - case NRF52_RTC_INT_OVRFLW: + case NRF52_RTC_EVT_OVRFLW: { nrf52_rtc_putreg(dev, NRF52_RTC_EVENTS_OVRFLW_OFFSET, 0); break; } - case NRF52_RTC_INT_COMPARE0: + case NRF52_RTC_EVT_COMPARE0: { nrf52_rtc_putreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(0), 0); break; } - case NRF52_RTC_INT_COMPARE1: + case NRF52_RTC_EVT_COMPARE1: { nrf52_rtc_putreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(1), 0); break; } - case NRF52_RTC_INT_COMPARE2: + case NRF52_RTC_EVT_COMPARE2: { nrf52_rtc_putreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(2), 0); break; } - case NRF52_RTC_INT_COMPARE3: + case NRF52_RTC_EVT_COMPARE3: { nrf52_rtc_putreg(dev, NRF52_RTC_EVENTS_COMPARE_OFFSET(3), 0); break; diff --git a/arch/arm/src/nrf52/nrf52_rtc.h b/arch/arm/src/nrf52/nrf52_rtc.h index 2b89c5a..17efd28 100644 --- a/arch/arm/src/nrf52/nrf52_rtc.h +++ b/arch/arm/src/nrf52/nrf52_rtc.h @@ -64,19 +64,7 @@ enum nrf52_rtc_cc_e NRF52_RTC_CC3 = 3, }; -/* RTC IRQ source */ - -enum nrf52_rtc_irq_e -{ - NRF52_RTC_INT_TICK = 0, - NRF52_RTC_INT_OVRFLW = 1, - NRF52_RTC_INT_COMPARE0 = 2, - NRF52_RTC_INT_COMPARE1 = 3, - NRF52_RTC_INT_COMPARE2 = 4, - NRF52_RTC_INT_COMPARE3 = 5, -}; - -/* RTC Events */ +/* RTC Interrupts/Events */ enum nrf52_rtc_evt_e {
