vserver 1.9.3

[linux-2.6.git] / sound / pci / emu10k1 / emumixer.c

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index bdb5670..f73ac0e 100644 (file)
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -32,7 +32,7 @@
 #include <sound/core.h>
 #include <sound/emu10k1.h>
 
-#define chip_t emu10k1_t
+#define AC97_ID_STAC9758       0x83847658
 
 static int snd_emu10k1_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
@@ -419,7 +419,7 @@ static snd_kcontrol_new_t snd_audigy_shared_spdif __devinitdata =
  */
 static void snd_emu10k1_mixer_free_ac97(ac97_t *ac97)
 {
-       emu10k1_t *emu = snd_magic_cast(emu10k1_t, ac97->private_data, return);
+       emu10k1_t *emu = ac97->private_data;
        emu->ac97 = NULL;
 }
 
@@ -510,13 +510,14 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
        };
 
        if (!emu->no_ac97) {
-               ac97_bus_t bus, *pbus;
-               ac97_t ac97;
-
-               memset(&bus, 0, sizeof(bus));
-               bus.write = snd_emu10k1_ac97_write;
-               bus.read = snd_emu10k1_ac97_read;
-               if ((err = snd_ac97_bus(emu->card, &bus, &pbus)) < 0)
+               ac97_bus_t *pbus;
+               ac97_template_t ac97;
+               static ac97_bus_ops_t ops = {
+                       .write = snd_emu10k1_ac97_write,
+                       .read = snd_emu10k1_ac97_read,
+               };
+
+               if ((err = snd_ac97_bus(emu->card, 0, &ops, NULL, &pbus)) < 0)
                        return err;
                
                memset(&ac97, 0, sizeof(ac97));
@@ -526,11 +527,20 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                        return err;
                if (emu->audigy) {
                        /* set master volume to 0 dB */
-                       snd_ac97_write(emu->ac97, AC97_MASTER, 0x0202);
+                       snd_ac97_write(emu->ac97, AC97_MASTER, 0x0000);
                        /* set capture source to mic */
                        snd_ac97_write(emu->ac97, AC97_REC_SEL, 0x0000);
                        c = audigy_remove_ctls;
                } else {
+                       /*
+                        * Credits for cards based on STAC9758:
+                        *   James Courtier-Dutton <James@superbug.demon.co.uk>
+                        *   Voluspa <voluspa@comhem.se>
+                        */
+                       if (emu->ac97->id == AC97_ID_STAC9758) {
+                               emu->rear_ac97 = 1;
+                               snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
+                       }
                        /* remove unused AC97 controls */
                        snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
                        snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);