diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-05-07 09:24:36 +0200 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2012-05-07 16:31:40 +0400 |
| commit | f94e9b9b3535ea977c5a919f88adf36da95a8292 (patch) | |
| tree | a3a36dc2a3524e164067254de48b16a434f31f2a /hw | |
| parent | d044be3714db9c3750c430a2bb1be74beee6fd27 (diff) | |
| download | qemu-f94e9b9b3535ea977c5a919f88adf36da95a8292.zip | |
hw/ac97: Use AC97_Record_Gain_Mute not AC97_Line_In_Volume_Mute
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 <hdegoede@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ac97.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -511,6 +511,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); @@ -536,7 +537,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); } @@ -599,7 +600,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: @@ -667,6 +667,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: @@ -1178,8 +1179,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); |