Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8224

Modified Files:
        ac97_codec.c ac97_id.h ac97_local.h ac97_patch.c ac97_patch.h 
Log Message:
- Added the single mixer control with AC97 2.3 paging.
- Handle the paging for some ALC655/658 registers.
- Added the experimental support for ALC850.



Index: ac97_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ac97_codec.c        27 May 2004 18:15:54 -0000      1.134
+++ ac97_codec.c        28 May 2004 09:27:09 -0000      1.135
@@ -114,6 +114,7 @@
 { 0x414c4720, 0xfffffff0, "ALC650",            patch_alc650,   NULL },
 { 0x414c4760, 0xfffffff0, "ALC655",            patch_alc655,   NULL },
 { 0x414c4780, 0xfffffff0, "ALC658",            patch_alc655,   NULL },
+{ 0x414c4790, 0xfffffff0, "ALC850",            patch_alc850,   NULL },
 { 0x414c4730, 0xffffffff, "ALC101",            NULL,           NULL },
 { 0x414c4740, 0xfffffff0, "ALC202",            NULL,           NULL },
 { 0x414c4750, 0xfffffff0, "ALC250",            NULL,           NULL },
@@ -274,7 +275,7 @@
 {
        if (!snd_ac97_valid_reg(ac97, reg))
                return;
-       if ((ac97->id & 0xffffff00) == 0x414c4300) {
+       if ((ac97->id & 0xffffff00) == AC97_ID_ALC100) {
                /* Fix H/W bug of ALC100/100P */
                if (reg == AC97_MASTER || reg == AC97_HEADPHONE)
                        ac97->bus->write(ac97, AC97_RESET, 0);  /* reset audio codec */
@@ -545,7 +546,7 @@
        int reg = kcontrol->private_value & 0xff;
        int shift = (kcontrol->private_value >> 8) & 0xff;
        int mask = (kcontrol->private_value >> 16) & 0xff;
-       int invert = (kcontrol->private_value >> 24) & 0xff;
+       int invert = (kcontrol->private_value >> 24) & 0x01;
        
        ucontrol->value.integer.value[0] = (snd_ac97_read_cache(ac97, reg) >> shift) & 
mask;
        if (invert)
@@ -559,7 +560,7 @@
        int reg = kcontrol->private_value & 0xff;
        int shift = (kcontrol->private_value >> 8) & 0xff;
        int mask = (kcontrol->private_value >> 16) & 0xff;
-       int invert = (kcontrol->private_value >> 24) & 0xff;
+       int invert = (kcontrol->private_value >> 24) & 0x01;
        unsigned short val;
        
        val = (ucontrol->value.integer.value[0] & mask);
@@ -625,6 +626,40 @@
                                    (val1 << shift_left) | (val2 << shift_right));
 }
 
+int snd_ac97_getput_page(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol,
+                        int (*func)(snd_kcontrol_t *, snd_ctl_elem_value_t *))
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       int reg = kcontrol->private_value & 0xff;
+       int err;
+
+       if ((ac97->ext_id & AC97_EI_REV_MASK) >= AC97_EI_REV_23 &&
+           (reg >= 0x60 && reg < 0x70)) {
+               unsigned short page_save;
+               unsigned short page = (kcontrol->private_value >> 25) & 0x0f;
+               down(&ac97->mutex); /* lock paging */
+               page_save = snd_ac97_read(ac97, AC97_INT_PAGING) & AC97_PAGE_MASK;
+               snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);
+               err = func(kcontrol, ucontrol);
+               snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
+               down(&ac97->mutex); /* unlock paging */
+       } else
+               err = func(kcontrol, ucontrol);
+       return err;
+}
+
+/* for rev2.3 paging */
+int snd_ac97_page_get_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       return snd_ac97_getput_page(kcontrol, ucontrol, snd_ac97_get_single);
+}
+
+/* for rev2.3 paging */
+int snd_ac97_page_put_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       return snd_ac97_getput_page(kcontrol, ucontrol, snd_ac97_put_single);
+}
+
 static const snd_kcontrol_new_t snd_ac97_controls_master_mono[2] = {
 AC97_SINGLE("Master Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
 AC97_SINGLE("Master Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1)
@@ -1435,9 +1470,7 @@
                if ((err = snd_ac97_cmute_new(card, "PCM Playback Switch", AC97_PCM, 
ac97)) < 0)
                        return err;
                /* FIXME: C-Media chips have no PCM volume!! */
-               if (/*ac97->id == 0x434d4941 ||*/
-                   ac97->id == 0x434d4942 ||
-                   ac97->id == 0x434d4961)
+               if (ac97->id == AC97_ID_CM9739)
                        snd_ac97_write_cache(ac97, AC97_PCM, 0x9f1f);
                else {
                        if ((err = snd_ac97_cvol_new(card, "PCM Playback Volume", 
AC97_PCM, 31, ac97)) < 0)
@@ -2080,18 +2113,28 @@
        snd_ac97_write(ac97, AC97_GENERAL_PURPOSE, 0);
 
        snd_ac97_write(ac97, AC97_POWERDOWN, ac97->regs[AC97_POWERDOWN]);
-       ac97->bus->write(ac97, AC97_MASTER, 0x8101);
-       for (i = 0; i < 10; i++) {
-               if (snd_ac97_read(ac97, AC97_MASTER) == 0x8101)
-                       break;
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(1);
-       }
-       /* FIXME: extra delay */
-       ac97->bus->write(ac97, AC97_MASTER, 0x8000);
-       if (snd_ac97_read(ac97, AC97_MASTER) != 0x8000) {
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(HZ/4);
+       if (ac97_is_audio(ac97)) {
+               ac97->bus->write(ac97, AC97_MASTER, 0x8101);
+               for (i = HZ/10; i >= 0; i--) {
+                       if (snd_ac97_read(ac97, AC97_MASTER) == 0x8101)
+                               break;
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(1);
+               }
+               /* FIXME: extra delay */
+               ac97->bus->write(ac97, AC97_MASTER, 0x8000);
+               if (snd_ac97_read(ac97, AC97_MASTER) != 0x8000) {
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(HZ/4);
+               }
+       } else {
+               for (i = HZ/10; i >= 0; i--) {
+                       unsigned short val = snd_ac97_read(ac97, AC97_EXTENDED_MID);
+                       if (val != 0xffff && (val & 1) != 0)
+                               break;
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(1);
+               }
        }
 __reset_ready:
 

Index: ac97_id.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_id.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ac97_id.h   7 Apr 2003 15:26:27 -0000       1.8
+++ ac97_id.h   28 May 2004 09:27:09 -0000      1.9
@@ -45,7 +45,14 @@
 #define AC97_ID_CS4201         0x43525948
 #define AC97_ID_CS4205         0x43525958
 #define AC97_ID_CS_MASK                0xfffffff8      /* bit 0-2: rev */
+#define AC97_ID_ALC100         0x414c4300
 #define AC97_ID_ALC650         0x414c4720
+#define AC97_ID_ALC650D                0x414c4721
+#define AC97_ID_ALC650E                0x414c4722
+#define AC97_ID_ALC650F                0x414c4723
+#define AC97_ID_ALC655         0x414c4760
+#define AC97_ID_ALC658         0x414c4780
+#define AC97_ID_ALC850         0x414c4790
 #define AC97_ID_YMF753         0x594d4803
 #define AC97_ID_VT1616         0x49434551
 #define AC97_ID_CM9738         0x434d4941

Index: ac97_local.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_local.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ac97_local.h        24 May 2004 13:24:42 -0000      1.6
+++ ac97_local.h        28 May 2004 09:27:09 -0000      1.7
@@ -23,10 +23,15 @@
  */
 
 #define AC97_SINGLE_VALUE(reg,shift,mask,invert) ((reg) | ((shift) << 8) | ((mask) << 
16) | ((invert) << 24))
+#define AC97_PAGE_SINGLE_VALUE(reg,shift,mask,invert,page) ((reg) | ((shift) << 8) | 
((mask) << 16) | ((invert) << 24) | ((page) << 25))
 #define AC97_SINGLE(xname, reg, shift, mask, invert) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_ac97_info_single, \
   .get = snd_ac97_get_single, .put = snd_ac97_put_single, \
   .private_value =  AC97_SINGLE_VALUE(reg, shift, mask, invert) }
+#define AC97_PAGE_SINGLE(xname, reg, shift, mask, invert, page)                \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_ac97_info_single, \
+  .get = snd_ac97_page_get_single, .put = snd_ac97_page_put_single, \
+  .private_value =  AC97_PAGE_SINGLE_VALUE(reg, shift, mask, invert, page) }
 
 /* ac97_codec.c */
 extern const char *snd_ac97_stereo_enhancements[];
