Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/isa/sb

Modified Files:
        sb16.c 
Log Message:
Clemens Ladisch <[EMAIL PROTECTED]>:

- fix names for MPU-401 ports

  This moves the initialization of card->shortname before the
  component creation so that the name for the rawmidi port is
  "<shortname> MPU-401" instead of "MPU-401 (UART) x-0".




Index: sb16.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sb16.c      26 Jan 2004 10:57:20 -0000      1.43
+++ sb16.c      26 Jan 2004 14:27:13 -0000      1.44
@@ -470,6 +470,22 @@
                return -ENXIO;
        }
 
+       strcpy(card->driver,
+#ifdef SNDRV_SBAWE_EMU8000
+                       awe_port[dev] > 0 ? "SB AWE" :
+#endif
+                       "SB16");
+       strcpy(card->shortname, chip->name);
+       sprintf(card->longname, "%s at 0x%lx, irq %i, dma ",
+               chip->name,
+               chip->port,
+               xirq);
+       if (xdma8 >= 0)
+               sprintf(card->longname + strlen(card->longname), "%d", xdma8);
+       if (xdma16 >= 0)
+               sprintf(card->longname + strlen(card->longname), "%s%d",
+                       xdma8 >= 0 ? "&" : "", xdma16);
+
        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,
@@ -540,21 +556,6 @@
                (mic_agc[dev] ? 0x00 : 0x01));
        spin_unlock_irqrestore(&chip->mixer_lock, flags);
 
-       strcpy(card->driver, 
-#ifdef SNDRV_SBAWE_EMU8000
-                       awe_port[dev] > 0 ? "SB AWE" :
-#endif
-                       "SB16");
-       strcpy(card->shortname, chip->name);
-       sprintf(card->longname, "%s at 0x%lx, irq %i, dma ",
-               chip->name,
-               chip->port,
-               xirq);
-       if (xdma8 >= 0)
-               sprintf(card->longname + strlen(card->longname), "%d", xdma8);
-       if (xdma16 >= 0)
-               sprintf(card->longname + strlen(card->longname), "%s%d",
-                       xdma8 >= 0 ? "&" : "", xdma16);
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);
                return err;



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to