Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/isa
Modified Files:
als100.c azt2320.c dt019x.c es18xx.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: als100.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- als100.c 21 Jan 2004 18:32:46 -0000 1.23
+++ als100.c 26 Jan 2004 14:27:13 -0000 1.24
@@ -240,6 +240,12 @@
return error;
}
+ strcpy(card->driver, "ALS100");
+ strcpy(card->shortname, "Avance Logic ALS100");
+ sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
+ card->shortname, chip->name, chip->port,
+ irq[dev], dma8[dev], dma16[dev]);
+
if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
return error;
@@ -276,11 +282,6 @@
}
}
- strcpy(card->driver, "ALS100");
- strcpy(card->shortname, "Avance Logic ALS100");
- sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d&%d",
- card->shortname, chip->name, chip->port,
- irq[dev], dma8[dev], dma16[dev]);
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
return error;
Index: azt2320.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- azt2320.c 21 Jan 2004 18:32:46 -0000 1.23
+++ azt2320.c 26 Jan 2004 14:27:13 -0000 1.24
@@ -271,6 +271,11 @@
return error;
}
+ strcpy(card->driver, "AZT2320");
+ strcpy(card->shortname, "Aztech AZT2320");
+ sprintf(card->longname, "%s, WSS at 0x%lx, irq %i, dma %i&%i",
+ card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
+
if ((error = snd_cs4231_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
return error;
@@ -310,11 +315,6 @@
}
}
- strcpy(card->driver, "AZT2320");
- strcpy(card->shortname, "Aztech AZT2320");
- sprintf(card->longname, "%s soundcard, WSS at 0x%lx, irq %i, dma %i&%i",
- card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
-
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
return error;
Index: dt019x.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dt019x.c 21 Jan 2004 18:32:46 -0000 1.14
+++ dt019x.c 26 Jan 2004 14:27:13 -0000 1.15
@@ -227,6 +227,12 @@
return error;
}
+ strcpy(card->driver, "DT-019X");
+ strcpy(card->shortname, "Diamond Tech. DT-019X");
+ sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
+ card->shortname, chip->name, chip->port,
+ irq[dev], dma8[dev]);
+
if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
return error;
@@ -268,11 +274,6 @@
}
}
- strcpy(card->driver, "DT-019X");
- strcpy(card->shortname, "Diamond Tech. DT-019X");
- sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d",
- card->shortname, chip->name, chip->port,
- irq[dev], dma8[dev]);
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
return error;
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- es18xx.c 21 Jan 2004 18:32:46 -0000 1.39
+++ es18xx.c 26 Jan 2004 14:27:13 -0000 1.40
@@ -2101,6 +2101,20 @@
snd_card_free(card);
return err;
}
+
+ sprintf(card->driver, "ES%x", chip->version);
+ sprintf(card->shortname, "ESS AudioDrive ES%x", chip->version);
+ if (xdma1 != xdma2)
+ sprintf(card->longname, "%s at 0x%lx, irq %d, dma1 %d, dma2 %d",
+ card->shortname,
+ chip->port,
+ xirq, xdma1, xdma2);
+ else
+ sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
+ card->shortname,
+ chip->port,
+ xirq, xdma1);
+
if ((err = snd_es18xx_pcm(chip, 0, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -2142,18 +2156,6 @@
card->power_state_private_data = chip;
}
#endif
- sprintf(card->driver, "ES%x", chip->version);
- sprintf(card->shortname, "ESS AudioDrive ES%x", chip->version);
- if (xdma1 != xdma2)
- sprintf(card->longname, "%s at 0x%lx, irq %d, dma1 %d, dma2 %d",
- card->shortname,
- chip->port,
- xirq, xdma1, xdma2);
- else
- sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
- card->shortname,
- chip->port,
- xirq, xdma1);
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
