riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/nrf5x: implement periph_timer_periodic

Browse Source
This commit is contained in:
chrysn 2020-11-30 17:26:02 +01:00
parent c337089de5
commit e3e89fe513
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/nrf5x_common/Kconfig
View File

@ -13,6 +13,7 @@ config CPU_COMMON_NRF5X
select HAS_PERIPH_GPIO_IRQ select HAS_PERIPH_GPIO_IRQ
select HAS_PERIPH_HWRNG select HAS_PERIPH_HWRNG
select HAS_PERIPH_TEMPERATURE select HAS_PERIPH_TEMPERATURE
select HAS_PERIPH_TIMER_PERIODIC
select HAS_PERIPH_UART_MODECFG select HAS_PERIPH_UART_MODECFG
select HAS_PERIPH_WDT select HAS_PERIPH_WDT
select HAS_PERIPH_WDT_CB select HAS_PERIPH_WDT_CB

1
cpu/nrf5x_common/Makefile.features
View File

@ -5,6 +5,7 @@ FEATURES_PROVIDED += periph_flashpage_pagewise
FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_gpio periph_gpio_irq
FEATURES_PROVIDED += periph_hwrng FEATURES_PROVIDED += periph_hwrng
FEATURES_PROVIDED += periph_temperature FEATURES_PROVIDED += periph_temperature
FEATURES_PROVIDED += periph_timer_periodic
FEATURES_PROVIDED += periph_uart_modecfg FEATURES_PROVIDED += periph_uart_modecfg
FEATURES_PROVIDED += periph_wdt periph_wdt_cb FEATURES_PROVIDED += periph_wdt periph_wdt_cb

29
cpu/nrf5x_common/periph/timer.c
View File

@ -31,6 +31,7 @@ typedef struct {
timer_cb_t cb; timer_cb_t cb;
void *arg; void *arg;
uint8_t flags; uint8_t flags;
uint8_t is_periodic;
} tim_ctx_t; } tim_ctx_t;
/** /**
@ -106,6 +107,29 @@ int timer_set_absolute(tim_t tim, int chan, unsigned int value)
return 0; return 0;
} }
int timer_set_periodic(tim_t tim, int chan, unsigned int value, uint8_t flags)
{
/* see if channel is valid */
if (chan >= timer_config[tim].channels) {
return -1;
}
ctx[tim].flags |= (1 << chan);
ctx[tim].is_periodic |= (1 << chan);
dev(tim)->CC[chan] = value;
if (flags & TIM_FLAG_RESET_ON_MATCH) {
dev(tim)->SHORTS |= (1 << chan);
}
if (flags & TIM_FLAG_RESET_ON_SET) {
dev(tim)->TASKS_CLEAR = 1;
}
dev(tim)->INTENSET = (TIMER_INTENSET_COMPARE0_Msk << chan);
dev(tim)->TASKS_START = 1;
return 0;
}
int timer_clear(tim_t tim, int chan) int timer_clear(tim_t tim, int chan)
{ {
/* see if channel is valid */ /* see if channel is valid */
@ -114,7 +138,10 @@ int timer_clear(tim_t tim, int chan)
} }
dev(tim)->INTENCLR = (TIMER_INTENSET_COMPARE0_Msk << chan); dev(tim)->INTENCLR = (TIMER_INTENSET_COMPARE0_Msk << chan);
/* Clear out the Compare->Clear flag of this channel */
dev(tim)->SHORTS &= ~(1 << chan);
ctx[tim].flags &= ~(1 << chan); ctx[tim].flags &= ~(1 << chan);
ctx[tim].is_periodic &= ~(1 << chan);
return 0; return 0;
} }
@ -141,8 +168,10 @@ static inline void irq_handler(int num)
if (dev(num)->EVENTS_COMPARE[i] == 1) { if (dev(num)->EVENTS_COMPARE[i] == 1) {
dev(num)->EVENTS_COMPARE[i] = 0; dev(num)->EVENTS_COMPARE[i] = 0;
if (ctx[num].flags & (1 << i)) { if (ctx[num].flags & (1 << i)) {
if ((ctx[num].is_periodic & (1 << i)) == 0) {
ctx[num].flags &= ~(1 << i); ctx[num].flags &= ~(1 << i);
dev(num)->INTENCLR = (TIMER_INTENSET_COMPARE0_Msk << i); dev(num)->INTENCLR = (TIMER_INTENSET_COMPARE0_Msk << i);
}
ctx[num].cb(ctx[num].arg, i); ctx[num].cb(ctx[num].arg, i);
} }
} }