ALSA: firewire-tascam: drop reuse of incoming packet parameter for outgoing packet...

In packet streaming protocol applied to TASCAM FireWire series, the value
of SYT field in CIP header is always zero, therefore it has no meaning.
There's no need to synchronize packets in both direction for the series.

In current implementation of ALSA firewire stack, driver for the series
uses incoming packet parameter for outgoing packet parameter to calculate
the number of data blocks. This can be simplified because the task of
corresponding driver is to transfer data blocks enough to sampling transfer
frequency.

This commit purges support of full duplex synchronization to prevent
over-engineering implementation.

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

diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c
index 0e6dd5c61f5388afc39cdaca33bff884ec5ad748..4ad3bd7fd4453e3a64fc4cd95001165510292559 100644 (file)
--- a/sound/firewire/tascam/tascam-stream.c
+++ b/sound/firewire/tascam/tascam-stream.c
@@ -381,19 +381,17 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate)
        if (err < 0)
                return err;
        if (curr_rate != rate ||
-           amdtp_streaming_error(&tscm->tx_stream) ||
-           amdtp_streaming_error(&tscm->rx_stream)) {
+           amdtp_streaming_error(&tscm->rx_stream) ||
+           amdtp_streaming_error(&tscm->tx_stream)) {
                finish_session(tscm);
 
-               amdtp_stream_stop(&tscm->tx_stream);
                amdtp_stream_stop(&tscm->rx_stream);
+               amdtp_stream_stop(&tscm->tx_stream);
 
                release_resources(tscm);
        }
 
-       if (!amdtp_stream_running(&tscm->tx_stream)) {
-               amdtp_stream_set_sync(CIP_SYNC_TO_DEVICE,
-                                     &tscm->tx_stream, &tscm->rx_stream);
+       if (!amdtp_stream_running(&tscm->rx_stream)) {
                err = keep_resources(tscm, rate);
                if (err < 0)
                        goto error;
@@ -406,27 +404,27 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate)
                if (err < 0)
                        goto error;
 
-               err = amdtp_stream_start(&tscm->tx_stream,
-                               tscm->tx_resources.channel,
+               err = amdtp_stream_start(&tscm->rx_stream,
+                               tscm->rx_resources.channel,
                                fw_parent_device(tscm->unit)->max_speed);
                if (err < 0)
                        goto error;
 
-               if (!amdtp_stream_wait_callback(&tscm->tx_stream,
+               if (!amdtp_stream_wait_callback(&tscm->rx_stream,
                                                CALLBACK_TIMEOUT)) {
                        err = -ETIMEDOUT;
                        goto error;
                }
        }
 
-       if (!amdtp_stream_running(&tscm->rx_stream)) {
-               err = amdtp_stream_start(&tscm->rx_stream,
-                               tscm->rx_resources.channel,
+       if (!amdtp_stream_running(&tscm->tx_stream)) {
+               err = amdtp_stream_start(&tscm->tx_stream,
+                               tscm->tx_resources.channel,
                                fw_parent_device(tscm->unit)->max_speed);
                if (err < 0)
                        goto error;
 
-               if (!amdtp_stream_wait_callback(&tscm->rx_stream,
+               if (!amdtp_stream_wait_callback(&tscm->tx_stream,
                                                CALLBACK_TIMEOUT)) {
                        err = -ETIMEDOUT;
                        goto error;
@@ -435,8 +433,8 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate)
 
        return 0;
 error:
-       amdtp_stream_stop(&tscm->tx_stream);
        amdtp_stream_stop(&tscm->rx_stream);
+       amdtp_stream_stop(&tscm->tx_stream);
 
        finish_session(tscm);
        release_resources(tscm);