Update of /cvsroot/alsa/alsa-kernel/pci
In directory usw-pr-cvs1:/tmp/cvs-serv5758
Modified Files:
intel8x0.c
Log Message:
- more clear SDIN detection for ICH4
- enhanced AC'97 detection/setup code to support more AC'97 codecs than one
Index: intel8x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- intel8x0.c 26 Aug 2002 11:46:58 -0000 1.41
+++ intel8x0.c 26 Aug 2002 13:08:35 -0000 1.42
@@ -552,14 +552,12 @@
res = iagetword(chip, reg + ac97->num * 0x80);
if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) {
/* reset RCS and preserve other R/WC bits */
- iputdword(chip, ICHREG(GLOB_STA), tmp &
~(ICH_SRI|ICH_PRI|ICH_GSCI));
+ iputdword(chip, ICHREG(GLOB_STA), tmp &
+~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
if (! chip->in_ac97_init)
snd_printk("codec_read %d: read timeout for register
0x%x\n", ac97->num, reg);
res = 0xffff;
}
}
- if (chip->device_type == DEVICE_INTEL_ICH4)
- chip->ac97_sdin[ac97->num] = igetbyte(chip, ICHREG(SDM)) &
ICH_LDI_MASK;
spin_unlock(&chip->ac97_lock);
return res;
}
@@ -1491,7 +1489,7 @@
static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock)
{
- ac97_t ac97, *x97, *x97_1, *x97_2;
+ ac97_t ac97, *x97;
ichdev_t *ichdev;
int err, i, channels = 2, codecs;
unsigned int glob_sta = 0;
@@ -1517,6 +1515,12 @@
}
chip->in_ac97_init = 1;
memset(&ac97, 0, sizeof(ac97));
+ ac97.private_data = chip;
+ ac97.private_free = snd_intel8x0_mixer_free_ac97;
+ if (ac97_clock >= 8000 && ac97_clock <= 48000)
+ ac97.clock = ac97_clock;
+ else
+ ac97.clock = 48000;
if (chip->device_type != DEVICE_ALI) {
glob_sta = igetdword(chip, ICHREG(GLOB_STA));
ac97.write = snd_intel8x0_codec_write;
@@ -1525,53 +1529,147 @@
channels = 6;
else if (glob_sta & ICH_PCM_4)
channels = 4;
+ if (chip->device_type == DEVICE_INTEL_ICH4) {
+ codecs = 0;
+ if (glob_sta & ICH_PCR)
+ codecs++;
+ if (glob_sta & ICH_SCR)
+ codecs++;
+ if (glob_sta & ICH_TCR)
+ codecs++;
+ chip->in_sdin_init = 1;
+ for (i = 0; i < codecs; i++) {
+ ac97.num = i;
+ snd_intel8x0_codec_read(&ac97, 0);
+ chip->ac97_sdin[i] = igetbyte(chip, ICHREG(SDM)) &
+ICH_LDI_MASK;
+ }
+ ac97.num = 0;
+ chip->in_sdin_init = 0;
+ } else {
+ codecs = glob_sta & ICH_SCR ? 2 : 1;
+ }
} else {
ac97.write = snd_intel8x0_ali_codec_write;
ac97.read = snd_intel8x0_ali_codec_read;
channels = 6;
+ codecs = 1;
}
- ac97.private_data = chip;
- ac97.private_free = snd_intel8x0_mixer_free_ac97;
- if (ac97_clock >= 8000 && ac97_clock <= 48000)
- ac97.clock = ac97_clock;
- else
- ac97.clock = 48000;
if ((err = snd_ac97_mixer(chip->card, &ac97, &x97)) < 0)
return err;
chip->ac97[0] = x97;
chip->ichd[ICHD_PCMOUT].ac97 = x97;
chip->ichd[ICHD_PCMIN].ac97 = x97;
if (x97->ext_id & AC97_EI_VRM)
- chip->ichd[ICHD_MIC].ac97 = chip->ac97[0];
+ chip->ichd[ICHD_MIC].ac97 = x97;
if (x97->ext_id & AC97_EI_SPDIF) {
if (chip->device_type != DEVICE_ALI)
chip->ichd[ICHD_SPBAR].ac97 = x97;
else
chip->ichd[ALID_AC97SPDIFOUT].ac97 = x97;
}
+ /* make sure, that we have DACs at right slot for rev2.2 */
+ if (ac97_is_rev22(x97))
+ snd_ac97_update_bits(x97, AC97_EXTENDED_ID, AC97_EI_DACS_SLOT_MASK, 0);
/* can we have more AC'97 codecs with ALI chipset? */
if (chip->device_type == DEVICE_ALI)
goto __end;
/* AnalogDevices CNR boards uses special codec chaining */
/* skip standard test method for secondary codecs in this case */
- if (chip->ac97[0]->flags & AC97_AD_MULTI)
+ if (x97->flags & AC97_AD_MULTI) {
+ codecs = 1;
goto __skip_secondary;
- codecs = 0;
- if (glob_sta & ICH_PCR)
- codecs++;
- if (glob_sta & ICH_SCR)
- codecs++;
- if (glob_sta & ICH_TCR)
- codecs++;
+ }
if (codecs < 2)
goto __skip_secondary;
+ for (i = 1; i < codecs; i++) {
+ if ((err = snd_ac97_mixer(chip->card, &ac97, &x97)) < 0)
+ return err;
+ chip->ac97[i] = x97;
+ if (chip->device_type == DEVICE_INTEL_ICH4 &&
+chip->ichd[ICHD_PCM2IN].ac97 == NULL)
+ chip->ichd[ICHD_PCM2IN].ac97 = x97;
+ if (x97->ext_id & AC97_EI_VRM) {
+ if (chip->ichd[ICHD_MIC].ac97 == NULL)
+ chip->ichd[ICHD_MIC].ac97 = x97;
+ else if (chip->device_type == DEVICE_INTEL_ICH4 &&
+ chip->ichd[ICHD_MIC2].ac97 == NULL &&
+ chip->ichd[ICHD_PCM2IN].ac97 == x97)
+ chip->ichd[ICHD_MIC2].ac97 = x97;
+ }
+ if (x97->ext_id & AC97_EI_SPDIF) {
+ if (chip->device_type != DEVICE_ALI) {
+ if (chip->ichd[ICHD_SPBAR].ac97 == NULL)
+ chip->ichd[ICHD_SPBAR].ac97 = x97;
+ } else {
+ if (chip->ichd[ALID_AC97SPDIFOUT].ac97 == NULL)
+ chip->ichd[ALID_AC97SPDIFOUT].ac97 = x97;
+ }
+ }
+ }
+
__skip_secondary:
- if ((chip->ac97[0]->scaps & AC97_SCAP_SURROUND_DAC) ||
- (chip->ac97[1] && (chip->ac97[1]->scaps & AC97_SCAP_SURROUND_DAC))) {
- chip->multi4 = 1;
- if ((chip->ac97[0]->scaps & AC97_SCAP_CENTER_LFE_DAC) ||
- (chip->ac97[1] && (chip->ac97[1]->scaps &
AC97_SCAP_CENTER_LFE_DAC)))
+ if (chip->device_type == DEVICE_INTEL_ICH4) {
+ u8 tmp = igetbyte(chip, ICHREG(SDM));
+ tmp &= ~(ICH_DI2L_MASK|ICH_DI1L_MASK);
+ if (chip->ichd[ICHD_PCM2IN].ac97) {
+ tmp |= ICH_SE; /* steer enable for multiple SDINs */
+ tmp |= chip->ac97_sdin[0] << ICH_DI1L_SHIFT;
+ tmp |= chip->ac97_sdin[chip->ichd[ICHD_PCM2IN].ac97->num] <<
+ICH_DI2L_SHIFT;
+ } else {
+ tmp &= ~ICH_SE;
+ }
+ iputbyte(chip, ICHREG(SDM), tmp);
+ }
+ for (i = 0; i < 3; i++) {
+ if ((x97 = chip->ac97[i]) == NULL)
+ continue;
+ if (x97->scaps & AC97_SCAP_SURROUND_DAC)
+ chip->multi4 = 1;
+ }
+ for (i = 0; i < 3 && chip->multi4; i++) {
+ if ((x97 = chip->ac97[i]) == NULL)
+ continue;
+ if (x97->scaps & AC97_SCAP_CENTER_LFE_DAC)
chip->multi6 = 1;
+ }
+ if (codecs > 1) {
+ /* assign right slots for rev2.2 codecs */
+ i = 1;
+ if (chip->multi4)
+ goto __6ch;
+ for ( ; i < codecs; i++) {
+ if (ac97_is_rev22(x97 = chip->ac97[i])) {
+ snd_ac97_update_bits(x97, AC97_EXTENDED_ID,
+AC97_EI_DACS_SLOT_MASK, 1);
+ chip->multi4 = 1;
+ break;
+ }
+ }
+ __6ch:
+ for ( ; i < codecs && chip->multi4; i++) {
+ if (ac97_is_rev22(x97 = chip->ac97[i])) {
+ snd_ac97_update_bits(x97, AC97_EXTENDED_ID,
+AC97_EI_DACS_SLOT_MASK, 2);
+ chip->multi6 = 1;
+ break;
+ }
+ }
+ /* ok, some older codecs might support only AMAP */
+ if (!chip->multi4) {
+ for (i = 1; i < codecs; i++) {
+ if (ac97_can_amap(x97 = chip->ac97[i])) {
+ if (x97->addr == 1) {
+ chip->multi4 = 1;
+ break;
+ }
+ }
+ }
+ for ( ; i < codecs && chip->multi4; i++) {
+ if (ac97_can_amap(x97 = chip->ac97[i])) {
+ if (x97->addr == 2) {
+ chip->multi6 = 1;
+ break;
+ }
+ }
+ }
+ }
}
__end:
chip->in_ac97_init = 0;
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
