[alsa-devel] [PATCH 0/3] ALSA: firewire-digi00x: add another rawmidi character device for MIDI control ports
Hi,
Digi 002/003 family uses two ways of MIDI transmission; by isochronous packet streaming and by asynchronous transmission. The former is for physical MIDI ports and the latter is for physical controls on device surface.
Currently, all of these ports are handled by a set of operations in one ALSA rawmidi character device, thus:
$ amidi -l Dir Device Name IO hw:1,0,0 Digi 002Rack control IO hw:1,0,1 Digi 002Rack MIDI 1 O hw:1,0,2 Digi 002Rack MIDI 2
Although, it's preferable to have two rawmidi character devices because these transmission ways are completely different and it's better to assign each set of operations.
This patchset adds another rawmidi character device to ALSA digi00x driver. As a result, the driver register two rawmidi character device for each MIDI ports:
$ amidi -l Dir Device Name IO hw:1,0,0 Digi 002Rack MIDI 1 O hw:1,0,1 Digi 002Rack MIDI 2 IO hw:1,1,0 Digi 002Rack control
I'm sorry to post this patchset in this time, but next release is a first version with digi00x driver and it better to includes this intrusive patchset before releasing.
Takashi Sakamoto (3): ALSA: firewire-digi00x: rename identifiers of MIDI operation for physical ports ALSA: firewire-digi00x: add MIDI operations for MIDI control port ALSA: firewire-digi00x: add another rawmidi character device for MIDI control ports
sound/firewire/digi00x/digi00x-midi.c | 197 ++++++++++++++++++++++------------ 1 file changed, 130 insertions(+), 67 deletions(-)
In following commit, new functions and variables are added for operations of MIDI control port.
This commit is a preparation. Current identifiers are renamed so that they mean physical MIDI ports.
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/digi00x/digi00x-midi.c | 52 +++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/sound/firewire/digi00x/digi00x-midi.c b/sound/firewire/digi00x/digi00x-midi.c index 9aa8b46..1d649e3 100644 --- a/sound/firewire/digi00x/digi00x-midi.c +++ b/sound/firewire/digi00x/digi00x-midi.c @@ -8,7 +8,7 @@
#include "digi00x.h"
-static int midi_open(struct snd_rawmidi_substream *substream) +static int midi_phys_open(struct snd_rawmidi_substream *substream) { struct snd_dg00x *dg00x = substream->rmidi->private_data; int err; @@ -31,7 +31,7 @@ static int midi_open(struct snd_rawmidi_substream *substream) return err; }
-static int midi_close(struct snd_rawmidi_substream *substream) +static int midi_phys_close(struct snd_rawmidi_substream *substream) { struct snd_dg00x *dg00x = substream->rmidi->private_data;
@@ -48,65 +48,69 @@ static int midi_close(struct snd_rawmidi_substream *substream) return 0; }
-static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up) +static void midi_phys_capture_trigger(struct snd_rawmidi_substream *substream, + int up) { - struct snd_dg00x *dg00x = substrm->rmidi->private_data; + struct snd_dg00x *dg00x = substream->rmidi->private_data; unsigned long flags;
spin_lock_irqsave(&dg00x->lock, flags);
/* This port is for asynchronous transaction. */ - if (substrm->number == 0) { + if (substream->number == 0) { if (up) - dg00x->in_control = substrm; + dg00x->in_control = substream; else dg00x->in_control = NULL; } else { if (up) amdtp_dot_midi_trigger(&dg00x->tx_stream, - substrm->number - 1, substrm); + substream->number - 1, + substream); else amdtp_dot_midi_trigger(&dg00x->tx_stream, - substrm->number - 1, NULL); + substream->number - 1, NULL); }
spin_unlock_irqrestore(&dg00x->lock, flags); }
-static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up) +static void midi_phys_playback_trigger(struct snd_rawmidi_substream *substream, + int up) { - struct snd_dg00x *dg00x = substrm->rmidi->private_data; + struct snd_dg00x *dg00x = substream->rmidi->private_data; unsigned long flags;
spin_lock_irqsave(&dg00x->lock, flags);
/* This port is for asynchronous transaction. */ - if (substrm->number == 0) { + if (substream->number == 0) { if (up) snd_fw_async_midi_port_run(&dg00x->out_control, - substrm); + substream); } else { if (up) amdtp_dot_midi_trigger(&dg00x->rx_stream, - substrm->number - 1, substrm); + substream->number - 1, + substream); else amdtp_dot_midi_trigger(&dg00x->rx_stream, - substrm->number - 1, NULL); + substream->number - 1, NULL); }
spin_unlock_irqrestore(&dg00x->lock, flags); }
-static struct snd_rawmidi_ops midi_capture_ops = { - .open = midi_open, - .close = midi_close, - .trigger = midi_capture_trigger, +static struct snd_rawmidi_ops midi_phys_capture_ops = { + .open = midi_phys_open, + .close = midi_phys_close, + .trigger = midi_phys_capture_trigger, };
-static struct snd_rawmidi_ops midi_playback_ops = { - .open = midi_open, - .close = midi_close, - .trigger = midi_playback_trigger, +static struct snd_rawmidi_ops midi_phys_playback_ops = { + .open = midi_phys_open, + .close = midi_phys_close, + .trigger = midi_phys_playback_trigger, };
static void set_midi_substream_names(struct snd_dg00x *dg00x, @@ -144,13 +148,13 @@ int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x)
rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, - &midi_capture_ops); + &midi_phys_capture_ops); str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT]; set_midi_substream_names(dg00x, str);
rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, - &midi_playback_ops); + &midi_phys_playback_ops); str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT]; set_midi_substream_names(dg00x, str);
Digi 002/003 family has two types of MIDI port; one is for physical MIDI port and another is for MIDI control message. The former is transferred in isochronous packet, and the latter is transferred by asynchronous transaction. These transmission mechanisms are completely different, while current ALSA digi00x driver defines a set of operations for them with several condition statements. As a result, codes for the operation are messy.
This commit adds a set of MIDI operation for control MIDI ports. In later commit, it's applied as an operation for ALSA rawmidi character device.
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/digi00x/digi00x-midi.c | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
diff --git a/sound/firewire/digi00x/digi00x-midi.c b/sound/firewire/digi00x/digi00x-midi.c index 1d649e3..527f4b3 100644 --- a/sound/firewire/digi00x/digi00x-midi.c +++ b/sound/firewire/digi00x/digi00x-midi.c @@ -113,6 +113,69 @@ static struct snd_rawmidi_ops midi_phys_playback_ops = { .trigger = midi_phys_playback_trigger, };
+static int midi_ctl_open(struct snd_rawmidi_substream *substream) +{ + /* Do nothing. */ + return 0; +} + +static int midi_ctl_capture_close(struct snd_rawmidi_substream *substream) +{ + /* Do nothing. */ + return 0; +} + +static int midi_ctl_playback_close(struct snd_rawmidi_substream *substream) +{ + struct snd_dg00x *dg00x = substream->rmidi->private_data; + + snd_fw_async_midi_port_finish(&dg00x->out_control); + + return 0; +} + +static void midi_ctl_capture_trigger(struct snd_rawmidi_substream *substream, + int up) +{ + struct snd_dg00x *dg00x = substream->rmidi->private_data; + unsigned long flags; + + spin_lock_irqsave(&dg00x->lock, flags); + + if (up) + dg00x->in_control = substream; + else + dg00x->in_control = NULL; + + spin_unlock_irqrestore(&dg00x->lock, flags); +} + +static void midi_ctl_playback_trigger(struct snd_rawmidi_substream *substream, + int up) +{ + struct snd_dg00x *dg00x = substream->rmidi->private_data; + unsigned long flags; + + spin_lock_irqsave(&dg00x->lock, flags); + + if (up) + snd_fw_async_midi_port_run(&dg00x->out_control, substream); + + spin_unlock_irqrestore(&dg00x->lock, flags); +} + +static struct snd_rawmidi_ops midi_ctl_capture_ops = { + .open = midi_ctl_open, + .close = midi_ctl_capture_close, + .trigger = midi_ctl_capture_trigger, +}; + +static struct snd_rawmidi_ops midi_ctl_playback_ops = { + .open = midi_ctl_open, + .close = midi_ctl_playback_close, + .trigger = midi_ctl_playback_trigger, +}; + static void set_midi_substream_names(struct snd_dg00x *dg00x, struct snd_rawmidi_str *str) {
Digi 002/003 family uses two ways to transfer MIDI messages. They're different mechanisms, while it's better to handle the ways in different ALSA rawmidi character devices because one character device has just a set of operations.
This commit adds another rawmidi character device for control MIDI port. As a result, first rawmidi character device is just for MIDI messages transferred by isochronous packets.
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/digi00x/digi00x-midi.c | 104 ++++++++++++++++------------------ 1 file changed, 50 insertions(+), 54 deletions(-)
diff --git a/sound/firewire/digi00x/digi00x-midi.c b/sound/firewire/digi00x/digi00x-midi.c index 527f4b3..fca2855 100644 --- a/sound/firewire/digi00x/digi00x-midi.c +++ b/sound/firewire/digi00x/digi00x-midi.c @@ -13,10 +13,6 @@ static int midi_phys_open(struct snd_rawmidi_substream *substream) struct snd_dg00x *dg00x = substream->rmidi->private_data; int err;
- /* This port is for asynchronous transaction. */ - if (substream->number == 0) - return 0; - err = snd_dg00x_stream_lock_try(dg00x); if (err < 0) return err; @@ -35,10 +31,6 @@ static int midi_phys_close(struct snd_rawmidi_substream *substream) { struct snd_dg00x *dg00x = substream->rmidi->private_data;
- /* This port is for asynchronous transaction. */ - if (substream->number == 0) - return 0; - mutex_lock(&dg00x->mutex); dg00x->substreams_counter--; snd_dg00x_stream_stop_duplex(dg00x); @@ -56,21 +48,12 @@ static void midi_phys_capture_trigger(struct snd_rawmidi_substream *substream,
spin_lock_irqsave(&dg00x->lock, flags);
- /* This port is for asynchronous transaction. */ - if (substream->number == 0) { - if (up) - dg00x->in_control = substream; - else - dg00x->in_control = NULL; - } else { - if (up) - amdtp_dot_midi_trigger(&dg00x->tx_stream, - substream->number - 1, - substream); - else - amdtp_dot_midi_trigger(&dg00x->tx_stream, - substream->number - 1, NULL); - } + if (up) + amdtp_dot_midi_trigger(&dg00x->tx_stream, substream->number, + substream); + else + amdtp_dot_midi_trigger(&dg00x->tx_stream, substream->number, + NULL);
spin_unlock_irqrestore(&dg00x->lock, flags); } @@ -83,20 +66,12 @@ static void midi_phys_playback_trigger(struct snd_rawmidi_substream *substream,
spin_lock_irqsave(&dg00x->lock, flags);
- /* This port is for asynchronous transaction. */ - if (substream->number == 0) { - if (up) - snd_fw_async_midi_port_run(&dg00x->out_control, - substream); - } else { - if (up) - amdtp_dot_midi_trigger(&dg00x->rx_stream, - substream->number - 1, - substream); - else - amdtp_dot_midi_trigger(&dg00x->rx_stream, - substream->number - 1, NULL); - } + if (up) + amdtp_dot_midi_trigger(&dg00x->rx_stream, substream->number, + substream); + else + amdtp_dot_midi_trigger(&dg00x->rx_stream, substream->number, + NULL);
spin_unlock_irqrestore(&dg00x->lock, flags); } @@ -177,15 +152,16 @@ static struct snd_rawmidi_ops midi_ctl_playback_ops = { };
static void set_midi_substream_names(struct snd_dg00x *dg00x, - struct snd_rawmidi_str *str) + struct snd_rawmidi_str *str, + bool is_ctl) { struct snd_rawmidi_substream *subs;
list_for_each_entry(subs, &str->substreams, list) { - if (subs->number > 0) + if (!is_ctl) snprintf(subs->name, sizeof(subs->name), "%s MIDI %d", - dg00x->card->shortname, subs->number); + dg00x->card->shortname, subs->number + 1); else /* This port is for asynchronous transaction. */ snprintf(subs->name, sizeof(subs->name), @@ -196,32 +172,52 @@ static void set_midi_substream_names(struct snd_dg00x *dg00x,
int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x) { - struct snd_rawmidi *rmidi; + struct snd_rawmidi *rmidi[2]; struct snd_rawmidi_str *str; + unsigned int i; int err;
+ /* Add physical midi ports. */ err = snd_rawmidi_new(dg00x->card, dg00x->card->driver, 0, - DOT_MIDI_OUT_PORTS + 1, DOT_MIDI_IN_PORTS + 1, &rmidi); + DOT_MIDI_OUT_PORTS, DOT_MIDI_IN_PORTS, &rmidi[0]); if (err < 0) return err;
- snprintf(rmidi->name, sizeof(rmidi->name), + snprintf(rmidi[0]->name, sizeof(rmidi[0]->name), "%s MIDI", dg00x->card->shortname); - rmidi->private_data = dg00x;
- rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; - snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, + snd_rawmidi_set_ops(rmidi[0], SNDRV_RAWMIDI_STREAM_INPUT, &midi_phys_capture_ops); - str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT]; - set_midi_substream_names(dg00x, str); - - rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; - snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, + snd_rawmidi_set_ops(rmidi[0], SNDRV_RAWMIDI_STREAM_OUTPUT, &midi_phys_playback_ops); - str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT]; - set_midi_substream_names(dg00x, str);
- rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX; + /* Add a pair of control midi ports. */ + err = snd_rawmidi_new(dg00x->card, dg00x->card->driver, 1, + 1, 1, &rmidi[1]); + if (err < 0) + return err; + + snprintf(rmidi[1]->name, sizeof(rmidi[1]->name), + "%s control", dg00x->card->shortname); + + snd_rawmidi_set_ops(rmidi[1], SNDRV_RAWMIDI_STREAM_INPUT, + &midi_ctl_capture_ops); + snd_rawmidi_set_ops(rmidi[1], SNDRV_RAWMIDI_STREAM_OUTPUT, + &midi_ctl_playback_ops); + + for (i = 0; i < ARRAY_SIZE(rmidi); i++) { + rmidi[i]->private_data = dg00x; + + rmidi[i]->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; + str = &rmidi[i]->streams[SNDRV_RAWMIDI_STREAM_INPUT]; + set_midi_substream_names(dg00x, str, i); + + rmidi[i]->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; + str = &rmidi[i]->streams[SNDRV_RAWMIDI_STREAM_OUTPUT]; + set_midi_substream_names(dg00x, str, i); + + rmidi[i]->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX; + }
return 0; }
On Fri, 30 Oct 2015 18:43:13 +0100, Takashi Sakamoto wrote:
Hi,
Digi 002/003 family uses two ways of MIDI transmission; by isochronous packet streaming and by asynchronous transmission. The former is for physical MIDI ports and the latter is for physical controls on device surface.
Currently, all of these ports are handled by a set of operations in one ALSA rawmidi character device, thus:
$ amidi -l Dir Device Name IO hw:1,0,0 Digi 002Rack control IO hw:1,0,1 Digi 002Rack MIDI 1 O hw:1,0,2 Digi 002Rack MIDI 2
Although, it's preferable to have two rawmidi character devices because these transmission ways are completely different and it's better to assign each set of operations.
This patchset adds another rawmidi character device to ALSA digi00x driver. As a result, the driver register two rawmidi character device for each MIDI ports:
$ amidi -l Dir Device Name IO hw:1,0,0 Digi 002Rack MIDI 1 O hw:1,0,1 Digi 002Rack MIDI 2 IO hw:1,1,0 Digi 002Rack control
I'm sorry to post this patchset in this time, but next release is a first version with digi00x driver and it better to includes this intrusive patchset before releasing.
Takashi Sakamoto (3): ALSA: firewire-digi00x: rename identifiers of MIDI operation for physical ports ALSA: firewire-digi00x: add MIDI operations for MIDI control port ALSA: firewire-digi00x: add another rawmidi character device for MIDI control ports
Applied all three patches, thanks.
Takashi
sound/firewire/digi00x/digi00x-midi.c | 197 ++++++++++++++++++++++------------ 1 file changed, 130 insertions(+), 67 deletions(-)
-- 2.1.4
participants (2)
-
Takashi Iwai -
Takashi Sakamoto