Changeset 305 for GPL/branches/uniaud-2.0/alsa-kernel/drivers/virmidi.c

Timestamp:

Mar 24, 2008, 2:43:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.16 level

File:

• GPL/branches/uniaud-2.0/alsa-kernel/drivers/virmidi.c (modified) (3 diffs)

GPL/branches/uniaud-2.0/alsa-kernel/drivers/virmidi.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -30 +30 @@
  *
  * Typical usage is like following:
- * - Load snd-card-virmidi module.
- *      # modprobe snd-card-virmidi snd_index=2
+ * - Load snd-virmidi module.
+ *      # modprobe snd-virmidi index=2
  *   Then, sequencer clients 72:0 to 75:0 will be created, which are
  *   mapped from /dev/snd/midiC1D0 to /dev/snd/midiC1D3, respectively.
@@ -42 +42 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
-#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/moduleparam.h>
+#include <sound/core.h>
 #include <sound/seq_kernel.h>
 #include <sound/seq_virmidi.h>
-#define SNDRV_GET_ID
 #include <sound/initval.h>
 
-EXPORT_NO_SYMBOLS;
+/* hack: OSS defines midi_devs, so undefine it (versioned symbols) */
+#undef midi_devs
+
+MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("Dummy soundcard for virtual rawmidi devices");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{ALSA,Virtual rawmidi device}}");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{ALSA,Virtual rawmidi device}}");
 
-#define MAX_MIDI_DEVICES        8
+#define MAX_MIDI_DEVICES        4
 
-static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;  /* Index 0-MAX */
-static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
-#ifdef TARGET_OS2
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;
-static int snd_midi_devs[SNDRV_CARDS] = SNDDRV_DEFAULT_MIDI_DEVS
-#else
-    static int snd_enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
-static int snd_midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
-#endif
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
 
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for virmidi soundcard.");
-MODULE_PARM_SYNTAX(snd_index, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
-MODULE_PARM_DESC(snd_id, "ID string for virmidi soundcard.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_enable, "Enable this soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_midi_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_midi_devs, "MIDI devices # (1-8)");
-MODULE_PARM_SYNTAX(snd_midi_devs, SNDRV_ENABLED ",allows:{{1,8}}");
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for virmidi soundcard.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for virmidi soundcard.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable this soundcard.");
+module_param_array(midi_devs, int, NULL, 0444);
+MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-4)");
 
-typedef struct snd_card_virmidi {
-    snd_card_t *card;
-    snd_rawmidi_t *midi[MAX_MIDI_DEVICES];
-} snd_card_virmidi_t;
+struct snd_card_virmidi {
+        struct snd_card *card;
+        struct snd_rawmidi *midi[MAX_MIDI_DEVICES];
+};
 
-static snd_card_t *snd_virmidi_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+static struct platform_device *devices[SNDRV_CARDS];
 
 
-static int __init snd_card_virmidi_probe(int dev)
+static int __devinit snd_virmidi_probe(struct platform_device *devptr)
 {
-    snd_card_t *card;
-    struct snd_card_virmidi *vmidi;
-    int idx, err;
+        struct snd_card *card;
+        struct snd_card_virmidi *vmidi;
+        int idx, err;
+        int dev = devptr->id;
 
-    if (!snd_enable[dev])
-        return -ENODEV;
-    card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
-                        sizeof(struct snd_card_virmidi));
-    if (card == NULL)
-        return -ENOMEM;
-    vmidi = (struct snd_card_virmidi *)card->private_data;
-    vmidi->card = card;
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+                            sizeof(struct snd_card_virmidi));
+        if (card == NULL)
+                return -ENOMEM;
+        vmidi = (struct snd_card_virmidi *)card->private_data;
+        vmidi->card = card;
 
-    if (snd_midi_devs[dev] > MAX_MIDI_DEVICES) {
-        snd_printk("too much midi devices for virmidi %d: force to use %d\n", dev, MAX_MIDI_DEVICES);
-        snd_midi_devs[dev] = MAX_MIDI_DEVICES;
-    }
-    for (idx = 0; idx < snd_midi_devs[dev]; idx++) {
-        snd_rawmidi_t *rmidi;
-        snd_virmidi_dev_t *rdev;
-        if ((err = snd_virmidi_new(card, idx, &rmidi)) < 0)
-            goto __nodev;
-        rdev = rmidi->private_data;
-        vmidi->midi[idx] = rmidi;
-        strcpy(rmidi->name, "Virtual Raw MIDI");
-        rdev->seq_mode = SNDRV_VIRMIDI_SEQ_DISPATCH;
-    }
+        if (midi_devs[dev] > MAX_MIDI_DEVICES) {
+                snd_printk("too much midi devices for virmidi %d: force to use %d\n", dev, MAX_MIDI_DEVICES);
+                midi_devs[dev] = MAX_MIDI_DEVICES;
+        }
+        for (idx = 0; idx < midi_devs[dev]; idx++) {
+                struct snd_rawmidi *rmidi;
+                struct snd_virmidi_dev *rdev;
+                if ((err = snd_virmidi_new(card, idx, &rmidi)) < 0)
+                        goto __nodev;
+                rdev = rmidi->private_data;
+                vmidi->midi[idx] = rmidi;
+                strcpy(rmidi->name, "Virtual Raw MIDI");
+                rdev->seq_mode = SNDRV_VIRMIDI_SEQ_DISPATCH;
+        }
+        
+        strcpy(card->driver, "VirMIDI");
+        strcpy(card->shortname, "VirMIDI");
+        sprintf(card->longname, "Virtual MIDI Card %i", dev + 1);
 
