X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_beep.h;h=8141d85a3d7d5b39ec675df4fa77966f096aeef3;hp=55f6117155fd3001a64c2fa6215676d9467827bf;hb=91656c9d1d6175e06d4bed8e448ac6773e172de0;hpb=24167015705ae831692b95735968b04a876f935e

diff --git a/src/kernel/ao_beep.h b/src/kernel/ao_beep.h
index 55f61171..8141d85a 100644
--- a/src/kernel/ao_beep.h
+++ b/src/kernel/ao_beep.h
@@ -3,7 +3,8 @@
  *
  * 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; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,9 +29,28 @@
  * frequency = 1/2 (24e6/32) / beep
  */
 
-#define AO_BEEP_LOW	150	/* 2500Hz */
-#define AO_BEEP_MID	94	/* 3989Hz */
-#define AO_BEEP_HIGH	75	/* 5000Hz */
+#ifndef AO_BEEP_MID_DEFAULT
+#define AO_BEEP_MID_DEFAULT	94	/* 3989Hz */
+#endif
+
+#define AO_BEEP_MID	((int) ao_config.mid_beep)
+
+#define AO_BEEP_MID_PANIC	AO_BEEP_MID_DEFAULT
+
+#ifndef AO_BEEP_MAKE_LOW
+#define AO_BEEP_MAKE_LOW(m)	((m) * 150 / 94)	/* 2500Hz */
+#endif
+
+#ifndef AO_BEEP_MAKE_HIGH
+#define AO_BEEP_MAKE_HIGH(m)	((m) * 75 / 94)		/* 5000Hz */
+#endif
+
+#define AO_BEEP_LOW	AO_BEEP_MAKE_LOW(AO_BEEP_MID)
+#define AO_BEEP_HIGH	AO_BEEP_MAKE_HIGH(AO_BEEP_MID)
+
+#define AO_BEEP_LOW_PANIC	AO_BEEP_MAKE_LOW(AO_BEEP_MID_PANIC)
+#define AO_BEEP_HIGH_PANIC	AO_BEEP_MAKE_HIGH(AO_BEEP_MID_PANIC)
+
 #define AO_BEEP_OFF	0	/* off */
 
 #define AO_BEEP_g	240	/* 1562.5Hz */
@@ -65,7 +85,7 @@ ao_beep(uint8_t beep);
 
 /* Turn on the beeper for the specified time */
 void
-ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant;
+ao_beep_for(uint8_t beep, AO_TICK_TYPE ticks);
 
 /* Initialize the beeper */
 void