michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: timer: nrf_rtc_timer: Align to renamed nrfx symbols

Browse source 
New nrfx release introduces renamed preprocesor symbols and macros
in nrf_rtc.h

Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>
This commit is contained in:
Adam Wojasinski 2023-04-25 21:19:37 +02:00 • committed by Carles Cufí
commit 9aa71977ee
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/timer/nrf_rtc_timer.c
View file

@ -71,22 +71,22 @@ static void set_comparator(int32_t chan, uint32_t cyc)
static bool event_check(int32_t chan) static bool event_check(int32_t chan)
{ {
return nrf_rtc_event_check(RTC, RTC_CHANNEL_EVENT_ADDR(chan)); return nrf_rtc_event_check(RTC, NRF_RTC_CHANNEL_EVENT_ADDR(chan));
} }
static void event_clear(int32_t chan) static void event_clear(int32_t chan)
{ {
nrf_rtc_event_clear(RTC, RTC_CHANNEL_EVENT_ADDR(chan)); nrf_rtc_event_clear(RTC, NRF_RTC_CHANNEL_EVENT_ADDR(chan));
} }
static void event_enable(int32_t chan) static void event_enable(int32_t chan)
{ {
nrf_rtc_event_enable(RTC, RTC_CHANNEL_INT_MASK(chan)); nrf_rtc_event_enable(RTC, NRF_RTC_CHANNEL_INT_MASK(chan));
} }
static void event_disable(int32_t chan) static void event_disable(int32_t chan)
{ {
nrf_rtc_event_disable(RTC, RTC_CHANNEL_INT_MASK(chan)); nrf_rtc_event_disable(RTC, NRF_RTC_CHANNEL_INT_MASK(chan));
} }
static uint32_t counter(void) static uint32_t counter(void)
@ -150,7 +150,7 @@ static bool compare_int_lock(int32_t chan)
{ {
atomic_val_t prev = atomic_and(&int_mask, ~BIT(chan)); atomic_val_t prev = atomic_and(&int_mask, ~BIT(chan));
nrf_rtc_int_disable(RTC, RTC_CHANNEL_INT_MASK(chan)); nrf_rtc_int_disable(RTC, NRF_RTC_CHANNEL_INT_MASK(chan));
__DMB(); __DMB();
__ISB(); __ISB();
@ -170,7 +170,7 @@ static void compare_int_unlock(int32_t chan, bool key)
{ {
if (key) { if (key) {
atomic_or(&int_mask, BIT(chan)); atomic_or(&int_mask, BIT(chan));
nrf_rtc_int_enable(RTC, RTC_CHANNEL_INT_MASK(chan)); nrf_rtc_int_enable(RTC, NRF_RTC_CHANNEL_INT_MASK(chan));
if (atomic_get(&force_isr_mask) & BIT(chan)) { if (atomic_get(&force_isr_mask) & BIT(chan)) {
NVIC_SetPendingIRQ(RTC_IRQn); NVIC_SetPendingIRQ(RTC_IRQn);
} }
@ -455,7 +455,7 @@ static void sys_clock_timeout_handler(int32_t chan,
static bool channel_processing_check_and_clear(int32_t chan) static bool channel_processing_check_and_clear(int32_t chan)
{ {
if (nrf_rtc_int_enable_check(RTC, RTC_CHANNEL_INT_MASK(chan))) { if (nrf_rtc_int_enable_check(RTC, NRF_RTC_CHANNEL_INT_MASK(chan))) {
/* The processing of channel can be caused by CC match /* The processing of channel can be caused by CC match
* or be forced. * or be forced.
*/ */
@ -699,7 +699,7 @@ static int sys_clock_driver_init(void)
nrf_rtc_prescaler_set(RTC, 0); nrf_rtc_prescaler_set(RTC, 0);
for (int32_t chan = 0; chan < CHAN_COUNT; chan++) { for (int32_t chan = 0; chan < CHAN_COUNT; chan++) {
cc_data[chan].target_time = TARGET_TIME_INVALID; cc_data[chan].target_time = TARGET_TIME_INVALID;
nrf_rtc_int_enable(RTC, RTC_CHANNEL_INT_MASK(chan)); nrf_rtc_int_enable(RTC, NRF_RTC_CHANNEL_INT_MASK(chan));
} }
nrf_rtc_int_enable(RTC, NRF_RTC_INT_OVERFLOW_MASK); nrf_rtc_int_enable(RTC, NRF_RTC_INT_OVERFLOW_MASK);