Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / stmf0 / ao_beep_stm.c

diff --git a/src/stmf0/ao_beep_stm.c b/src/stmf0/ao_beep_stm.c
index 15137230a9b84d2bbba7cec8d24817b308beaafc..751e611aae3a45e5150cce85af5dc387ada5ebbf 100644 (file)
--- a/src/stmf0/ao_beep_stm.c
+++ b/src/stmf0/ao_beep_stm.c
@@ -58,7 +58,7 @@ disable(void)
 #if BEEPER_TIMER == 1
        timer.bdtr = 0;
 #endif
-       stm_rcc_enr &= ~(1 << STM_RCC_TIMER);
+       stm_rcc_enr &= ~(1UL << STM_RCC_TIMER);
 
        /* Disconnect the timer from the pin */
        stm_afr_set(BEEPER_PORT, BEEPER_PIN, STM_AFR_NONE);
@@ -376,7 +376,7 @@ ao_beep(uint8_t beep)
 }
 
 void
-ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant
+ao_beep_for(uint8_t beep, AO_TICK_TYPE ticks) 
 {
        ao_beep(beep);
        ao_delay(ticks);
@@ -386,8 +386,8 @@ ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant
 void
 ao_beep_init(void)
 {
-       ao_enable_output(BEEPER_PORT, BEEPER_PIN, BEEPER, 0);
+       ao_enable_output(BEEPER_PORT, BEEPER_PIN, 0);
 
        /* Leave the timer off until requested */
-       stm_rcc_enr &= ~(1 << STM_RCC_TIMER);
+       stm_rcc_enr &= ~(1UL << STM_RCC_TIMER);
 }