From: Keith Packard Date: Sat, 25 Apr 2009 02:09:09 +0000 (-0700) Subject: Move beep_init to end of file to be consistent with other files X-Git-Tag: 0.1~24 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=2f781beb73ef24ab5fbe2688a83d07ad26c15972 Move beep_init to end of file to be consistent with other files --- diff --git a/ao_beep.c b/ao_beep.c index 5080a8e8..93c2e890 100644 --- a/ao_beep.c +++ b/ao_beep.c @@ -17,18 +17,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) { @@ -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; +}