From 3e0d6f167f2c70169bbbfad0d9aeb3b2f2d9a096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Sun, 4 Oct 2015 00:23:07 +0200 Subject: [PATCH] cpu/stm32f4: Update to match timer_init API change --- cpu/stm32f4/periph/timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/stm32f4/periph/timer.c b/cpu/stm32f4/periph/timer.c index b85168c6fd..5c513e546f 100644 --- a/cpu/stm32f4/periph/timer.c +++ b/cpu/stm32f4/periph/timer.c @@ -39,7 +39,7 @@ typedef struct { timer_conf_t config[TIMER_NUMOF]; -int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int)) +int timer_init(tim_t dev, unsigned long freq, void (*callback)(int)) { TIM_TypeDef *timer; @@ -52,7 +52,7 @@ int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int)) NVIC_SetPriority(TIMER_0_IRQ_CHAN, TIMER_IRQ_PRIO); /* select timer */ timer = TIMER_0_DEV; - timer->PSC = TIMER_0_PRESCALER * ticks_per_us; + timer->PSC = (TIMER_0_FREQ / freq) - 1; break; #endif #if TIMER_1_EN @@ -63,7 +63,7 @@ int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int)) NVIC_SetPriority(TIMER_1_IRQ_CHAN, TIMER_IRQ_PRIO); /* select timer */ timer = TIMER_1_DEV; - timer->PSC = TIMER_1_PRESCALER * ticks_per_us; + timer->PSC = (TIMER_1_FREQ / freq) - 1; break; #endif case TIMER_UNDEFINED: