summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-04-24 19:09:09 -0700
committerKeith Packard <keithp@keithp.com>2009-04-24 19:09:09 -0700
commit2f781beb73ef24ab5fbe2688a83d07ad26c15972 (patch)
treef5879eb62ae13fa05026cc59508ade8fdda14365
parentb99315cee4ab796376458a2442cf36806fa4aed3 (diff)
Move beep_init to end of file to be consistent with other files
-rw-r--r--ao_beep.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/ao_beep.c b/ao_beep.c
index 5080a8e8..93c2e890 100644
--- a/ao_beep.c
+++ b/ao_beep.c
@@ -18,18 +18,6 @@
#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)
{
if (beep == 0) {
@@ -50,3 +38,15 @@ ao_beep_for(uint8_t beep, uint16_t ticks)
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;
+}