Update of /cvsroot/alsa/alsa-kernel/isa/es1688
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/isa/es1688
Modified Files:
es1688.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: es1688.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- es1688.c 14 Oct 2003 13:08:15 -0000 1.11
+++ es1688.c 26 Jan 2004 14:27:13 -0000 1.12
@@ -130,6 +130,10 @@
return err;
}
+ strcpy(card->driver, "ES1688");
+ strcpy(card->shortname, pcm->name);
+ sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port,
xirq, xdma);
+
if ((snd_opl3_create(card, chip->port, chip->port + 2, OPL3_HW_OPL3, 0,
&opl3)) < 0) {
printk(KERN_ERR "es1688: opl3 not detected at 0x%lx\n", chip->port);
} else {
@@ -149,9 +153,6 @@
return err;
}
}
- strcpy(card->driver, "ES1688");
- strcpy(card->shortname, pcm->name);
- sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port,
xirq, xdma);
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
