Commit 262542ed authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-tascam: register the size of PCM period to AMDTP domain 



This commit is a preparation to share the size of PCM period between
PCM substreams on AMDTP streams in the same domain. At this time,
the size of PCM period in PCM substream which starts AMDTP streams in the
same domain is recorded.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191007110532.30270-8-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 18b7f18f

sound/firewire/tascam/tascam-pcm.c

+3 −1
Original line number Diff line number Diff line
@@ -99,9 +99,11 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, 


	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		unsigned int rate = params_rate(hw_params);

		unsigned int frames_per_period = params_period_size(hw_params);



		mutex_lock(&tscm->mutex);

		err = snd_tscm_stream_reserve_duplex(tscm, rate);

		err = snd_tscm_stream_reserve_duplex(tscm, rate,

						     frames_per_period);

		if (err >= 0)

			++tscm->substreams_counter;

		mutex_unlock(&tscm->mutex);

sound/firewire/tascam/tascam-stream.c

+10 −1
Original line number Diff line number Diff line
@@ -383,7 +383,8 @@ void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm) 
	destroy_stream(tscm, &tscm->tx_stream);

}



int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate)

int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate,

				   unsigned int frames_per_period)

{

	unsigned int curr_rate;

	int err;
@@ -413,6 +414,14 @@ int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate) 
			fw_iso_resources_free(&tscm->tx_resources);

			return err;

		}



		err = amdtp_domain_set_events_per_period(&tscm->domain,

							frames_per_period);

		if (err < 0) {

			fw_iso_resources_free(&tscm->tx_resources);

			fw_iso_resources_free(&tscm->rx_resources);

			return err;

		}

	}



	return 0;

sound/firewire/tascam/tascam.h

+2 −1
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ int snd_tscm_stream_get_clock(struct snd_tscm *tscm, 
int snd_tscm_stream_init_duplex(struct snd_tscm *tscm);

void snd_tscm_stream_update_duplex(struct snd_tscm *tscm);

void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm);

int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate);

int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate,

				   unsigned int frames_per_period);

int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate);

void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE