ALSA: firewire-motu: add specification flag for position of flag for MIDI messages

In protocols of MOTU FireWire series, when transferring MIDI messages,
transmitter set existence flag to one byte on first several quadlets. The
position differs depending on protocols and models, however two cases are
confirmed; in 5th byte and 8th byte from MSB side.

This commit adds a series of specification flag to describe them. When
the existence flag is in the 5th byte, SND_MOTU_SPEC_[R|T]X_MIDI_2ND_Q is
used. Else, another set of the flag is used. Here, '_Q' means quadlet.

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

diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c
index 1466e46a101eb387d3693638ea4b1bb4347d826f..4330220890e8a9b6080bd8bc30c318416215807b 100644 (file)
--- a/sound/firewire/motu/motu-pcm.c
+++ b/sound/firewire/motu/motu-pcm.c
@@ -145,7 +145,7 @@ static int pcm_open(struct snd_pcm_substream *substream)
 
        mutex_lock(&motu->mutex);
 
-       err = protocol->cache_packet_formats(motu);
+       err = snd_motu_stream_cache_packet_formats(motu);
        if (err < 0)
                goto err_locked;
 

diff --git a/sound/firewire/motu/motu-protocol-v2.c b/sound/firewire/motu/motu-protocol-v2.c
index 05b5d287c2f3ddd3b1e0c8d9d0287fd05d7629f3..525b746330bebe2e5b878c229ad35e4931807458 100644 (file)
--- a/sound/firewire/motu/motu-protocol-v2.c
+++ b/sound/firewire/motu/motu-protocol-v2.c
@@ -217,12 +217,7 @@ static int v2_cache_packet_formats(struct snd_motu *motu)
        calculate_differed_part(&motu->rx_packet_formats, motu->spec->flags,
                        data, V2_OPT_OUT_IFACE_MASK, V2_OPT_OUT_IFACE_SHIFT);
 
-       motu->tx_packet_formats.midi_flag_offset = 4;
-       motu->tx_packet_formats.midi_byte_offset = 6;
        motu->tx_packet_formats.pcm_byte_offset = 10;
-
-       motu->rx_packet_formats.midi_flag_offset = 4;
-       motu->rx_packet_formats.midi_byte_offset = 6;
        motu->rx_packet_formats.pcm_byte_offset = 10;
 
        return 0;

diff --git a/sound/firewire/motu/motu-protocol-v3.c b/sound/firewire/motu/motu-protocol-v3.c
index ddb647254ed224b860f0ae75b372cc32f7f91383..c7cd9864dc4d23b686c2e55059da6d1b8551c7c2 100644 (file)
--- a/sound/firewire/motu/motu-protocol-v3.c
+++ b/sound/firewire/motu/motu-protocol-v3.c
@@ -291,12 +291,7 @@ static int v3_cache_packet_formats(struct snd_motu *motu)
                        V3_ENABLE_OPT_OUT_IFACE_A, V3_NO_ADAT_OPT_OUT_IFACE_A,
                        V3_ENABLE_OPT_OUT_IFACE_B, V3_NO_ADAT_OPT_OUT_IFACE_B);
 
-       motu->tx_packet_formats.midi_flag_offset = 8;
-       motu->tx_packet_formats.midi_byte_offset = 7;
        motu->tx_packet_formats.pcm_byte_offset = 10;
-
-       motu->rx_packet_formats.midi_flag_offset = 8;
-       motu->rx_packet_formats.midi_byte_offset = 7;
        motu->rx_packet_formats.pcm_byte_offset = 10;
 
        return 0;

diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index bd458029099e35f1872af4a53f3759e188302226..dc5541c8b35927bb28875eef10d4c40989d9cf87 100644 (file)
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -33,7 +33,8 @@ static int start_both_streams(struct snd_motu *motu, unsigned int rate)
        u32 data;
        int err;
 
-       if (motu->spec->flags & SND_MOTU_SPEC_HAS_MIDI)
+       if ((motu->spec->flags & SND_MOTU_SPEC_RX_MIDI_2ND_Q) ||
+           (motu->spec->flags & SND_MOTU_SPEC_RX_MIDI_3RD_Q))
                midi_ports = 1;
 
        /* Set packet formation to our packet streaming engine. */
@@ -42,6 +43,12 @@ static int start_both_streams(struct snd_motu *motu, unsigned int rate)
        if (err < 0)
                return err;
 
+       if ((motu->spec->flags & SND_MOTU_SPEC_TX_MIDI_2ND_Q) ||
+           (motu->spec->flags & SND_MOTU_SPEC_TX_MIDI_3RD_Q))
+               midi_ports = 1;
+       else
+               midi_ports = 0;
+
        err = amdtp_motu_set_parameters(&motu->tx_stream, rate, midi_ports,
                                        &motu->tx_packet_formats);
        if (err < 0)
@@ -141,6 +148,33 @@ static void stop_isoc_ctx(struct snd_motu *motu, struct amdtp_stream *stream)
        fw_iso_resources_free(resources);
 }
 
