Changeset 34 for GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx.c

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

File:

• GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx.c (modified) (8 diffs)

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx.c

@@ -30 +30 @@
 #include <linux/time.h>
 #include <linux/init.h>
+#include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/cs46xx.h>
-#define SNDRV_GET_ID
 #include <sound/initval.h>
 
@@ -38 +38 @@
 MODULE_DESCRIPTION("Cirrus Logic Sound Fusion CS46XX");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{Cirrus Logic,Sound Fusion (CS4280)},"
+MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,Sound Fusion (CS4280)},"
                 "{Cirrus Logic,Sound Fusion (CS4610)},"
                 "{Cirrus Logic,Sound Fusion (CS4612)},"
@@ -50 +49 @@
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-#ifdef TARGET_OS2
 static int external_amp[SNDRV_CARDS] = {0};
 static int thinkpad[SNDRV_CARDS] = {1,0,0,0,0,0,0,0};
 static int mmap_valid[SNDRV_CARDS] = {0};
-#else
-static int external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-static int thinkpad[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-static int mmap_valid[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-#endif
 
-MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the CS46xx soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+//module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for the CS46xx soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable CS46xx soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(external_amp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param_array(external_amp, bool, NULL, 0444);
 MODULE_PARM_DESC(external_amp, "Force to enable external amplifer.");
-MODULE_PARM_SYNTAX(external_amp, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
-MODULE_PARM(thinkpad, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param_array(thinkpad, bool, NULL, 0444);
 MODULE_PARM_DESC(thinkpad, "Force to enable Thinkpad's CLKRUN control.");
-MODULE_PARM_SYNTAX(thinkpad, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
-MODULE_PARM(mmap_valid, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param_array(mmap_valid, bool, NULL, 0444);
 MODULE_PARM_DESC(mmap_valid, "Support OSS mmap.");
-MODULE_PARM_SYNTAX(mmap_valid, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
 
 static struct pci_device_id snd_cs46xx_ids[] = {
@@ -92 +79 @@
 {
         static int dev;
-        snd_card_t *card;
-        cs46xx_t *chip;
+        struct snd_card *card;
+        struct snd_cs46xx *chip;
         int err;
 
@@ -112 +99 @@
                 return err;
         }
+        card->private_data = chip;
         chip->accept_valid = mmap_valid[dev];
         if ((err = snd_cs46xx_pcm(chip, 0, NULL)) < 0) {
@@ -127 +115 @@
         }
 #endif
-        if ((err = snd_cs46xx_mixer(chip)) < 0) {
+        if ((err = snd_cs46xx_mixer(chip, 2)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -164 +152 @@
         }
 
-        pci_set_drvdata(pci, card);
+        pci_set_drvdata(pci, card);
         dev++;
         return 0;
 }
 
-
 static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)
 {
-    snd_card_free(pci_get_drvdata(pci));
-    pci_set_drvdata(pci, NULL);
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
 }
 
 static struct pci_driver driver = {
-        0, 0, 0,
-        "Sound Fusion CS46xx",
-        snd_cs46xx_ids,
-        snd_card_cs46xx_probe,
-        snd_card_cs46xx_remove,
-        SND_PCI_PM_CALLBACKS
+        .name = "Sound Fusion CS46xx",
+        .id_table = snd_cs46xx_ids,
+        .probe = snd_card_cs46xx_probe,
+        .remove = snd_card_cs46xx_remove,
+#ifdef CONFIG_PM
+        .suspend = snd_cs46xx_suspend,
+        .resume = snd_cs46xx_resume,
+#endif
 };
- 
+
 static int __init alsa_card_cs46xx_init(void)
 {
-        int err;
-
-        if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-//              printk(KERN_ERR "Sound Fusion CS46xx soundcard not found or device busy\n");
-#endif
-                return err;
-        }
-        return 0;
+        return pci_register_driver(&driver);
 }
 
@@ -205 +186 @@
 module_init(alsa_card_cs46xx_init)
 module_exit(alsa_card_cs46xx_exit)
-
-#ifndef MODULE
-
-/* format is: snd-cs46xx=snd_enable,snd_index,snd_id */
-
-static int __init alsa_card_cs46xx_setup(char *str)
-{
-        static unsigned __initdata nr_dev = 0;
-
-        if (nr_dev >= SNDRV_CARDS)
-                return 0;
-        (void)(get_option(&str,&enable[nr_dev]) == 2 &&
-               get_option(&str,&index[nr_dev]) == 2 &&
-               get_id(&str,&id[nr_dev]) == 2);
-        nr_dev++;
-        return 1;
-}
-
-__setup("snd-cs46xx=", alsa_card_cs46xx_setup);
-
-#endif /* ifndef MODULE */