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

Modified Files:
        ymfpci.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: ymfpci.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ymfpci.c    28 Oct 2003 11:28:01 -0000      1.32
+++ ymfpci.c    26 Jan 2004 14:27:13 -0000      1.33
@@ -247,6 +247,12 @@
 #ifdef SUPPORT_JOYSTICK
        chip->joystick_res = joystick_res;
 #endif
+       strcpy(card->driver, str);
+       sprintf(card->shortname, "Yamaha DS-XG (%s)", str);
+       sprintf(card->longname, "%s at 0x%lx, irq %i",
+               card->shortname,
+               chip->reg_area_phys,
+               chip->irq);
        if ((err = snd_ymfpci_pcm(chip, 0, NULL)) < 0) {
                snd_card_free(card);
                return err;
@@ -300,12 +306,6 @@
                gameport_register_port(&chip->gameport);
        }
 #endif
-       strcpy(card->driver, str);
-       sprintf(card->shortname, "Yamaha DS-XG PCI (%s)", str);
-       sprintf(card->longname, "%s at 0x%lx, irq %i",
-               card->shortname,
-               chip->reg_area_phys,
-               chip->irq);
 
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);



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