ALSA: firewire-motu: add a flag for AES/EBU on XLR interface

MOTU Traveler supports AES/EBU on XLR interface and data block of rx/tx
packet includes two chunk for the interface. This commit adds a flag
for this purpose.

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

diff --git a/sound/firewire/motu/motu-protocol-v2.c b/sound/firewire/motu/motu-protocol-v2.c
index 614f9b11e010fccf8a2ddee193617ed0dcc336ab..f25b1ba118a20bf891dbe544dc5824ff2107a01f 100644 (file)
--- a/sound/firewire/motu/motu-protocol-v2.c
+++ b/sound/firewire/motu/motu-protocol-v2.c
@@ -160,6 +160,11 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats,
                pcm_chunks[1] += 2;
        }
 
+       if (flags & SND_MOTU_SPEC_HAS_AESEBU_IFACE) {
+               pcm_chunks[0] += 2;
+               pcm_chunks[1] += 2;
+       }
+
        /*
         * All of v2 models have a pair of coaxial interfaces for digital in/out
         * port. At 44.1/48.0/88.2/96.0 kHz, packets includes PCM from these

diff --git a/sound/firewire/motu/motu-protocol-v3.c b/sound/firewire/motu/motu-protocol-v3.c
index 293353991591fe251b01a80db9dec468a8ebdd2a..7cc80a05e91ffad6c3f625a86d2846bc5fcb4278 100644 (file)
--- a/sound/firewire/motu/motu-protocol-v3.c
+++ b/sound/firewire/motu/motu-protocol-v3.c
@@ -199,6 +199,11 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats,
                pcm_chunks[1] += 2;
        }
 
+       if (flags & SND_MOTU_SPEC_HAS_AESEBU_IFACE) {
+               pcm_chunks[0] += 2;
+               pcm_chunks[1] += 2;
+       }
+
        /*
         * At least, packets have two data chunks for S/PDIF on coaxial
         * interface.

diff --git a/sound/firewire/motu/motu.h b/sound/firewire/motu/motu.h
index bced0407179e16bbf8b8549555d3da86b799b711..2764bcaab3277813a15a9d2da92481da5d1db0f5 100644 (file)
--- a/sound/firewire/motu/motu.h
+++ b/sound/firewire/motu/motu.h
@@ -79,7 +79,7 @@ enum snd_motu_spec_flags {
        SND_MOTU_SPEC_TX_MICINST_CHUNK  = 0x0004,
        SND_MOTU_SPEC_TX_RETURN_CHUNK   = 0x0008,
        SND_MOTU_SPEC_TX_REVERB_CHUNK   = 0x0010,
-       SND_MOTU_SPEC_TX_AESEBU_CHUNK   = 0x0020,
+       SND_MOTU_SPEC_HAS_AESEBU_IFACE  = 0x0020,
        SND_MOTU_SPEC_HAS_OPT_IFACE_A   = 0x0040,
        SND_MOTU_SPEC_HAS_OPT_IFACE_B   = 0x0080,
        SND_MOTU_SPEC_RX_MIDI_2ND_Q     = 0x0100,