+int snd_motu_stream_cache_packet_formats(struct snd_motu *motu)
+{
+       int err;
+
+       err = motu->spec->protocol->cache_packet_formats(motu);
+       if (err < 0)
+               return err;
+
+       if (motu->spec->flags & SND_MOTU_SPEC_TX_MIDI_2ND_Q) {
+               motu->tx_packet_formats.midi_flag_offset = 4;
+               motu->tx_packet_formats.midi_byte_offset = 6;
+       } else if (motu->spec->flags & SND_MOTU_SPEC_TX_MIDI_3RD_Q) {
+               motu->tx_packet_formats.midi_flag_offset = 8;
+               motu->tx_packet_formats.midi_byte_offset = 7;
+       }
+
+       if (motu->spec->flags & SND_MOTU_SPEC_RX_MIDI_2ND_Q) {
+               motu->rx_packet_formats.midi_flag_offset = 4;
+               motu->rx_packet_formats.midi_byte_offset = 6;
+       } else if (motu->spec->flags & SND_MOTU_SPEC_RX_MIDI_3RD_Q) {
+               motu->rx_packet_formats.midi_flag_offset = 8;
+               motu->rx_packet_formats.midi_byte_offset = 7;
+       }
+
+       return 0;
+}
+
 static int ensure_packet_formats(struct snd_motu *motu)
 {
        __be32 reg;
@@ -184,7 +218,7 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate)
                stop_both_streams(motu);
        }
 
-       err = protocol->cache_packet_formats(motu);
+       err = snd_motu_stream_cache_packet_formats(motu);
        if (err < 0)
                return err;
 

diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c
index bf779cfeef0dfaea62ea5684997314a9fe02d4c0..13d26e36fe00e0c37c80d6327b588dc5a663d032 100644 (file)
--- a/sound/firewire/motu/motu.c
+++ b/sound/firewire/motu/motu.c
@@ -103,7 +103,10 @@ static void do_registration(struct work_struct *work)
        if (err < 0)
                goto error;
 
-       if (motu->spec->flags & SND_MOTU_SPEC_HAS_MIDI) {
+       if ((motu->spec->flags & SND_MOTU_SPEC_RX_MIDI_2ND_Q) ||
+           (motu->spec->flags & SND_MOTU_SPEC_RX_MIDI_3RD_Q) ||
+           (motu->spec->flags & SND_MOTU_SPEC_TX_MIDI_2ND_Q) ||
+           (motu->spec->flags & SND_MOTU_SPEC_TX_MIDI_3RD_Q)) {
                err = snd_motu_create_midi_devices(motu);
                if (err < 0)
                        goto error;
@@ -197,7 +200,8 @@ static struct snd_motu_spec motu_828mk2 = {
                 SND_MOTU_SPEC_TX_MICINST_CHUNK |
                 SND_MOTU_SPEC_TX_RETURN_CHUNK |
                 SND_MOTU_SPEC_HAS_OPT_IFACE_A |
-                SND_MOTU_SPEC_HAS_MIDI,
+                SND_MOTU_SPEC_RX_MIDI_2ND_Q |
+                SND_MOTU_SPEC_TX_MIDI_2ND_Q,
 
        .analog_in_ports = 8,
        .analog_out_ports = 8,
@@ -213,7 +217,8 @@ static struct snd_motu_spec motu_828mk3 = {
                 SND_MOTU_SPEC_TX_REVERB_CHUNK |
                 SND_MOTU_SPEC_HAS_OPT_IFACE_A |
                 SND_MOTU_SPEC_HAS_OPT_IFACE_B |
-                SND_MOTU_SPEC_HAS_MIDI,
+                SND_MOTU_SPEC_RX_MIDI_3RD_Q |
+                SND_MOTU_SPEC_TX_MIDI_3RD_Q,
 
        .analog_in_ports = 8,
        .analog_out_ports = 8,

diff --git a/sound/firewire/motu/motu.h b/sound/firewire/motu/motu.h
index 8d6a4a3af9cc136056a380d39cbefbfcc397c4cc..4b23cf337c4bec535172f289186fefb295919697 100644 (file)
--- a/sound/firewire/motu/motu.h
+++ b/sound/firewire/motu/motu.h
@@ -82,7 +82,10 @@ enum snd_motu_spec_flags {
        SND_MOTU_SPEC_TX_AESEBU_CHUNK   = 0x0020,
        SND_MOTU_SPEC_HAS_OPT_IFACE_A   = 0x0040,
        SND_MOTU_SPEC_HAS_OPT_IFACE_B   = 0x0080,
-       SND_MOTU_SPEC_HAS_MIDI          = 0x0100,
+       SND_MOTU_SPEC_RX_MIDI_2ND_Q     = 0x0100,
+       SND_MOTU_SPEC_RX_MIDI_3RD_Q     = 0x0200,
+       SND_MOTU_SPEC_TX_MIDI_2ND_Q     = 0x0400,
+       SND_MOTU_SPEC_TX_MIDI_3RD_Q     = 0x0800,
 };
 
 #define SND_MOTU_CLOCK_RATE_COUNT      6
@@ -146,6 +149,7 @@ void snd_motu_transaction_unregister(struct snd_motu *motu);
 
 int snd_motu_stream_init_duplex(struct snd_motu *motu);
 void snd_motu_stream_destroy_duplex(struct snd_motu *motu);
+int snd_motu_stream_cache_packet_formats(struct snd_motu *motu);
 int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate);
 void snd_motu_stream_stop_duplex(struct snd_motu *motu);
 int snd_motu_stream_lock_try(struct snd_motu *motu);