Update of /cvsroot/alsa/alsa-kernel/isa/cs423x In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/isa/cs423x
Modified Files: cs4231.c cs4236.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: cs4231.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cs4231.c 30 Oct 2003 14:21:08 -0000 1.11 +++ cs4231.c 26 Jan 2004 14:27:13 -0000 1.12 @@ -117,6 +117,14 @@ snd_card_free(card); return err; } + + strcpy(card->driver, "CS4231"); + strcpy(card->shortname, pcm->name); + sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d", + pcm->name, chip->port, irq[dev], dma1[dev]); + if (dma2[dev] >= 0) + sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]); + if ((err = snd_cs4231_mixer(chip)) < 0) { snd_card_free(card); return err; @@ -136,12 +144,6 @@ NULL) < 0) printk(KERN_ERR "cs4231: MPU401 not detected\n"); } - strcpy(card->driver, "CS4231"); - strcpy(card->shortname, pcm->name); - sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d", - pcm->name, chip->port, irq[dev], dma1[dev]); - if (dma2[dev] >= 0) - sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]); if ((err = snd_card_register(card)) < 0) { snd_card_free(card); return err; Index: cs4236.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4236.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- cs4236.c 21 Jan 2004 18:32:47 -0000 1.40 +++ cs4236.c 26 Jan 2004 14:27:13 -0000 1.41 @@ -491,6 +491,15 @@ return err; } #endif + strcpy(card->driver, pcm->name); + strcpy(card->shortname, pcm->name); + sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", + pcm->name, + chip->port, + irq[dev], + dma1[dev]); + if (dma2[dev] >= 0) + sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]); if ((err = snd_cs4231_timer(chip, 0, NULL)) < 0) { snd_card_free(card); @@ -519,15 +528,6 @@ mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) printk(KERN_ERR IDENT ": MPU401 not detected\n"); } - strcpy(card->driver, pcm->name); - strcpy(card->shortname, pcm->name); - sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", - pcm->name, - chip->port, - irq[dev], - dma1[dev]); - if (dma2[dev] >= 0) - sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]); 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