X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_beep.c;h=3642f4c6600468371ce580b402e3ed00432e8697;hp=ae5e36a6249cf4470edf0b7e9f24876b1ca7195c;hb=4a050704ad2c497e9f1b0988334228b0bbc4c170;hpb=f3f25a1cec7d2a034aa544569cfd23bea1a996c5

diff --git a/ao_beep.c b/ao_beep.c
index ae5e36a6..3642f4c6 100644
--- a/ao_beep.c
+++ b/ao_beep.c
@@ -3,8 +3,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,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)
 {
@@ -45,9 +32,21 @@ ao_beep(uint8_t beep)
 }
 
 void
-ao_beep_for(uint8_t beep, uint16_t ticks)
+ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant
 {
 	ao_beep(beep);
 	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;
+}