+
#endif /* audio.h */
diff --git a/hw/ac97.c b/hw/ac97.c
-index ade2719..5ec3044 100644
+index ade2719..0d4b86e 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
-@@ -172,7 +172,8 @@ enum {
- #ifdef DEBUG_AC97
- #define dolog(...) AUD_log ("ac97", __VA_ARGS__)
- #else
--#define dolog(...)
-+extern int term_printf(const char *, ...);
-+#define dolog(...) term_printf(__VA_ARGS__)
- #endif
-
- typedef struct PCIAC97LinkState {
-@@ -527,6 +528,22 @@ static void record_select (AC97LinkState *s, uint32_t val)
+@@ -527,6 +527,22 @@ static void record_select (AC97LinkState *s, uint32_t val)
ls = aud_to_ac97_record_source (als);
mixer_store (s, AC97_Record_Select, rs | (ls << 8));
}
#endif
static void mixer_reset (AC97LinkState *s)
-@@ -568,6 +585,8 @@ static void mixer_reset (AC97LinkState *s)
+@@ -568,6 +584,8 @@ static void mixer_reset (AC97LinkState *s)
set_volume (s, AC97_Master_Volume_Mute, AUD_MIXER_VOLUME , 0x8000);
set_volume (s, AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM , 0x8808);
set_volume (s, AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN, 0x8808);
#endif
reset_voices (s, active);
}
-@@ -632,10 +651,10 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
+@@ -632,10 +650,10 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
val |= mixer_load (s, index) & 0xf;
mixer_store (s, index, val);
break;