Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory sc8-pr-cvs1:/tmp/cvs-serv15244/alsa-kernel/isa/opti9xx
Modified Files:
opti92x-ad1848.c
Log Message:
- fixed the detection of opti92x-ad1848 pnp.
Index: opti92x-ad1848.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- opti92x-ad1848.c 30 Oct 2003 14:21:08 -0000 1.34
+++ opti92x-ad1848.c 31 Oct 2003 16:32:32 -0000 1.35
@@ -543,11 +543,11 @@
__skip_base:
switch (chip->irq) {
-#ifdef OPTi93X
+//#ifdef OPTi93X
case 5:
irq_bits = 0x05;
break;
-#endif /* OPTi93X */
+//#endif /* OPTi93X */
case 7:
irq_bits = 0x01;
break;
@@ -1735,15 +1735,23 @@
#if defined(CS4231) || defined(OPTi93X)
if (dma2 != SNDRV_AUTO_DMA)
pnp_resource_change(&cfg->dma_resource[1], dma2, 1);
+#else
+#ifdef snd_opti9xx_fixup_dma2
+ snd_opti9xx_fixup_dma2(pdev);
+#endif
#endif /* CS4231 || OPTi93X */
- if (fm_port != SNDRV_AUTO_PORT)
+#ifdef OPTi93X
+ if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT)
pnp_resource_change(&cfg->port_resource[1], fm_port, 4);
-
+#else
+ if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT)
+ pnp_resource_change(&cfg->port_resource[2], fm_port, 4);
+#endif
if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
snd_printk(KERN_ERR "AUDIO the requested resources are invalid, using
auto config\n");
err = pnp_activate_dev(pdev);
if (err < 0) {
- snd_printk(KERN_ERR "AUDIO pnp configure failure\n");
+ snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err);
kfree(cfg);
return err;
}
@@ -1763,7 +1771,7 @@
#endif /* CS4231 || OPTi93X */
pdev = chip->devmpu;
- if (pdev) {
+ if (pdev && mpu_port > 0) {
pnp_init_resource_table(cfg);
if (mpu_port != SNDRV_AUTO_PORT)
@@ -1986,9 +1994,6 @@
chip->dma2 = dma2;
#endif
-#ifdef CONFIG_PNP
- if (!isapnp) {
-#endif
if (chip->wss_base == SNDRV_AUTO_PORT) {
if ((chip->wss_base = snd_legacy_find_free_ioport(possible_ports, 4))
< 0) {
snd_card_free(card);
@@ -1996,6 +2001,9 @@
return -EBUSY;
}
}
+#ifdef CONFIG_PNP
+ if (!isapnp) {
+#endif
if (chip->mpu_port == SNDRV_AUTO_PORT) {
if ((chip->mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports,
2)) < 0) {
snd_card_free(card);
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
