[Qemu-devel] [PATCH 3/5] hw/ac97: Use AC97_Record_Gain_Mute not AC97_Line_In_Volume_Mute

[Hans de Goede]

After commit 19677a380a70348134ed7650b294522617eb03fc:
"hw/ac97: add support for volume control"

We are (correctly) using AC97_Record_Gain_Mute and not AC97_Line_In_Volume_Mute
for recording volume, but various places in hw/ac97 were still assumimg that
we are using AC97_Line_In_Volume_Mute for record volume control, this patch
fixes this.

Signed-off-by: Hans de Goede <address@hidden>
---
 hw/ac97.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hw/ac97.c b/hw/ac97.c
index 432382d..524dd7f 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -508,6 +508,7 @@ static void mixer_reset (AC97LinkState *s)
     mixer_store (s, AC97_PC_BEEP_Volume_Mute     , 0x0000);
     mixer_store (s, AC97_Phone_Volume_Mute       , 0x0000);
     mixer_store (s, AC97_Mic_Volume_Mute         , 0x0000);
+    mixer_store (s, AC97_Line_In_Volume_Mute     , 0x0000);
     mixer_store (s, AC97_CD_Volume_Mute          , 0x0000);
     mixer_store (s, AC97_Video_Volume_Mute       , 0x0000);
     mixer_store (s, AC97_Aux_Volume_Mute         , 0x0000);
@@ -533,7 +534,7 @@ static void mixer_reset (AC97LinkState *s)
     record_select (s, 0);
     set_volume (s, AC97_Master_Volume_Mute, 0x8000);
     set_volume (s, AC97_PCM_Out_Volume_Mute, 0x8808);
-    set_volume (s, AC97_Line_In_Volume_Mute, 0x8808);
+    set_volume (s, AC97_Record_Gain_Mute, 0x8808);
 
     reset_voices (s, active);
 }
@@ -596,7 +597,6 @@ static void nam_writew (void *opaque, uint32_t addr, 
uint32_t val)
     case AC97_PCM_Out_Volume_Mute:
     case AC97_Master_Volume_Mute:
     case AC97_Record_Gain_Mute:
-    case AC97_Line_In_Volume_Mute:
         set_volume (s, index, val);
         break;
     case AC97_Record_Select:
@@ -664,6 +664,7 @@ static void nam_writew (void *opaque, uint32_t addr, 
uint32_t val)
     case AC97_PC_BEEP_Volume_Mute:
     case AC97_Phone_Volume_Mute:
     case AC97_Mic_Volume_Mute:
+    case AC97_Line_In_Volume_Mute:
     case AC97_CD_Volume_Mute:
     case AC97_Video_Volume_Mute:
     case AC97_Aux_Volume_Mute:
@@ -1175,8 +1176,8 @@ static int ac97_post_load (void *opaque, int version_id)
                 mixer_load (s, AC97_Master_Volume_Mute));
     set_volume (s, AC97_PCM_Out_Volume_Mute,
                 mixer_load (s, AC97_PCM_Out_Volume_Mute));
-    set_volume (s, AC97_Line_In_Volume_Mute,
-                mixer_load (s, AC97_Line_In_Volume_Mute));
+    set_volume (s, AC97_Record_Gain_Mute,
+                mixer_load (s, AC97_Record_Gain_Mute));
 
     active[PI_INDEX] = !!(s->bm_regs[PI_INDEX].cr & CR_RPBM);
     active[PO_INDEX] = !!(s->bm_regs[PO_INDEX].cr & CR_RPBM);
-- 
1.7.10