ALSA: firewire-motu: use table-based calculation of packet formats for stream management

This commit uses table-based calculation of packet formats for stream
management.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200519111641.123211-11-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/motu/amdtp-motu.c b/sound/firewire/motu/amdtp-motu.c
index 17c9ea8eb4c8eebc73b2fe6b1a2d8ceb1e4f3c92..edb31ac2686826051be5263295b5813969093efa 100644 (file)
--- a/sound/firewire/motu/amdtp-motu.c
+++ b/sound/firewire/motu/amdtp-motu.c
@@ -76,15 +76,11 @@ int amdtp_motu_set_parameters(struct amdtp_stream *s, unsigned int rate,
        if (i == ARRAY_SIZE(snd_motu_clock_rates))
                return -EINVAL;
 
-       pcm_chunks = formats->fixed_part_pcm_chunks[mode] +
-                    formats->differed_part_pcm_chunks[mode];
+       // Each data block includes SPH in its head. Data chunks follow with
+       // 3 byte alignment. Padding follows with zero to conform to quadlet
+       // alignment.
+       pcm_chunks = formats->pcm_chunks[mode];
        data_chunks = formats->msg_chunks + pcm_chunks;
-
-       /*
-        * Each data block includes SPH in its head. Data chunks follow with
-        * 3 byte alignment. Padding follows with zero to conform to quadlet
-        * alignment.
-        */
        data_block_quadlets = 1 + DIV_ROUND_UP(data_chunks * 3, 4);
 
        err = amdtp_stream_set_parameters(s, rate, data_block_quadlets);

diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 87a8d9016f8331b8e18effc9412652246036b889..2028c5419f6ffb546e5f0792fc9acdf46066db24 100644 (file)
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -201,9 +201,9 @@ static int ensure_packet_formats(struct snd_motu *motu)
        data &= ~(TX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS |
                  RX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS|
                  TX_PACKET_TRANSMISSION_SPEED_MASK);
-       if (motu->tx_packet_formats.differed_part_pcm_chunks[0] == 0)
+       if (motu->spec->tx_fixed_pcm_chunks[0] == motu->tx_packet_formats.pcm_chunks[0])
                data |= TX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS;
-       if (motu->rx_packet_formats.differed_part_pcm_chunks[0] == 0)
+       if (motu->spec->rx_fixed_pcm_chunks[0] == motu->rx_packet_formats.pcm_chunks[0])
                data |= RX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS;
        data |= fw_parent_device(motu->unit)->max_speed;