Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22342/pci
Modified Files:
intel8x0.c
Log Message:
- fixed the 6 channel output on nforce.
the sample format is once reset to 2 channel mode for aligning the
samples.
Index: intel8x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- intel8x0.c 26 Jan 2004 09:21:24 -0000 1.104
+++ intel8x0.c 26 Jan 2004 10:58:37 -0000 1.105
@@ -949,6 +949,13 @@
cnt |= ICH_PCM_4;
else if (chip->multi6 && channels == 6)
cnt |= ICH_PCM_6;
+ if (chip->device_type == DEVICE_NFORCE) {
+ /* reset to 2ch once to keep the 6 channel data in alignment,
+ * to start from Front Left always
+ */
+ iputdword(chip, ICHREG(GLOB_CNT), (cnt & 0xcfffff));
+ mdelay(50); /* grrr... */
+ }
iputdword(chip, ICHREG(GLOB_CNT), cnt);
break;
}
@@ -1633,12 +1640,6 @@
.name = "Dell Optiplex GX260", /* AD1981A */
.type = AC97_TUNE_HP_ONLY
},
- { /* FIXME: which codec? */
- .vendor = 0x103c,
- .device = 0x00c3,
- .name = "Hewlett-Packard onboard",
- .type = AC97_TUNE_HP_ONLY
- },
{
.vendor = 0x1043,
.device = 0x80f3,
@@ -1658,12 +1659,6 @@
.type = AC97_TUNE_HP_ONLY
},
{
- .vendor = 0x11d4,
- .vendor = 0x5375,
- .name = "ADI AD1985 (discrete)",
- .type = AC97_TUNE_HP_ONLY
- },
- {
.vendor = 0x1734,
.device = 0x0088,
.name = "Fujitsu-Siemens D1522", /* AD1981 */
@@ -1671,13 +1666,6 @@
},
{
.vendor = 0x8086,
- .device = 0x2000,
- .mask = 0xfff0,
- .name = "Intel ICH5/AD1985",
- .type = AC97_TUNE_AD_SHARING
- },
- {
- .vendor = 0x8086,
.device = 0x4000,
.mask = 0xfff0,
.name = "Intel ICH5/AD1985",
@@ -1703,11 +1691,10 @@
.name = "Intel ICH5/AD1985",
.type = AC97_TUNE_AD_SHARING
},
- {
- .vendor = 0x8086,
- .device = 0xa000,
- .mask = 0xfff0,
- .name = "Intel ICH5/AD1985",
+ { /* FIXME: which codec? */
+ .vendor = 0x103c,
+ .device = 0x00c3,
+ .name = "Hewlett-Packard onboard",
.type = AC97_TUNE_HP_ONLY
},
{ } /* terminator */
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
