Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa
Modified Files:
als100.c azt2320.c dt019x.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: als100.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- als100.c 14 Oct 2003 13:08:14 -0000 1.21
+++ als100.c 30 Oct 2003 14:21:07 -0000 1.22
@@ -249,7 +249,7 @@
return error;
}
- if (mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100,
mpu_port[dev], 0,
mpu_irq[dev], SA_INTERRUPT,
@@ -257,7 +257,7 @@
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
mpu_port[dev]);
}
- if (fm_port[dev] > 0) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card,
fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &opl3) < 0) {
Index: azt2320.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- azt2320.c 14 Oct 2003 13:08:14 -0000 1.21
+++ azt2320.c 30 Oct 2003 14:21:08 -0000 1.22
@@ -283,7 +283,7 @@
return error;
}
- if (mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
mpu_port[dev], 0,
mpu_irq[dev], SA_INTERRUPT,
@@ -291,7 +291,7 @@
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
mpu_port[dev]);
}
- if (fm_port[dev] > 0) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card,
fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &opl3) < 0) {
Index: dt019x.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dt019x.c 14 Oct 2003 13:08:14 -0000 1.12
+++ dt019x.c 30 Oct 2003 14:21:08 -0000 1.13
@@ -235,18 +235,20 @@
return error;
}
- if (mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
+ if (mpu_irq[dev] == SNDRV_AUTO_IRQ)
+ mpu_irq[dev] = -1;
if (snd_mpu401_uart_new(card, 0,
/* MPU401_HW_SB,*/
MPU401_HW_MPU401,
mpu_port[dev], 0,
mpu_irq[dev],
- SA_INTERRUPT,
+ mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0,
NULL) < 0)
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n",
mpu_port[dev]);
}
- if (fm_port[dev] > 0) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card,
fm_port[dev],
fm_port[dev] + 2,
-------------------------------------------------------
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
