michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: timer: nrf: Remove RTC1 dependency

Browse source 
Removed RTC1 dependencies in the code. Single define picks the instance.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2020-05-21 13:46:48 +02:00 • committed by Carles Cufí
commit a719b8c5e4
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/timer/nrf_rtc_timer.c
View file

@ -14,6 +14,7 @@
#include <spinlock.h> #include <spinlock.h>
#define RTC NRF_RTC1 #define RTC NRF_RTC1
#define RTC_IRQn NRFX_IRQ_NUMBER_GET(RTC)
#define COUNTER_SPAN BIT(24) #define COUNTER_SPAN BIT(24)
#define COUNTER_MAX (COUNTER_SPAN - 1U) #define COUNTER_MAX (COUNTER_SPAN - 1U)
@ -92,7 +93,7 @@ static void prevent_false_prev_evt(void)
/* Clear interrupt that may have fired as we were setting the /* Clear interrupt that may have fired as we were setting the
* comparator. * comparator.
*/ */
NVIC_ClearPendingIRQ(RTC1_IRQn); NVIC_ClearPendingIRQ(RTC_IRQn);
} }
/* If settings is next tick from now, function attempts to set next tick. If /* If settings is next tick from now, function attempts to set next tick. If
@ -165,7 +166,7 @@ static void set_protected_absolute_ticks(u32_t ticks)
* it by pointer at runtime, maybe?) so we don't have this leaky * it by pointer at runtime, maybe?) so we don't have this leaky
* symbol. * symbol.
*/ */
void rtc1_nrf_isr(void *arg) void rtc_nrf_isr(void *arg)
{ {
ARG_UNUSED(arg); ARG_UNUSED(arg);
event_clear(); event_clear();
@ -201,11 +202,11 @@ int z_clock_driver_init(struct device *device)
/* TODO: replace with counter driver to access RTC */ /* TODO: replace with counter driver to access RTC */
nrf_rtc_prescaler_set(RTC, 0); nrf_rtc_prescaler_set(RTC, 0);
event_clear(); event_clear();
NVIC_ClearPendingIRQ(RTC1_IRQn); NVIC_ClearPendingIRQ(RTC_IRQn);
int_enable(); int_enable();
IRQ_CONNECT(RTC1_IRQn, 1, rtc1_nrf_isr, 0, 0); IRQ_CONNECT(RTC_IRQn, 1, rtc_nrf_isr, 0, 0);
irq_enable(RTC1_IRQn); irq_enable(RTC_IRQn);
nrf_rtc_task_trigger(RTC, NRF_RTC_TASK_CLEAR); nrf_rtc_task_trigger(RTC, NRF_RTC_TASK_CLEAR);
nrf_rtc_task_trigger(RTC, NRF_RTC_TASK_START); nrf_rtc_task_trigger(RTC, NRF_RTC_TASK_START);

8
tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
View file

@ -185,7 +185,7 @@ typedef void (*vth)(void); /* Vector Table Handler */
* *
* Note: qemu_cortex_m0 uses TIMER0 to implement system timer. * Note: qemu_cortex_m0 uses TIMER0 to implement system timer.
*/ */
void rtc1_nrf_isr(void); void rtc_nrf_isr(void);
void nrf_power_clock_isr(void); void nrf_power_clock_isr(void);
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X) #if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
#if defined(CONFIG_BOARD_QEMU_CORTEX_M0) #if defined(CONFIG_BOARD_QEMU_CORTEX_M0)
@ -198,7 +198,7 @@ vth __irq_vector_table _irq_vector_table[] = {
nrf_power_clock_isr, nrf_power_clock_isr,
isr0, isr1, isr2, isr0, isr1, isr2,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
rtc1_nrf_isr rtc_nrf_isr
}; };
#endif /* CONFIG_BOARD_QEMU_CORTEX_M0 */ #endif /* CONFIG_BOARD_QEMU_CORTEX_M0 */
#elif defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_SERIES_NRF91X) #elif defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_SERIES_NRF91X)
@ -207,14 +207,14 @@ vth __irq_vector_table _irq_vector_table[] = {
0, 0, 0, 0, 0, nrf_power_clock_isr, 0, 0, 0, 0, 0, 0, 0, nrf_power_clock_isr, 0, 0,
isr0, isr1, isr2, isr0, isr1, isr2,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
rtc1_nrf_isr rtc_nrf_isr
}; };
#else #else
vth __irq_vector_table _irq_vector_table[] = { vth __irq_vector_table _irq_vector_table[] = {
0, 0, 0, 0, 0, nrf_power_clock_isr, 0, 0, 0, 0, 0, 0, 0, nrf_power_clock_isr, 0, 0,
isr0, isr1, isr2, isr0, isr1, isr2,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
rtc1_nrf_isr rtc_nrf_isr
}; };
#endif #endif
#endif #endif