@@ -37,6 +42,8 @@
 int snd_ac97_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
 int snd_ac97_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
 int snd_ac97_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
+int snd_ac97_page_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * 
ucontrol);
+int snd_ac97_page_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * 
ucontrol);
 int snd_ac97_try_bit(ac97_t * ac97, int reg, int bit);
 int snd_ac97_remove_ctl(ac97_t *ac97, const char *name, const char *suffix);
 int snd_ac97_rename_ctl(ac97_t *ac97, const char *src, const char *dst, const char 
*suffix);

Index: ac97_patch.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ac97_patch.c        26 May 2004 07:34:55 -0000      1.51
+++ ac97_patch.c        28 May 2004 09:27:09 -0000      1.52
@@ -51,6 +51,21 @@
        return 0;
 }
 
+/* set to the page, update bits and restore the page */
+static int ac97_update_bits_page(ac97_t *ac97, unsigned short reg, unsigned short 
mask, unsigned short value, unsigned short page)
+{
+       unsigned short page_save;
+       int ret;
+
+       down(&ac97->mutex);
+       page_save = snd_ac97_read(ac97, AC97_INT_PAGING) & AC97_PAGE_MASK;
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);
+       ret = snd_ac97_update_bits(ac97, reg, mask, value);
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
+       down(&ac97->mutex); /* unlock paging */
+       return ret;
+}
+
 /* The following snd_ac97_ymf753_... items added by David Shust ([EMAIL PROTECTED]) */
 
 /* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */
