Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 15:33:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ALSA] cmipci: show real chip name in card name

Browse Source 
The '-MCx' suffix that is expected by alsa-lib is only needed in the
card driver string, so we can show the actual chip name in the
shortname.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Clemens Ladisch 2007-09-03 09:56:45 +02:00 committed by Jaroslav Kysela
parent 88039815d8
commit b7e054a76f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/pci/cmipci.c
View File

@ -2852,6 +2852,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
unsigned int val; unsigned int val;
long iomidi; long iomidi;
int integrated_midi = 0; int integrated_midi = 0;
char modelstr[16];
int pcm_index, pcm_spdif_index; int pcm_index, pcm_spdif_index;
static struct pci_device_id intel_82437vx[] = { static struct pci_device_id intel_82437vx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
@ -2951,12 +2952,8 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
break; break;
} }
sprintf(card->shortname, "C-Media %s", card->driver);
if (cm->chip_version < 68) { if (cm->chip_version < 68) {
val = pci->device < 0x110 ? 8338 : 8738; val = pci->device < 0x110 ? 8338 : 8738;
sprintf(card->longname,
"C-Media CMI%d (model %d) at 0x%lx, irq %i",
val, cm->chip_version, cm->iobase, cm->irq);
} else { } else {
switch (snd_cmipci_read_b(cm, CM_REG_INT_HLDCLR + 3) & 0x03) { switch (snd_cmipci_read_b(cm, CM_REG_INT_HLDCLR + 3) & 0x03) {
case 0: case 0:
@ -2981,9 +2978,14 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
break; break;
} }
} }
sprintf(card->longname, "C-Media CMI%d at 0x%lx, irq %i",
val, cm->iobase, cm->irq);
} }
sprintf(card->shortname, "C-Media CMI%d", val);
if (cm->chip_version < 68)
sprintf(modelstr, " (model %d)", cm->chip_version);
else
modelstr[0] = '\0';
sprintf(card->longname, "%s%s at %#lx, irq %i",
card->shortname, modelstr, cm->iobase, cm->irq);
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) { if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) {
snd_cmipci_free(cm); snd_cmipci_free(cm);