diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2024-02-18 16:41:27 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-19 09:24:35 +0100 |
| commit | 4a486439d2ca85752c46711f373b6ddc107bb35d (patch) | |
| tree | 72f527625d7ab1371cc035401fc2df4100d5df33 /sound/firewire/amdtp-stream.c | |
| parent | 25ab2b2f6ac209a3746eec42210a98fe047a7453 (diff) | |
| download | linux-4a486439d2ca85752c46711f373b6ddc107bb35d.tar.gz linux-4a486439d2ca85752c46711f373b6ddc107bb35d.tar.bz2 linux-4a486439d2ca85752c46711f373b6ddc107bb35d.zip | |
ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter
Miglia Harmony Audio (OXFW970) has a quirk to put the number of
accumulated quadlets in CIP payload into the dbc field of CIP header.
This commit handles the quirk in the packet processing layer.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20240218074128.95210-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp-stream.c')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index a13c0b408aad..9d5a025d2e96 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -773,10 +773,14 @@ static int check_cip_header(struct amdtp_stream *s, const __be32 *buf, } else { unsigned int dbc_interval; - if (*data_blocks > 0 && s->ctx_data.tx.dbc_interval > 0) - dbc_interval = s->ctx_data.tx.dbc_interval; - else - dbc_interval = *data_blocks; + if (!(s->flags & CIP_DBC_IS_PAYLOAD_QUADLETS)) { + if (*data_blocks > 0 && s->ctx_data.tx.dbc_interval > 0) + dbc_interval = s->ctx_data.tx.dbc_interval; + else + dbc_interval = *data_blocks; + } else { + dbc_interval = payload_length / sizeof(__be32); + } lost = dbc != ((*data_block_counter + dbc_interval) & 0xff); } |