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

Modified Files:
        sb16.c 
Log Message:
- fixed the default value of mpu_port, use SNDRV_DEFAULT_PORT instead of
  hardcoded values.
- fixed the reservation of fm port on pnp boards.


Index: sb16.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sb16.c      30 Oct 2003 14:21:09 -0000      1.39
+++ sb16.c      12 Jan 2004 15:54:14 -0000      1.40
@@ -77,7 +77,7 @@
 static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;    /* 0x220,0x240,0x260,0x280 */
-static long mpu_port[SNDRV_CARDS] = {0x330, 0x300,[2 ... (SNDRV_CARDS - 1)] = -1};
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;        /* 0x330,0x300 */
 static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
 #ifdef SNDRV_SBAWE_EMU8000
 static long awe_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
@@ -483,7 +483,7 @@
        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,
+                                   acard->fm_res != NULL,
                                    &opl3) < 0) {
                        snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
                                   fm_port[dev], fm_port[dev] + 2);



-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to