Skip to content

Commit 06ac0b6

Browse files
takaswietiwai
authored andcommitted
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 <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
1 parent 81720c6 commit 06ac0b6

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

sound/firewire/motu/motu-protocol-v2.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats,
160160
pcm_chunks[1] += 2;
161161
}
162162

163+
if (flags & SND_MOTU_SPEC_HAS_AESEBU_IFACE) {
164+
pcm_chunks[0] += 2;
165+
pcm_chunks[1] += 2;
166+
}
167+
163168
/*
164169
* All of v2 models have a pair of coaxial interfaces for digital in/out
165170
* port. At 44.1/48.0/88.2/96.0 kHz, packets includes PCM from these

sound/firewire/motu/motu-protocol-v3.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats,
199199
pcm_chunks[1] += 2;
200200
}
201201

202+
if (flags & SND_MOTU_SPEC_HAS_AESEBU_IFACE) {
203+
pcm_chunks[0] += 2;
204+
pcm_chunks[1] += 2;
205+
}
206+
202207
/*
203208
* At least, packets have two data chunks for S/PDIF on coaxial
204209
* interface.

sound/firewire/motu/motu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ enum snd_motu_spec_flags {
7979
SND_MOTU_SPEC_TX_MICINST_CHUNK = 0x0004,
8080
SND_MOTU_SPEC_TX_RETURN_CHUNK = 0x0008,
8181
SND_MOTU_SPEC_TX_REVERB_CHUNK = 0x0010,
82-
SND_MOTU_SPEC_TX_AESEBU_CHUNK = 0x0020,
82+
SND_MOTU_SPEC_HAS_AESEBU_IFACE = 0x0020,
8383
SND_MOTU_SPEC_HAS_OPT_IFACE_A = 0x0040,
8484
SND_MOTU_SPEC_HAS_OPT_IFACE_B = 0x0080,
8585
SND_MOTU_SPEC_RX_MIDI_2ND_Q = 0x0100,

0 commit comments

Comments
 (0)