ALSA: bebob: Add MIDI interface

This commit adds a functionality to capture/playback MIDI messages.

When no AMDTP streams are running, this module starts AMDTP stream at current
sampling rate for MIDI substream.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index 5539baac9a5d7a6eb4fc5917de0d674cd865e8f9..708d3c81ef87821e3f362dd595bc226a1b2e9da9 100644 (file)
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -82,6 +82,7 @@ config SND_FIREWORKS
 config SND_BEBOB
        tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware"
        select SND_FIREWIRE_LIB
+       select SND_RAWMIDI
         help
         Say Y here to include support for FireWire devices based
         on BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware:

diff --git a/sound/firewire/bebob/Makefile b/sound/firewire/bebob/Makefile
index 757c40ef94dfded3b6365072b93d6dcf2a8d29e7..1e39e591540bdd8a7cb5823b388046c6cd79869a 100644 (file)
--- a/sound/firewire/bebob/Makefile
+++ b/sound/firewire/bebob/Makefile
@@ -1,2 +1,3 @@
-snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob.o
+snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \
+                 bebob.o
 obj-m += snd-bebob.o

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index 0c3f1f6ab6706a12a294773e036cb503ef576b90..383df9a220049590bea5c1ff8f645c8c4fa59ad8 100644 (file)
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -164,6 +164,13 @@ bebob_probe(struct fw_unit *unit,
 
        snd_bebob_proc_init(bebob);
 
+       if ((bebob->midi_input_ports > 0) ||
+           (bebob->midi_output_ports > 0)) {
+               err = snd_bebob_create_midi_devices(bebob);
+               if (err < 0)
+                       goto error;
+       }
+
        err = snd_bebob_stream_init_duplex(bebob);
        if (err < 0)
                goto error;

diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h
index 1247cca04f63d940627410937626a4c18a99aab1..0d53cff8a68d6f13752b3c376773296fa32ab441 100644 (file)
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
@@ -21,6 +21,7 @@
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
+#include <sound/rawmidi.h>
 
 #include "../lib.h"
 #include "../fcp.h"
@@ -174,6 +175,8 @@ void snd_bebob_stream_destroy_duplex(struct snd_bebob *bebob);
 
 void snd_bebob_proc_init(struct snd_bebob *bebob);
 
+int snd_bebob_create_midi_devices(struct snd_bebob *bebob);
+
 #define SND_BEBOB_DEV_ENTRY(vendor, model) \
 { \
        .match_flags    = IEEE1394_MATCH_VENDOR_ID | \

diff --git a/sound/firewire/bebob/bebob_midi.c b/sound/firewire/bebob/bebob_midi.c
new file mode 100644 (file)
index 0000000..120a61b
--- /dev/null
+++ b/sound/firewire/bebob/bebob_midi.c
@@ -0,0 +1,148 @@
+/*
+ * bebob_midi.c - a part of driver for BeBoB based devices
+ *
+ * Copyright (c) 2013-2014 Takashi Sakamoto
+ *
+ * Licensed under the terms of the GNU General Public License, version 2.
+ */
+
+#include "bebob.h"
+
+static int midi_capture_open(struct snd_rawmidi_substream *substream)
+{
+       struct snd_bebob *bebob = substream->rmidi->private_data;
+
+       atomic_inc(&bebob->capture_substreams);
+       return snd_bebob_stream_start_duplex(bebob, 0);
+}
+
+static int midi_playback_open(struct snd_rawmidi_substream *substream)
+{
+       struct snd_bebob *bebob = substream->rmidi->private_data;
+
+       atomic_inc(&bebob->playback_substreams);
+       return snd_bebob_stream_start_duplex(bebob, 0);
+}
+
+static int midi_capture_close(struct snd_rawmidi_substream *substream)
+{
+       struct snd_bebob *bebob = substream->rmidi->private_data;
+
+       atomic_dec(&bebob->capture_substreams);
+       snd_bebob_stream_stop_duplex(bebob);
+
+       return 0;
+}
+
+static int midi_playback_close(struct snd_rawmidi_substream *substream)
+{
+       struct snd_bebob *bebob = substream->rmidi->private_data;
+
+       atomic_dec(&bebob->playback_substreams);
+       snd_bebob_stream_stop_duplex(bebob);
+
+       return 0;
+}
+
+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)
+{
+       struct snd_bebob *bebob = substrm->rmidi->private_data;
+       unsigned long flags;
+
+       spin_lock_irqsave(&bebob->lock, flags);
+
+       if (up)
+               amdtp_stream_midi_trigger(&bebob->tx_stream,
+                                         substrm->number, substrm);
+       else
+               amdtp_stream_midi_trigger(&bebob->tx_stream,
+                                         substrm->number, NULL);
+
+       spin_unlock_irqrestore(&bebob->lock, flags);
+}
+
+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)
+{
+       struct snd_bebob *bebob = substrm->rmidi->private_data;
+       unsigned long flags;
+
+       spin_lock_irqsave(&bebob->lock, flags);
+
+       if (up)
+               amdtp_stream_midi_trigger(&bebob->rx_stream,
+                                         substrm->number, substrm);
+       else
+               amdtp_stream_midi_trigger(&bebob->rx_stream,
+                                         substrm->number, NULL);
+
+       spin_unlock_irqrestore(&bebob->lock, flags);
+}
+
+static struct snd_rawmidi_ops midi_capture_ops = {
+       .open           = midi_capture_open,
+       .close          = midi_capture_close,
+       .trigger        = midi_capture_trigger,
+};
+
+static struct snd_rawmidi_ops midi_playback_ops = {
+       .open           = midi_playback_open,
+       .close          = midi_playback_close,
+       .trigger        = midi_playback_trigger,
+};
+
+static void set_midi_substream_names(struct snd_bebob *bebob,
+                                    struct snd_rawmidi_str *str)
+{
+       struct snd_rawmidi_substream *subs;
+
+       list_for_each_entry(subs, &str->substreams, list) {
+               snprintf(subs->name, sizeof(subs->name),
+                        "%s MIDI %d",
+                        bebob->card->shortname, subs->number + 1);
+       }
+}
+
+int snd_bebob_create_midi_devices(struct snd_bebob *bebob)
+{
+       struct snd_rawmidi *rmidi;
+       struct snd_rawmidi_str *str;
+       int err;
+
+       /* create midi ports */
+       err = snd_rawmidi_new(bebob->card, bebob->card->driver, 0,
+                             bebob->midi_output_ports, bebob->midi_input_ports,
+                             &rmidi);
+       if (err < 0)
+               return err;
+
+       snprintf(rmidi->name, sizeof(rmidi->name),
+                "%s MIDI", bebob->card->shortname);
+       rmidi->private_data = bebob;
+
+       if (bebob->midi_input_ports > 0) {
+               rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
+
+               snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
+                                       &midi_capture_ops);
+
+               str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT];
+
+               set_midi_substream_names(bebob, str);
+       }
+
+       if (bebob->midi_output_ports > 0) {
+               rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;
+
+               snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
+                                       &midi_playback_ops);
+
+               str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT];
+
+               set_midi_substream_names(bebob, str);
+       }
+
+       if ((bebob->midi_output_ports > 0) && (bebob->midi_input_ports > 0))
+               rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;
+
+       return 0;
+}