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

diff --git a/src/kernel/ao_beep.h b/src/kernel/ao_beep.h
index 1306af62..8141d85a 100644
--- a/src/kernel/ao_beep.h
+++ b/src/kernel/ao_beep.h
@@ -19,12 +19,6 @@
 #ifndef _AO_BEEP_H_
 #define _AO_BEEP_H_
 
-#ifndef HAS_BEEP_CONFIG
-#if defined(USE_EEPROM_CONFIG) && USE_EEPROM_CONFIG || HAS_EEPROM
-#define HAS_BEEP_CONFIG	1
-#endif
-#endif
-
 /*
  * ao_beep.c
  */
@@ -35,21 +29,27 @@
  * frequency = 1/2 (24e6/32) / beep
  */
 
+#ifndef AO_BEEP_MID_DEFAULT
 #define AO_BEEP_MID_DEFAULT	94	/* 3989Hz */
-
-#if HAS_BEEP_CONFIG
-#define AO_BEEP_MID	ao_config.mid_beep
-#else
-#define AO_BEEP_MID	AO_BEEP_MID_DEFAULT
 #endif
 
+#define AO_BEEP_MID	((int) ao_config.mid_beep)
+
 #define AO_BEEP_MID_PANIC	AO_BEEP_MID_DEFAULT
 
-#define AO_BEEP_LOW	AO_BEEP_MID * 150 / 94	/* 2500Hz */
-#define AO_BEEP_HIGH	AO_BEEP_MID * 75 / 94	/* 5000Hz */
+#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_MID_PANIC * 150 / 94)
-#define AO_BEEP_HIGH_PANIC	(AO_BEEP_MID_PANIC * 75 / 94)
+#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 */
 
@@ -85,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