diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-12-12 09:27:14 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:30:44 +0100 |
| commit | 22fb2a708d2f390808f20609213fd6a588bf7612 (patch) | |
| tree | 21220fba31f2c7740a8e856c8595b66b9258651e /sound | |
| parent | [ALSA] hda-codec - Add the model entry for ASUS P5GD1-HVM (diff) | |
| download | linux-22fb2a708d2f390808f20609213fd6a588bf7612.tar.xz linux-22fb2a708d2f390808f20609213fd6a588bf7612.zip | |
[ALSA] ymfpci: show chip model
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/ymfpci/ymfpci.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 9e30e2c76c7f..dab9b8310341 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c @@ -31,7 +31,7 @@ #include <sound/initval.h> MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); -MODULE_DESCRIPTION("Yamaha DS-XG PCI"); +MODULE_DESCRIPTION("Yamaha DS-1 PCI"); MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724}," "{Yamaha,YMF724F}," @@ -51,11 +51,11 @@ static long joystick_port[SNDRV_CARDS]; static int rear_switch[SNDRV_CARDS]; 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_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_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_PARM_DESC(mpu_port, "MPU-401 Port."); 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 snd_ymfpci *chip; struct snd_opl3 *opl3; - char *str; + const char *str, *model; int err; 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; switch (pci_id->device) { - case 0x0004: str = "YMF724"; break; - case 0x000d: str = "YMF724F"; break; - case 0x000a: str = "YMF740"; break; - case 0x000c: str = "YMF740C"; break; - case 0x0010: str = "YMF744"; break; - case 0x0012: str = "YMF754"; break; - default: str = "???"; break; + case 0x0004: str = "YMF724"; model = "DS-1"; break; + case 0x000d: str = "YMF724F"; model = "DS-1"; break; + case 0x000a: str = "YMF740"; model = "DS-1L"; break; + case 0x000c: str = "YMF740C"; model = "DS-1L"; break; + case 0x0010: str = "YMF744"; model = "DS-1S"; break; + case 0x0012: str = "YMF754"; model = "DS-1E"; break; + default: model = str = "???"; break; } legacy_ctrl = 0; @@ -274,7 +274,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci, card->private_data = chip; 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", card->shortname, chip->reg_area_phys, @@ -345,7 +345,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "Yamaha DS-XG PCI", + .name = "Yamaha DS-1 PCI", .id_table = snd_ymfpci_ids, .probe = snd_card_ymfpci_probe, .remove = __devexit_p(snd_card_ymfpci_remove), |