altos: Allow beep tone spacing to be changed

New beeper needs closer spaced tones

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/kernel/ao_beep.h b/src/kernel/ao_beep.h
index 1dbc9456c117d8c03dc6bc400803e1aa1d68c9ea..8141d85a3d7d5b39ec675df4fa77966f096aeef3 100644 (file)
--- 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
  */
@@ -39,19 +33,23 @@
 #define AO_BEEP_MID_DEFAULT    94      /* 3989Hz */
 #endif
 
-#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 */