@@ -494,8 +509,6 @@
                val = 0;
        else
                val = 4 | (ucontrol->value.enumerated.item[0] - 1);
-       down(&ac97->mutex);
-       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
        ret = snd_ac97_update_bits(ac97, AC97_SIGMATEL_OUTSEL,
                                   7 << shift, val << shift);
        up(&ac97->mutex);
@@ -531,14 +544,9 @@
 {
        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
        int shift = kcontrol->private_value;
-       int ret;
 
-       down(&ac97->mutex);
-       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
-       ret = snd_ac97_update_bits(ac97, AC97_SIGMATEL_INSEL, 7 << shift,
-                                  ucontrol->value.enumerated.item[0] << shift);
-       up(&ac97->mutex);
-       return ret;
+       return ac97_update_bits_page(ac97, AC97_SIGMATEL_INSEL, 7 << shift,
+                                    ucontrol->value.enumerated.item[0] << shift, 0);
 }
 
 static int snd_ac97_stac9758_phonesel_info(snd_kcontrol_t *kcontrol, 
snd_ctl_elem_info_t *uinfo)
@@ -565,14 +573,9 @@
 static int snd_ac97_stac9758_phonesel_put(snd_kcontrol_t *kcontrol, 
snd_ctl_elem_value_t *ucontrol)
 {
        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-       int ret;
 
-       down(&ac97->mutex);
-       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
-       ret = snd_ac97_update_bits(ac97, AC97_SIGMATEL_IOMISC, 3,
-                                  ucontrol->value.enumerated.item[0]);
-       up(&ac97->mutex);
-       return ret;
+       return ac97_update_bits_page(ac97, AC97_SIGMATEL_IOMISC, 3,
+                                    ucontrol->value.enumerated.item[0], 0);
 }
 
 #define STAC9758_OUTPUT_JACK(xname, shift) \
