This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0976cddd030b209871a54868ceae3e35e3a495a7 Author: raiden00pl <[email protected]> AuthorDate: Wed Mar 15 12:45:33 2023 +0100 arch/nrf52/nrf52_tickless_rtc.c: fix tickless operations - ostest fail without this change --- arch/arm/src/nrf52/nrf52_tickless_rtc.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/arch/arm/src/nrf52/nrf52_tickless_rtc.c b/arch/arm/src/nrf52/nrf52_tickless_rtc.c index a82a8622fa..7404c3e4a3 100644 --- a/arch/arm/src/nrf52/nrf52_tickless_rtc.c +++ b/arch/arm/src/nrf52/nrf52_tickless_rtc.c @@ -245,22 +245,19 @@ static int rtc_handler(int irq, void *context, void *arg) int up_alarm_cancel(struct timespec *ts) { - if (g_tickless_dev.alarm_set) - { - uint32_t counter; - irqstate_t flags; + uint32_t counter; + irqstate_t flags; - flags = enter_critical_section(); + flags = enter_critical_section(); - NRF52_RTC_DISABLEINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0); - NRF52_RTC_GETCOUNTER(g_tickless_dev.rtc, &counter); - rtc_counter_to_ts(counter, ts); + NRF52_RTC_DISABLEINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0); + NRF52_RTC_GETCOUNTER(g_tickless_dev.rtc, &counter); + rtc_counter_to_ts(counter, ts); - NRF52_RTC_ACKINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0); - g_tickless_dev.alarm_set = false; + NRF52_RTC_ACKINT(g_tickless_dev.rtc, NRF52_RTC_EVT_COMPARE0); + g_tickless_dev.alarm_set = false; - leave_critical_section(flags); - } + leave_critical_section(flags); return OK; } @@ -313,9 +310,9 @@ void up_timer_initialize(void) { struct timespec ts; + memset(&g_tickless_dev, 0, sizeof(struct nrf52_tickless_dev_s)); + g_tickless_dev.rtc = nrf52_rtc_init(CONFIG_NRF52_SYSTIMER_RTC_INSTANCE); - g_tickless_dev.periods = 0; - g_tickless_dev.alarm_set = false; /* Ensure we have support for the selected RTC instance */
