Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/opti9xx
Modified Files:
opti92x-ad1848.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: opti92x-ad1848.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- opti92x-ad1848.c 14 Oct 2003 13:08:18 -0000 1.33
+++ opti92x-ad1848.c 30 Oct 2003 14:21:08 -0000 1.34
@@ -604,6 +604,7 @@
__skip_resources:
if (chip->hardware > OPTi9XX_HW_82C928) {
switch (chip->mpu_port) {
+ case 0:
case -1:
break;
case 0x300:
@@ -644,7 +645,7 @@
}
snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6),
- (chip->mpu_port == -1) ? 0x00 :
+ (chip->mpu_port <= 0) ? 0x00 :
0x80 | mpu_port_bits << 5 | mpu_irq_bits << 3,
0xf8);
}
@@ -2093,7 +2094,7 @@
}
#endif
- if (chip->mpu_port <= 0)
+ if (chip->mpu_port <= 0 || chip->mpu_port == SNDRV_AUTO_PORT)
rmidi = NULL;
else
if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
@@ -2101,7 +2102,7 @@
&rmidi)))
snd_printk("no MPU-401 device at 0x%lx?\n", chip->mpu_port);
- if (chip->fm_port > 0) {
+ if (chip->fm_port > 0 && chip->fm_port != SNDRV_AUTO_PORT) {
opl3_t *opl3 = NULL;
#ifndef OPTi93X
if (chip->hardware == OPTi9XX_HW_82C928 ||
-------------------------------------------------------
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