@@ -1245,7 +1248,7 @@
 }
 
 /*
- * realtek ALC65x codecs
+ * realtek ALC65x/850 codecs
  */
 static int snd_ac97_alc650_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * 
ucontrol)
 {
@@ -1394,20 +1397,19 @@
 static int snd_ac97_alc655_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * 
ucontrol)
 {
         ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        int change;
 
        /* misc control; vrefout disable */
        snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
                             ucontrol->value.integer.value[0] ? (1 << 12) : 0);
-       change = snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 10,
-                                     ucontrol->value.integer.value[0] ? (1 << 10) : 
0);
-       return change;
+       return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 10,
+                                    ucontrol->value.integer.value[0] ? (1 << 10) : 0,
+                                    0);
 }
 
 
 static const snd_kcontrol_new_t snd_ac97_controls_alc655[] = {
-       AC97_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0),
-       AC97_SINGLE("Line-In As Surround", AC97_ALC650_MULTICH, 9, 1, 0),
+       AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
+       AC97_PAGE_SINGLE("Line-In As Surround", AC97_ALC650_MULTICH, 9, 1, 0, 0),
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Mic As Center/LFE",
@@ -1434,7 +1436,6 @@
               texts_658[uinfo->value.enumerated.item] :
               texts_655[uinfo->value.enumerated.item]);
        return 0;
-
 }
 
 static int alc655_iec958_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
*ucontrol)
@@ -1453,13 +1454,15 @@
 static int alc655_iec958_route_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
*ucontrol)
 {
        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-       return snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 3 << 12,
-                                   (unsigned 
short)ucontrol->value.enumerated.item[0]);
+
+       return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 3 << 12,
+                                    (unsigned 
short)ucontrol->value.enumerated.item[0],
+                                    0);
 }
 
 static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = {
-        AC97_SINGLE("IEC958 Capture Switch", AC97_ALC650_MULTICH, 11, 1, 0),
-        AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0),
+        AC97_PAGE_SINGLE("IEC958 Capture Switch", AC97_ALC650_MULTICH, 11, 1, 0, 0),
+        AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0),
        {
                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name   = "IEC958 Playback Route",
@@ -1494,6 +1497,9 @@
 
        ac97->build_ops = &patch_alc655_ops;
 
+       /* assume only page 0 for writing cache */
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
+
        /* adjust default values */
        val = snd_ac97_read(ac97, 0x7a); /* misc control */
        val |= (1 << 1); /* spdif input pin */
@@ -1512,6 +1518,120 @@
        return 0;
 }
 
