Changeset 212 for GPL/branches/alsa-resync1/alsa-kernel/drivers/virmidi.c

Timestamp:

Jul 14, 2007, 7:13:46 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.0rc5

File:

• GPL/branches/alsa-resync1/alsa-kernel/drivers/virmidi.c (modified) (7 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/virmidi.c

@@ -31 +31 @@
  * Typical usage is like following:
  * - Load snd-virmidi module.
- *      # modprobe snd-virmidi snd_index=2
+ *      # 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.
@@ -60 +60 @@
 #define MAX_MIDI_DEVICES        8
 
-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 */
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
+static char *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
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;
+static int 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};
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
 #endif
 
-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_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for virmidi soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for virmidi soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable this soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(midi_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-8)");
+MODULE_PARM_SYNTAX(midi_devs, SNDRV_ENABLED ",allows:{{1,8}}");
 
 typedef struct snd_card_virmidi {
@@ -97 +97 @@
     int idx, err;
 
-    if (!snd_enable[dev])
+        if (!enable[dev])
         return -ENODEV;
-    card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
                         sizeof(struct snd_card_virmidi));
     if (card == NULL)
@@ -106 +106 @@
     vmidi->card = card;
 
-    if (snd_midi_devs[dev] > MAX_MIDI_DEVICES) {
+        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);
-        snd_midi_devs[dev] = MAX_MIDI_DEVICES;
+                midi_devs[dev] = MAX_MIDI_DEVICES;
     }
-    for (idx = 0; idx < snd_midi_devs[dev]; idx++) {
+        for (idx = 0; idx < 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;
+                rdev = snd_magic_cast(snd_virmidi_dev_t, rmidi->private_data, continue);
         vmidi->midi[idx] = rmidi;
         strcpy(rmidi->name, "Virtual Raw MIDI");
@@ -137 +137 @@
     int dev, cards;
 
-    for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev]; dev++) {
+        for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++) {
         if (snd_card_virmidi_probe(dev) < 0) {
 #ifdef MODULE
@@ -168 +168 @@
 #ifndef MODULE
 
-/* format is: snd-virmidi=snd_enable,snd_index,snd_id,snd_midi_devs */
+/* format is: snd-virmidi=enable,index,id,midi_devs */
 
 static int __init alsa_card_virmidi_setup(char *str)
@@ -176 +176 @@
     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);
+        (void)(get_option(&str,&enable[nr_dev]) == 2 &&
+               get_option(&str,&index[nr_dev]) == 2 &&
+               get_id(&str,&id[nr_dev]) == 2 &&
+               get_option(&str,&midi_devs[nr_dev]) == 2);
     nr_dev++;
     return 1;