Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/pci
Modified Files:
als4000.c es1938.c fm801.c sonicvibes.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: als4000.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- als4000.c 21 Jan 2004 18:32:47 -0000 1.27
+++ als4000.c 26 Jan 2004 14:27:13 -0000 1.28
@@ -687,7 +687,12 @@
snd_card_set_dev(card, &pci->dev);
snd_als4000_configure(chip);
-
+
+ strcpy(card->driver, "ALS4000");
+ strcpy(card->shortname, "Avance Logic ALS4000");
+ sprintf(card->longname, "%s at 0x%lx, irq %i",
+ card->shortname, chip->alt_port, chip->irq);
+
if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,
gcr+0x30, 1, pci->irq, 0,
&chip->rmidi)) < 0) {
@@ -722,10 +727,6 @@
gameport_register_port(&acard->gameport);
}
#endif
- strcpy(card->driver, "ALS4000");
- strcpy(card->shortname, "Avance Logic ALS4000");
- sprintf(card->longname, "%s at 0x%lx, irq %i",
- card->shortname, chip->alt_port, chip->irq);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
Index: es1938.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- es1938.c 21 Jan 2004 18:32:47 -0000 1.30
+++ es1938.c 26 Jan 2004 14:27:13 -0000 1.31
@@ -1635,6 +1635,14 @@
snd_card_free(card);
return err;
}
+
+ strcpy(card->driver, "ES1938");
+ strcpy(card->shortname, "ESS ES1938 (Solo-1)");
+ sprintf(card->longname, "%s rev %i, irq %i",
+ card->shortname,
+ chip->revision,
+ chip->irq);
+
if ((err = snd_es1938_new_pcm(chip, 0, &pcm)) < 0) {
snd_card_free(card);
return err;
@@ -1670,13 +1678,6 @@
gameport_register_port(&chip->gameport);
#endif
- strcpy(card->driver, "ES1938");
- strcpy(card->shortname, "ESS ES1938 (Solo-1)");
- sprintf(card->longname, "%s rev %i, irq %i",
- card->shortname,
- chip->revision,
- chip->irq);
-
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
Index: fm801.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/fm801.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fm801.c 21 Jan 2004 18:32:47 -0000 1.37
+++ fm801.c 26 Jan 2004 14:27:13 -0000 1.38
@@ -1083,6 +1083,13 @@
snd_card_free(card);
return err;
}
+
+ strcpy(card->driver, "FM801");
+ strcpy(card->shortname, "ForteMedia FM801-");
+ strcat(card->shortname, chip->multichannel ? "AU" : "AS");
+ sprintf(card->longname, "%s at 0x%lx, irq %i",
+ card->shortname, chip->port, chip->irq);
+
if ((err = snd_fm801_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -1108,12 +1115,6 @@
return err;
}
- strcpy(card->driver, "FM801");
- strcpy(card->shortname, "ForteMedia FM801-");
- strcat(card->shortname, chip->multichannel ? "AU" : "AS");
- sprintf(card->longname, "%s at 0x%lx, irq %i",
- card->shortname, chip->port, chip->irq);
-
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
Index: sonicvibes.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/sonicvibes.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sonicvibes.c 21 Jan 2004 18:32:47 -0000 1.30
+++ sonicvibes.c 26 Jan 2004 14:27:13 -0000 1.31
@@ -1469,6 +1469,15 @@
snd_card_free(card);
return err;
}
+
+ strcpy(card->driver, "SonicVibes");
+ strcpy(card->shortname, "S3 SonicVibes");
+ sprintf(card->longname, "%s rev %i at 0x%lx, irq %i",
+ card->shortname,
+ sonic->revision,
+ pci_resource_start(pci, 1),
+ sonic->irq);
+
if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -1499,13 +1508,6 @@
sonic->gameport.io = sonic->game_port;
gameport_register_port(&sonic->gameport);
#endif
- strcpy(card->driver, "SonicVibes");
- strcpy(card->shortname, "S3 SonicVibes");
- sprintf(card->longname, "%s rev %i at 0x%lx, irq %i",
- card->shortname,
- sonic->revision,
- pci_resource_start(pci, 1),
- sonic->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
