projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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..31af7f4a00ab74d19fc2fa2a54808ba286630b87 100644
(file)
--- a/
src/stmf0/ao_beep_stm.c
+++ b/
src/stmf0/ao_beep_stm.c
@@
-376,7
+376,7
@@
ao_beep(uint8_t beep)
}
void
}
void
-ao_beep_for(uint8_t beep, uint16_t ticks)
__reentrant
+ao_beep_for(uint8_t beep, uint16_t ticks)
{
ao_beep(beep);
ao_delay(ticks);
{
ao_beep(beep);
ao_delay(ticks);
@@
-386,7
+386,7
@@
ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant
void
ao_beep_init(void)
{
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);
/* Leave the timer off until requested */
stm_rcc_enr &= ~(1 << STM_RCC_TIMER);