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

cpu/stm32f1: Update to match timer_init API change

Browse Source
This commit is contained in:
Joakim Nohlgård 2015-10-04 00:22:55 +02:00
parent e427caaf01
commit e43f503cb6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/stm32f1/periph/timer.c
View File

@ -45,7 +45,7 @@ typedef struct {
*/ */
static timer_conf_t config[TIMER_NUMOF]; static 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 *timer0; TIM_TypeDef *timer0;
TIM_TypeDef *timer1; TIM_TypeDef *timer1;
@ -95,7 +95,7 @@ int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int))
timer0->CR2 |= TIM_CR2_MMS_1; timer0->CR2 |= TIM_CR2_MMS_1;
/* set auto-reload and prescaler values and load new values */ /* set auto-reload and prescaler values and load new values */
timer0->ARR = 0xFFFF; timer0->ARR = 0xFFFF;
timer0->PSC = TIMER_0_PRESCALER * ticks_per_us; timer0->PSC = (TIMER_0_FREQ / freq) - 1;
// timer->EGR |= TIM_EGR_UG; // timer->EGR |= TIM_EGR_UG;
/* configure slave timer1 */ /* configure slave timer1 */