hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: firewire-digi00x: add support for MIDI ports for physical controls 

In former commits, asynchronous transactions are supported for physical
controls. This commit adds a pair of MIDI ports for them.

This driver already adds diferrent number of ALSA MIDI ports for physical
MIDI ports, and the number of in/out ports are different. As seeing as
'amidi' program in alsa-utils package, a pair of in/out MIDI ports is
expected with the same name. Therefore, this commit adds a pair of new
ports to the first.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2015-10-11 12:30:19 +09:00 committed by Takashi Iwai
parent b47f525f76
commit e8bd577ae6
1 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
sound/firewire/digi00x/digi00x-midi.c
View File

@ -13,6 +13,10 @@ static int midi_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;
@ -31,6 +35,10 @@ static int midi_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);
@ -47,12 +55,20 @@ static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)
spin_lock_irqsave(&dg00x->lock, flags);
if (up)
amdtp_dot_midi_trigger(&dg00x->tx_stream,
substrm->number, substrm);
else
amdtp_dot_midi_trigger(&dg00x->tx_stream,
substrm->number, NULL);
/* This port is for asynchronous transaction. */
if (substrm->number == 0) {
if (up)
dg00x->in_control = substrm;
else
dg00x->in_control = NULL;
} else {
if (up)
amdtp_dot_midi_trigger(&dg00x->tx_stream,
substrm->number - 1, substrm);
else
amdtp_dot_midi_trigger(&dg00x->tx_stream,
substrm->number - 1, NULL);
}
spin_unlock_irqrestore(&dg00x->lock, flags);
}
@ -64,12 +80,19 @@ static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)
spin_lock_irqsave(&dg00x->lock, flags);
if (up)
amdtp_dot_midi_trigger(&dg00x->rx_stream,
substrm->number, substrm);
else
amdtp_dot_midi_trigger(&dg00x->rx_stream,
substrm->number, NULL);
/* This port is for asynchronous transaction. */
if (substrm->number == 0) {
if (up)
snd_fw_async_midi_port_run(&dg00x->out_control,
substrm);
} else {
if (up)
amdtp_dot_midi_trigger(&dg00x->rx_stream,
substrm->number - 1, substrm);
else
amdtp_dot_midi_trigger(&dg00x->rx_stream,
substrm->number - 1, NULL);
}
spin_unlock_irqrestore(&dg00x->lock, flags);
}
@ -92,9 +115,15 @@ static void set_midi_substream_names(struct snd_dg00x *dg00x,
struct snd_rawmidi_substream *subs;
list_for_each_entry(subs, &str->substreams, list) {
snprintf(subs->name, sizeof(subs->name),
"%s MIDI %d",
dg00x->card->shortname, subs->number + 1);
if (subs->number > 0)
snprintf(subs->name, sizeof(subs->name),
"%s MIDI %d",
dg00x->card->shortname, subs->number);
else
/* This port is for asynchronous transaction. */
snprintf(subs->name, sizeof(subs->name),
"%s control",
dg00x->card->shortname);
}
}
@ -105,7 +134,7 @@ int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x)
int err;
err = snd_rawmidi_new(dg00x->card, dg00x->card->driver, 0,
DOT_MIDI_OUT_PORTS, DOT_MIDI_IN_PORTS, &rmidi);
DOT_MIDI_OUT_PORTS + 1, DOT_MIDI_IN_PORTS + 1, &rmidi);
if (err < 0)
return err;