Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/isa/opti9xx
Modified Files:
opti92x-ad1848.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: opti92x-ad1848.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- opti92x-ad1848.c 21 Jan 2004 18:32:47 -0000 1.37
+++ opti92x-ad1848.c 26 Jan 2004 14:27:13 -0000 1.38
@@ -2106,6 +2106,17 @@
return error;
}
#endif
+ strcpy(card->driver, chip->name);
+ sprintf(card->shortname, "OPTi %s", card->driver);
+#if defined(CS4231) || defined(OPTi93X)
+ sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
+ card->shortname, pcm->name, chip->wss_base + 4,
+ chip->irq, chip->dma1, chip->dma2);
+#else
+ sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
+ card->shortname, pcm->name, chip->wss_base + 4,
+ chip->irq, chip->dma1);
+#endif /* CS4231 || OPTi93X */
if (chip->mpu_port <= 0 || chip->mpu_port == SNDRV_AUTO_PORT)
rmidi = NULL;
@@ -2159,17 +2170,6 @@
}
}
- strcpy(card->driver, chip->name);
- sprintf(card->shortname, "OPTi %s", card->driver);
-#if defined(CS4231) || defined(OPTi93X)
- sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d&%d",
- card->shortname, pcm->name, chip->wss_base + 4,
- chip->irq, chip->dma1, chip->dma2);
-#else
- sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d",
- card->shortname, pcm->name, chip->wss_base + 4,
- chip->irq, chip->dma1);
-#endif /* CS4231 || OPTi93X */
if ((error = snd_card_register(card))) {
snd_card_free(card);
return error;
-------------------------------------------------------
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