+
+#define AC97_ALC850_JACK_SELECT        0x76
+#define AC97_ALC850_MISC1      0x7a
+
+static int ac97_alc850_surround_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * 
ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = ((ac97->regs[AC97_ALC850_JACK_SELECT] >> 
12) & 7) == 2;
+        return 0;
+}
+
+static int ac97_alc850_surround_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * 
ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+       /* SURR 1kOhm (bit4), Amp (bit5) */
+       snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<4)|(1<<5),
+                            ucontrol->value.integer.value[0] ? (1<<5) : (1<<4));
+       /* LINE-IN = 0, SURROUND = 2 */
+       return snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 12,
+                                   ucontrol->value.integer.value[0] ? (2<<12) : 
(0<<12));
+}
+
+static int ac97_alc850_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * 
ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = ((ac97->regs[AC97_ALC850_JACK_SELECT] >> 
4) & 7) == 2;
+        return 0;
+}
+
+static int ac97_alc850_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * 
ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+       /* Vref disable (bit12), 1kOhm (bit13) */
+       snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<12)|(1<<13),
+                            ucontrol->value.integer.value[0] ? (1<<12) : (1<<13));
+       /* MIC-IN = 1, CENTER-LFE = 2 */
+       return snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 4,
+                                   ucontrol->value.integer.value[0] ? (2<<4) : 
(1<<4));
+}
+
+static const snd_kcontrol_new_t snd_ac97_controls_alc850[] = {
+       AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Line-In As Surround",
+               .info = snd_ac97_info_single,
+               .get = ac97_alc850_surround_get,
+               .put = ac97_alc850_surround_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic As Center/LFE",
+               .info = snd_ac97_info_single,
+               .get = ac97_alc850_mic_get,
+               .put = ac97_alc850_mic_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+       },
+
+};
+
+static int patch_alc850_specific(ac97_t *ac97)
+{
+       int err;
+
+       if ((err = patch_build_controls(ac97, snd_ac97_controls_alc850, 
ARRAY_SIZE(snd_ac97_controls_alc850))) < 0)
+               return err;
+       if (ac97->ext_id & AC97_EI_SPDIF) {
+               if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc655, 
ARRAY_SIZE(snd_ac97_spdif_controls_alc655))) < 0)
+                       return err;
+       }
+       return 0;
+}
+
+static struct snd_ac97_build_ops patch_alc850_ops = {
+       .build_specific = patch_alc850_specific
+};
+
+int patch_alc850(ac97_t *ac97)
+{
+       ac97->build_ops = &patch_alc850_ops;
+
+       ac97->spec.dev_flags = 0; /* for IEC958 playback route - ALC655 compatible */
+
+       /* assume only page 0 for writing cache */
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
+
+       /* adjust default values */
+       /* set default: spdif-in enabled,
+          spdif-in monitor off, spdif-in PCM off
+          center on mic off, surround on line-in off
+          duplicate front off
+       */
+       snd_ac97_write_cache(ac97, AC97_ALC650_MULTICH, 1<<15);
+       /* SURR_OUT: on, Surr 1kOhm: on, Surr Amp: off, Front 1kOhm: off
+        * Front Amp: on, Vref: enable, Center 1kOhm: on, Mix: on
+        */
+       snd_ac97_write_cache(ac97, 0x7a, (1<<1)|(1<<4)|(0<<5)|(1<<6)|
+                            (1<<7)|(0<<12)|(1<<13)|(0<<14));
+       /* detection UIO2,3: all path floating, UIO3: MIC, Vref2: disable,
+        * UIO1: FRONT, Vref3: disable, UIO3: LINE, Front-Mic: mute
+        */
+       snd_ac97_write_cache(ac97, 0x76, (0<<0)|(0<<2)|(1<<4)|(1<<7)|(2<<8)|
+                            (1<<11)|(0<<12)|(1<<15));
+
+       /* full DAC volume */
+       snd_ac97_write_cache(ac97, AC97_ALC650_SURR_DAC_VOL, 0x0808);
+       snd_ac97_write_cache(ac97, AC97_ALC650_LFE_DAC_VOL, 0x0808);
+       return 0;
+}
+
+
 /*
  * C-Media CM97xx codecs
  */

Index: ac97_patch.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ac97_patch.h        14 Mar 2004 08:46:39 -0000      1.15
+++ ac97_patch.h        28 May 2004 09:27:09 -0000      1.16
@@ -49,6 +49,7 @@
 int patch_ad1985(ac97_t * ac97);
 int patch_alc650(ac97_t * ac97);
 int patch_alc655(ac97_t * ac97);
+int patch_alc850(ac97_t * ac97);
 int patch_cm9738(ac97_t * ac97);
 int patch_cm9739(ac97_t * ac97);
 int patch_vt1616(ac97_t * ac97);



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to