aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f4/timer.c
diff options
context:
space:
mode:
authorchrysn2012-05-01 13:49:34 +0200
committerchrysn2012-05-01 13:49:34 +0200
commit282891f8a61d6be822da978e44f0ed3e807c0cd6 (patch)
treef53552961e26bf1a81d0ba015bcc6e876186205b /lib/stm32/f4/timer.c
parent99975d9a058690f6faa3077dccadbdd5353db4fe (diff)
parent3596075ee0f189f8a95090c4fb5522844255a029 (diff)
Merge branch 'master' into efm32
Diffstat (limited to 'lib/stm32/f4/timer.c')
-rw-r--r--lib/stm32/f4/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32/f4/timer.c b/lib/stm32/f4/timer.c
index bb7b0e7..6d5ab9d 100644
--- a/lib/stm32/f4/timer.c
+++ b/lib/stm32/f4/timer.c
@@ -119,8 +119,8 @@ void timer_clear_flag(u32 timer_peripheral, u32 flag)
TIM_SR(timer_peripheral) &= ~flag;
}
-void timer_set_mode(u32 timer_peripheral, u8 clock_div,
- u8 alignment, u8 direction)
+void timer_set_mode(u32 timer_peripheral, u32 clock_div,
+ u32 alignment, u32 direction)
{
u32 cr1;