projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b99315c
)
Move beep_init to end of file to be consistent with other files
author
Keith Packard
<keithp@keithp.com>
Sat, 25 Apr 2009 02:09:09 +0000
(19:09 -0700)
committer
Keith Packard
<keithp@keithp.com>
Sat, 25 Apr 2009 02:09:09 +0000
(19:09 -0700)
ao_beep.c
patch
|
blob
|
history
diff --git
a/ao_beep.c
b/ao_beep.c
index 5080a8e8166cd74835d454659567c4965ef67857..93c2e890965d80b5690d6ee9cd9e97ed829a31a1 100644
(file)
--- a/
ao_beep.c
+++ b/
ao_beep.c
@@
-17,18
+17,6
@@
#include "ao.h"
#include "ao.h"
-void
-ao_beep_init(void)
-{
- /* Our beeper is on P2_0, which is hooked to timer 4 using
- * configuration alternative 2
- */
- P2_0 = 0;
- P2SEL = (P2SEL & ~P2SEL_SELP2_0_MASK) | P2SEL_SELP2_0_GPIO;
- PERCFG = (PERCFG & ~PERCFG_T4CFG_ALT_MASK) | PERCFG_T4CFG_ALT_2;
- T4CCTL0 = TxCCTLy_CMP_TOGGLE|TxCCTLy_CMP_MODE_ENABLE;
-}
-
void
ao_beep(uint8_t beep)
{
void
ao_beep(uint8_t beep)
{
@@
-50,3
+38,15
@@
ao_beep_for(uint8_t beep, uint16_t ticks)
ao_delay(ticks);
ao_beep(0);
}
ao_delay(ticks);
ao_beep(0);
}
+
+void
+ao_beep_init(void)
+{
+ /* Our beeper is on P2_0, which is hooked to timer 4 using
+ * configuration alternative 2
+ */
+ P2_0 = 0;
+ P2SEL = (P2SEL & ~P2SEL_SELP2_0_MASK) | P2SEL_SELP2_0_GPIO;
+ PERCFG = (PERCFG & ~PERCFG_T4CFG_ALT_MASK) | PERCFG_T4CFG_ALT_2;
+ T4CCTL0 = TxCCTLy_CMP_TOGGLE|TxCCTLy_CMP_MODE_ENABLE;
+}