first cut at turnon scripts for EasyTimer v2

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

diff --git a/src/stm/ao_beep_stm.c b/src/stm/ao_beep_stm.c
index 2746d7f8e60b558e48056f2b3653daf237a6be2b..4db03a5b4a41b95de41c573ec5aafa1584c97522 100644 (file)
--- a/src/stm/ao_beep_stm.c
+++ b/src/stm/ao_beep_stm.c
@@ -17,6 +17,7 @@
  */
 
 #include "ao.h"
+#include "ao_beep.h"
 
 #if BEEPER_TIMER == 2
 #define stm_beeper     stm_tim2
@@ -39,9 +40,9 @@ ao_beep(uint8_t beep)
 {
        if (beep == 0) {
                stm_beeper.cr1 = 0;
-               stm_rcc.apb1enr &= ~(1 << RCC_BEEPER);
+               stm_rcc.apb1enr &= ~(1UL << RCC_BEEPER);
        } else {
-               stm_rcc.apb1enr |= (1 << RCC_BEEPER);
+               stm_rcc.apb1enr |= (1UL << RCC_BEEPER);
 
                stm_beeper.cr2 = ((0 << STM_TIM234_CR2_TI1S) |
                                (STM_TIM234_CR2_MMS_RESET << STM_TIM234_CR2_MMS) |
@@ -147,7 +148,7 @@ ao_beep(uint8_t beep)
 }
 
 void
-ao_beep_for(uint8_t beep, uint16_t ticks)
+ao_beep_for(uint8_t beep, AO_TICK_TYPE ticks)
 {
        ao_beep(beep);
        ao_delay(ticks);
@@ -161,5 +162,5 @@ ao_beep_init(void)
        stm_afr_set(BEEPER_PORT, BEEPER_PIN, BEEPER_AFR);
 
        /* Leave the timer off until requested */
-       stm_rcc.apb1enr &= ~(1 << RCC_BEEPER);
+       stm_rcc.apb1enr &= ~(1UL << RCC_BEEPER);
 }