Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15124
Modified Files:
ac97_codec.c ac97_patch.c ac97_proc.c
Log Message:
don't clobber other bits in SERIAL_CFG register with AD codecs when changing codec
selection bits
Index: ac97_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ac97_codec.c 14 Mar 2004 08:46:38 -0000 1.124
+++ ac97_codec.c 29 Mar 2004 07:05:00 -0000 1.125
@@ -396,11 +396,14 @@
ac97->spec.ad18xx.pcmreg[codec] = new;
spin_unlock(&ac97->reg_lock);
/* select single codec */
- ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[codec] | ac97->spec.ad18xx.chained[codec]);
+ ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
+ (ac97->regs[AC97_AD_SERIAL_CFG] & ~0x7000) |
+ ac97->spec.ad18xx.unchained[codec] |
ac97->spec.ad18xx.chained[codec]);
/* update PCM bits */
ac97->bus->write(ac97, AC97_PCM, new);
/* select all codecs */
- ac97->bus->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
+ ac97->regs[AC97_AD_SERIAL_CFG] | 0x7000);
} else
spin_unlock(&ac97->reg_lock);
up(&ac97->spec.ad18xx.mutex);
@@ -2032,11 +2035,12 @@
if (! ac97->spec.ad18xx.id[codec])
continue;
/* select single codec */
- ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[codec] | ac97->spec.ad18xx.chained[codec]);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000,
+ ac97->spec.ad18xx.unchained[codec] |
ac97->spec.ad18xx.chained[codec]);
ac97->bus->write(ac97, AC97_AD_CODEC_CFG,
ac97->spec.ad18xx.codec_cfg[codec]);
}
/* select all codecs */
- ac97->bus->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000);
}
/* restore ac97 status */
@@ -2055,12 +2059,13 @@
if (! ac97->spec.ad18xx.id[codec])
continue;
/* select single codec */
- ac97->bus->write(ac97,
AC97_AD_SERIAL_CFG, ac97->spec.ad18xx.unchained[codec] |
ac97->spec.ad18xx.chained[codec]);
+ snd_ac97_update_bits(ac97,
AC97_AD_SERIAL_CFG, 0x7000,
+
ac97->spec.ad18xx.unchained[codec] | ac97->spec.ad18xx.chained[codec]);
/* update PCM bits */
ac97->bus->write(ac97, AC97_PCM,
ac97->spec.ad18xx.pcmreg[codec]);
}
/* select all codecs */
- ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
0x7000);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG,
0x7000, 0x7000);
continue;
} else if (i == AC97_AD_TEST ||
i == AC97_AD_CODEC_CFG ||
Index: ac97_patch.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ac97_patch.c 29 Mar 2004 07:02:21 -0000 1.41
+++ ac97_patch.c 29 Mar 2004 07:05:00 -0000 1.42
@@ -562,8 +562,11 @@
*/
int patch_ad1819(ac97_t * ac97)
{
+ unsigned short scfg;
+
// patch for Analog Devices
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, 0x7000); /* select all codecs */
+ scfg = snd_ac97_read(ac97, AC97_AD_SERIAL_CFG);
+ snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, scfg | 0x7000); /* select all
codecs */
return 0;
}
@@ -572,7 +575,7 @@
unsigned short val;
// test for unchained codec
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, mask);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, mask);
snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0000); /* ID0C, ID1C, SDIE =
off */
val = snd_ac97_read(ac97, AC97_VENDOR_ID2);
if ((val & 0xff40) != 0x5340)
@@ -588,7 +591,7 @@
static int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 };
unsigned short val;
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, cfg_bits[idx]);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, cfg_bits[idx]);
snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0004); // SDIE
val = snd_ac97_read(ac97, AC97_VENDOR_ID2);
if ((val & 0xff40) != 0x5340)
@@ -611,7 +614,8 @@
if (cidx1 < 0 && cidx2 < 0)
return;
// test for chained codecs
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[unchained_idx]);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000,
+ ac97->spec.ad18xx.unchained[unchained_idx]);
snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0002); // ID1C
ac97->spec.ad18xx.codec_cfg[unchained_idx] = 0x0002;
if (cidx1 >= 0) {
@@ -634,10 +638,13 @@
// patch for Analog Devices
unsigned short codecs[3];
+ unsigned short val;
int idx, num;
init_MUTEX(&ac97->spec.ad18xx.mutex);
+ val = snd_ac97_read(ac97, AC97_AD_SERIAL_CFG);
+ snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, val);
codecs[0] = patch_ad1881_unchained(ac97, 0, (1<<12));
codecs[1] = patch_ad1881_unchained(ac97, 1, (1<<14));
codecs[2] = patch_ad1881_unchained(ac97, 2, (1<<13));
@@ -659,7 +666,7 @@
__end:
/* select all codecs */
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000);
/* check if only one codec is present */
for (idx = num = 0; idx < 3; idx++)
if (ac97->spec.ad18xx.id[idx])
Index: ac97_proc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_proc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ac97_proc.c 23 Oct 2003 14:34:52 -0000 1.4
+++ ac97_proc.c 29 Mar 2004 07:05:00 -0000 1.5
@@ -241,12 +241,13 @@
for (idx = 0; idx < 3; idx++)
if (ac97->spec.ad18xx.id[idx]) {
/* select single codec */
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[idx] | ac97->spec.ad18xx.chained[idx]);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000,
+ ac97->spec.ad18xx.unchained[idx]
| ac97->spec.ad18xx.chained[idx]);
snd_ac97_proc_read_main(ac97, buffer, idx);
snd_iprintf(buffer, "\n\n");
}
/* select all codecs */
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000);
up(&ac97->spec.ad18xx.mutex);
snd_iprintf(buffer, "\nAD18XX configuration\n");
@@ -285,11 +286,12 @@
for (idx = 0; idx < 3; idx++)
if (ac97->spec.ad18xx.id[idx]) {
/* select single codec */
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[idx] | ac97->spec.ad18xx.chained[idx]);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000,
+ ac97->spec.ad18xx.unchained[idx]
| ac97->spec.ad18xx.chained[idx]);
snd_ac97_proc_regs_read_main(ac97, buffer, idx);
}
/* select all codecs */
- snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000);
up(&ac97->spec.ad18xx.mutex);
} else {
snd_ac97_proc_regs_read_main(ac97, buffer, 0);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
