Commit 9fbfd38b authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-digi00x: add support for MIDI ports corresponding to isochronous packet streaming 



This commit adds MIDI functionality to capture/playback MIDI messages
from/to physical MIDI ports. These messages are transferred in isochronous
packets.

When no substreams request AMDTP streams to run, this driver starts the
streams at current sampling rate. When other substreams start at different
sampling rate, the streams are stopped temporarily, then start again at
requested sampling rate. This operation can generate missing MIDI bytes,
thus it's preferable to start PCM substreams at favorite sampling rate in
advance.

Digi 002/003 console also has a set of MIDI port for physical controls.
These ports are added in later commits.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9dc5d31c

sound/firewire/digi00x/Makefile

+1 −1
Original line number Diff line number Diff line 
snd-firewire-digi00x-objs := amdtp-dot.o digi00x-stream.o digi00x-proc.o \

			     digi00x-pcm.o digi00x-hwdep.o \

			     digi00x-transaction.o digi00x.o

			     digi00x-transaction.o digi00x-midi.o digi00x.o

obj-$(CONFIG_SND_FIREWIRE_DIGI00X) += snd-firewire-digi00x.o

sound/firewire/digi00x/digi00x-midi.c

0 → 100644
+131 −0
Original line number Diff line number Diff line 
/*

 * digi00x-midi.h - a part of driver for Digidesign Digi 002/003 family

 *

 * Copyright (c) 2014-2015 Takashi Sakamoto

 *

 * Licensed under the terms of the GNU General Public License, version 2.

 */



#include "digi00x.h"



static int midi_open(struct snd_rawmidi_substream *substream)

{

	struct snd_dg00x *dg00x = substream->rmidi->private_data;

	int err;



	err = snd_dg00x_stream_lock_try(dg00x);

	if (err < 0)

		return err;



	mutex_lock(&dg00x->mutex);

	dg00x->substreams_counter++;

	err = snd_dg00x_stream_start_duplex(dg00x, 0);

	mutex_unlock(&dg00x->mutex);

	if (err < 0)

		snd_dg00x_stream_lock_release(dg00x);



	return err;

}



static int midi_close(struct snd_rawmidi_substream *substream)

{

	struct snd_dg00x *dg00x = substream->rmidi->private_data;



	mutex_lock(&dg00x->mutex);

	dg00x->substreams_counter--;

	snd_dg00x_stream_stop_duplex(dg00x);

	mutex_unlock(&dg00x->mutex);



	snd_dg00x_stream_lock_release(dg00x);

	return 0;

}



static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)

{

	struct snd_dg00x *dg00x = substrm->rmidi->private_data;

	unsigned long flags;



	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);



	spin_unlock_irqrestore(&dg00x->lock, flags);

}



static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)

{

	struct snd_dg00x *dg00x = substrm->rmidi->private_data;

	unsigned long flags;



	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);



	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_playback_ops = {

	.open		= midi_open,

	.close		= midi_close,

	.trigger	= midi_playback_trigger,

};



static void set_midi_substream_names(struct snd_dg00x *dg00x,

				     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",

			 dg00x->card->shortname, subs->number + 1);

	}

}



int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x)

{

	struct snd_rawmidi *rmidi;

	struct snd_rawmidi_str *str;

	int err;



	err = snd_rawmidi_new(dg00x->card, dg00x->card->driver, 0,

			      DOT_MIDI_OUT_PORTS, DOT_MIDI_IN_PORTS, &rmidi);

	if (err < 0)

		return err;



	snprintf(rmidi->name, sizeof(rmidi->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,

			    &midi_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);

	str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT];

	set_midi_substream_names(dg00x, str);



	rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;



	return 0;

}

sound/firewire/digi00x/digi00x-stream.c

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x, unsigned int rate) 
	err = snd_dg00x_stream_get_local_rate(dg00x, &curr_rate);

	if (err < 0)

		goto error;

	if (rate == 0)

		rate = curr_rate;

	if (curr_rate != rate ||

	    amdtp_streaming_error(&dg00x->tx_stream) ||

	    amdtp_streaming_error(&dg00x->rx_stream)) {

sound/firewire/digi00x/digi00x.c

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ static int snd_dg00x_probe(struct fw_unit *unit, 
	if (err < 0)

		goto error;



	err = snd_dg00x_create_midi_devices(dg00x);

	if (err < 0)

		goto error;



	err = snd_dg00x_create_hwdep_device(dg00x);

	if (err < 0)

		goto error;

sound/firewire/digi00x/digi00x.h

+2 −0
Original line number Diff line number Diff line
@@ -147,5 +147,7 @@ void snd_dg00x_proc_init(struct snd_dg00x *dg00x); 


int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x);



int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x);



int snd_dg00x_create_hwdep_device(struct snd_dg00x *dg00x);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE