adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-31 21:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ALSA] ymfpci: show chip model

Browse source 
Modules: YMFPCI driver

Instead of 'DS-XG', show the correct chip model (DS-1/1L/1S/1E) where possible.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2005-12-12 09:27:14 +01:00 committed by Jaroslav Kysela
parent 7632c7b444
commit 22fb2a708d
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sound/pci/ymfpci/ymfpci.c
View file

@ -31,7 +31,7 @@
#include <sound/initval.h> #include <sound/initval.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("Yamaha DS-XG PCI"); MODULE_DESCRIPTION("Yamaha DS-1 PCI");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724}," MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724},"
"{Yamaha,YMF724F}," "{Yamaha,YMF724F},"
@ -51,11 +51,11 @@ static long joystick_port[SNDRV_CARDS];
static int rear_switch[SNDRV_CARDS]; static int rear_switch[SNDRV_CARDS];
module_param_array(index, int, NULL, 0444); module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for the Yamaha DS-XG PCI soundcard."); MODULE_PARM_DESC(index, "Index value for the Yamaha DS-1 PCI soundcard.");
module_param_array(id, charp, NULL, 0444); module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for the Yamaha DS-XG PCI soundcard."); MODULE_PARM_DESC(id, "ID string for the Yamaha DS-1 PCI soundcard.");
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable Yamaha DS-XG soundcard."); MODULE_PARM_DESC(enable, "Enable Yamaha DS-1 soundcard.");
module_param_array(mpu_port, long, NULL, 0444); module_param_array(mpu_port, long, NULL, 0444);
MODULE_PARM_DESC(mpu_port, "MPU-401 Port."); MODULE_PARM_DESC(mpu_port, "MPU-401 Port.");
module_param_array(fm_port, long, NULL, 0444); module_param_array(fm_port, long, NULL, 0444);
@ -177,7 +177,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
struct resource *mpu_res = NULL; struct resource *mpu_res = NULL;
struct snd_ymfpci *chip; struct snd_ymfpci *chip;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
char *str; const char *str, *model;
int err; int err;
u16 legacy_ctrl, legacy_ctrl2, old_legacy_ctrl; u16 legacy_ctrl, legacy_ctrl2, old_legacy_ctrl;
@ -193,13 +193,13 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
return -ENOMEM; return -ENOMEM;
switch (pci_id->device) { switch (pci_id->device) {
case 0x0004: str = "YMF724"; break; case 0x0004: str = "YMF724"; model = "DS-1"; break;
case 0x000d: str = "YMF724F"; break; case 0x000d: str = "YMF724F"; model = "DS-1"; break;
case 0x000a: str = "YMF740"; break; case 0x000a: str = "YMF740"; model = "DS-1L"; break;
case 0x000c: str = "YMF740C"; break; case 0x000c: str = "YMF740C"; model = "DS-1L"; break;
case 0x0010: str = "YMF744"; break; case 0x0010: str = "YMF744"; model = "DS-1S"; break;
case 0x0012: str = "YMF754"; break; case 0x0012: str = "YMF754"; model = "DS-1E"; break;
default: str = "???"; break; default: model = str = "???"; break;
} }
legacy_ctrl = 0; legacy_ctrl = 0;
@ -274,7 +274,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
card->private_data = chip; card->private_data = chip;
strcpy(card->driver, str); strcpy(card->driver, str);
sprintf(card->shortname, "Yamaha DS-XG (%s)", str); sprintf(card->shortname, "Yamaha %s (%s)", model, str);
sprintf(card->longname, "%s at 0x%lx, irq %i", sprintf(card->longname, "%s at 0x%lx, irq %i",
card->shortname, card->shortname,
chip->reg_area_phys, chip->reg_area_phys,
@ -345,7 +345,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Yamaha DS-XG PCI", .name = "Yamaha DS-1 PCI",
.id_table = snd_ymfpci_ids, .id_table = snd_ymfpci_ids,
.probe = snd_card_ymfpci_probe, .probe = snd_card_ymfpci_probe,
.remove = __devexit_p(snd_card_ymfpci_remove), .remove = __devexit_p(snd_card_ymfpci_remove),