Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/sb

Modified Files:
        sb16.c 
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.


Index: sb16.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sb16.c      14 Oct 2003 13:08:18 -0000      1.38
+++ sb16.c      30 Oct 2003 14:21:09 -0000      1.39
@@ -465,7 +465,7 @@
                return -ENXIO;
        }
 
-       if (chip->mpu_port) {
+       if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
                                               chip->mpu_port, 0,
                                               xirq, 0, &chip->rmidi)) < 0) {
@@ -475,7 +475,12 @@
                chip->rmidi_callback = snd_mpu401_uart_interrupt;
        }
 
-       if (fm_port[dev] > 0) {
+#ifdef SNDRV_SBAWE_EMU8000
+       if (awe_port[dev] == SNDRV_AUTO_PORT)
+               awe_port[dev] = 0; /* disable */
+#endif
+
+       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_OPL3,
                                    fm_port[dev] == port[dev] || fm_port[dev] == 0x388,



-------------------------------------------------------
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

Reply via email to