-    strcpy(card->driver, "VirMIDI");
-    strcpy(card->shortname, "VirMIDI");
-    sprintf(card->longname, "Virtual MIDI Card %i", dev + 1);
-    if ((err = snd_card_register(card)) == 0) {
-        snd_virmidi_cards[dev] = card;
-        return 0;
-    }
-__nodev:
-    snd_card_free(card);
-    return err;
+        snd_card_set_dev(card, &devptr->dev);
+
+        if ((err = snd_card_register(card)) == 0) {
+                platform_set_drvdata(devptr, card);
+                return 0;
+        }
+      __nodev:
+        snd_card_free(card);
+        return err;
+}
+
+static int __devexit snd_virmidi_remove(struct platform_device *devptr)
+{
+        snd_card_free(platform_get_drvdata(devptr));
+        platform_set_drvdata(devptr, NULL);
+        return 0;
+}
+
+#define SND_VIRMIDI_DRIVER      "snd_virmidi"
+
+static struct platform_driver snd_virmidi_driver = {
+        .probe          = snd_virmidi_probe,
+        .remove         = __devexit_p(snd_virmidi_remove),
+        .driver         = {
+                .name   = SND_VIRMIDI_DRIVER
+        },
+};
+
+static void snd_virmidi_unregister_all(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(devices); ++i)
+                platform_device_unregister(devices[i]);
+        platform_driver_unregister(&snd_virmidi_driver);
 }
 
 static int __init alsa_card_virmidi_init(void)
 {
-    int dev, cards;
+        int i, cards, err;
 
-    for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev]; dev++) {
-        if (snd_card_virmidi_probe(dev) < 0) {
+        if ((err = platform_driver_register(&snd_virmidi_driver)) < 0)
+                return err;
+
+        cards = 0;
+        for (i = 0; i < SNDRV_CARDS; i++) {
+                struct platform_device *device;
+                if (! enable[i])
+                        continue;
+                device = platform_device_register_simple(SND_VIRMIDI_DRIVER,
+                                                         i, NULL, 0);
+                if (IS_ERR(device))
+                        continue;
+                if (!platform_get_drvdata(device)) {
+                        platform_device_unregister(device);
+                        continue;
+                }
+                devices[i] = device;
+                cards++;
+        }
+        if (!cards) {
 #ifdef MODULE
-            snd_printk("Card-VirMIDI #%i not found or device busy\n", dev + 1);
+                printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n");
 #endif
-            break;
-        }
-        cards++;
-    }
-    if (!cards) {
-#ifdef MODULE
-        snd_printk("Card-VirMIDI soundcard not found or device busy\n");
-#endif
-        return -ENODEV;
-    }
-    return 0;
+                snd_virmidi_unregister_all();
+                return -ENODEV;
+        }
+        return 0;
 }
 
 static void __exit alsa_card_virmidi_exit(void)
 {
-    int dev;
-
-    for (dev = 0; dev < SNDRV_CARDS; dev++)
-        snd_card_free(snd_virmidi_cards[dev]);
+        snd_virmidi_unregister_all();
 }
 
 module_init(alsa_card_virmidi_init)
 module_exit(alsa_card_virmidi_exit)
-
-#ifndef MODULE
-
-/* format is: snd-card-virmidi=snd_enable,snd_index,snd_id,snd_midi_devs */
-
-static int __init alsa_card_virmidi_setup(char *str)
-{
-    static unsigned __initdata nr_dev = 0;
-
-    if (nr_dev >= SNDRV_CARDS)
-        return 0;
-    (void)(get_option(&str,&snd_enable[nr_dev]) == 2 &&
-           get_option(&str,&snd_index[nr_dev]) == 2 &&
-           get_id(&str,&snd_id[nr_dev]) == 2 &&
-           get_option(&str,&snd_midi_devs[nr_dev]) == 2);
-    nr_dev++;
-    return 1;
-}
-
-__setup("snd-card-virmidi=", alsa_card_virmidi_setup);
-
-#endif /* ifndef MODULE */