diff options
author | Perry Hung <iperry@alum.mit.edu> | 2010-03-25 19:50:13 -0400 |
---|---|---|
committer | Perry Hung <iperry@alum.mit.edu> | 2010-03-25 19:50:13 -0400 |
commit | ca8033c92a382be789d9bb325b03165004cd0bb2 (patch) | |
tree | c107b0245ef5b51ea4858116cc8f4711dfed878c /src/lib/timers.c | |
parent | 8d6bf3b196c2a0bc1adda4a04669e54fdc5b65cb (diff) | |
download | librambutan-ca8033c92a382be789d9bb325b03165004cd0bb2.tar.gz librambutan-ca8033c92a382be789d9bb325b03165004cd0bb2.zip |
Started removing STM32 STD RCC code. Compiles but doesn't run yet.
Diffstat (limited to 'src/lib/timers.c')
-rw-r--r-- | src/lib/timers.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/timers.c b/src/lib/timers.c index 773ae36..a248235 100644 --- a/src/lib/timers.c +++ b/src/lib/timers.c @@ -24,7 +24,7 @@ */ #include "libmaple.h" -#include "stm32f10x_rcc.h" +#include "rcc.h" #include "timers.h" typedef struct { @@ -79,20 +79,21 @@ void timer_init(uint8_t timer_num, uint16_t prescale) { switch(timer_num) { case 1: timer = (Timer*)TIMER1_BASE; - RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); +// rcc_enable(RCC_TIMER1); is_advanced = 1; break; case 2: timer = (Timer*)TIMER2_BASE; - RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); +// rcc_enable(RCC_TIMER2); + //RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); break; case 3: timer = (Timer*)TIMER3_BASE; - RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE); +// rcc_enable(RCC_TIMER3); break; case 4: timer = (Timer*)TIMER4_BASE; - RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM4, ENABLE); + // rcc_enable(RCC_TIMER4); break; } |