diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-06-11 22:21:07 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2019-06-11 16:02:03 +0200 |
| commit | 6bc9322936f240d96b1a76d87a9f308456bf31bf (patch) | |
| tree | d4849fcb30b32cd3001875b03d798f1a057ab548 /sound/firewire | |
| parent | ALSA: usb-audio: Enable .product_name override for Emagic, Unitor 8. (diff) | |
| download | linux-dev-6bc9322936f240d96b1a76d87a9f308456bf31bf.tar.xz linux-dev-6bc9322936f240d96b1a76d87a9f308456bf31bf.zip | |
ALSA: firewire-digi00x: refactoring to move timing of registration for isochronous channel
This commit is a part of preparation to perform allocation/release
of isochronous resources in pcm.hw_params/hw_free callbacks.
The registration of isochronous channels is done just after allocation
of isochronous resources. This commit separates the registration just
before starting packet streaming.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/digi00x/digi00x-stream.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/sound/firewire/digi00x/digi00x-stream.c b/sound/firewire/digi00x/digi00x-stream.c index 4d3b4ebbdd49..455c43e81850 100644 --- a/sound/firewire/digi00x/digi00x-stream.c +++ b/sound/firewire/digi00x/digi00x-stream.c @@ -130,6 +130,12 @@ static void finish_session(struct snd_dg00x *dg00x) snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST, DG00X_ADDR_BASE + DG00X_OFFSET_STREAMING_SET, &data, sizeof(data), 0); + + // Unregister isochronous channels for both direction. + data = 0; + snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST, + DG00X_ADDR_BASE + DG00X_OFFSET_ISOC_CHANNELS, + &data, sizeof(data), 0); } static int begin_session(struct snd_dg00x *dg00x) @@ -138,6 +144,15 @@ static int begin_session(struct snd_dg00x *dg00x) u32 curr; int err; + // Register isochronous channels for both direction. + data = cpu_to_be32((dg00x->tx_resources.channel << 16) | + dg00x->rx_resources.channel); + err = snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST, + DG00X_ADDR_BASE + DG00X_OFFSET_ISOC_CHANNELS, + &data, sizeof(data), 0); + if (err < 0) + goto error; + err = snd_fw_transaction(dg00x->unit, TCODE_READ_QUADLET_REQUEST, DG00X_ADDR_BASE + DG00X_OFFSET_STREAMING_STATE, &data, sizeof(data), 0); @@ -171,13 +186,6 @@ error: static void release_resources(struct snd_dg00x *dg00x) { - __be32 data = 0; - - /* Unregister isochronous channels for both direction. */ - snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST, - DG00X_ADDR_BASE + DG00X_OFFSET_ISOC_CHANNELS, - &data, sizeof(data), 0); - /* Release isochronous resources. */ fw_iso_resources_free(&dg00x->tx_resources); fw_iso_resources_free(&dg00x->rx_resources); @@ -186,7 +194,6 @@ static void release_resources(struct snd_dg00x *dg00x) static int keep_resources(struct snd_dg00x *dg00x, unsigned int rate) { unsigned int i; - __be32 data; int err; /* Check sampling rate. */ @@ -216,22 +223,12 @@ static int keep_resources(struct snd_dg00x *dg00x, unsigned int rate) err = fw_iso_resources_allocate(&dg00x->tx_resources, amdtp_stream_get_max_payload(&dg00x->tx_stream), fw_parent_device(dg00x->unit)->max_speed); - if (err < 0) - goto error; - - /* Register isochronous channels for both direction. */ - data = cpu_to_be32((dg00x->tx_resources.channel << 16) | - dg00x->rx_resources.channel); - err = snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST, - DG00X_ADDR_BASE + DG00X_OFFSET_ISOC_CHANNELS, - &data, sizeof(data), 0); - if (err < 0) - goto error; + if (err < 0) { + fw_iso_resources_free(&dg00x->rx_resources); + return err; + } return 0; -error: - release_resources(dg00x); - return err; } int snd_dg00x_stream_init_duplex(struct snd_dg00x *dg00x) |