Commit 8737209f authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: bebob: 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-3-o-takashi@sakamocchi.jp


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

sound/firewire/bebob/bebob.h

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ int snd_bebob_stream_get_clock_src(struct snd_bebob *bebob, 
				   enum snd_bebob_clock_type *src);

int snd_bebob_stream_discover(struct snd_bebob *bebob);

int snd_bebob_stream_init_duplex(struct snd_bebob *bebob);

int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate);

int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate,

				    unsigned int frames_per_period);

int snd_bebob_stream_start_duplex(struct snd_bebob *bebob);

void snd_bebob_stream_stop_duplex(struct snd_bebob *bebob);

void snd_bebob_stream_destroy_duplex(struct snd_bebob *bebob);

sound/firewire/bebob/bebob_midi.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream) 
		return err;



	mutex_lock(&bebob->mutex);

	err = snd_bebob_stream_reserve_duplex(bebob, 0);

	err = snd_bebob_stream_reserve_duplex(bebob, 0, 0);

	if (err >= 0) {

		++bebob->substreams_counter;

		err = snd_bebob_stream_start_duplex(bebob);

sound/firewire/bebob/bebob_pcm.c

+3 −1
Original line number Diff line number Diff line
@@ -197,9 +197,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(&bebob->mutex);

		err = snd_bebob_stream_reserve_duplex(bebob, rate);

		err = snd_bebob_stream_reserve_duplex(bebob, rate,

						      frames_per_period);

		if (err >= 0)

			++bebob->substreams_counter;

		mutex_unlock(&bebob->mutex);

sound/firewire/bebob/bebob_stream.c

+10 −1
Original line number Diff line number Diff line
@@ -554,7 +554,8 @@ static int keep_resources(struct snd_bebob *bebob, struct amdtp_stream *stream, 
	return cmp_connection_reserve(conn, amdtp_stream_get_max_payload(stream));

}



int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate)

int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate,

				    unsigned int frames_per_period)

{

	unsigned int curr_rate;

	int err;
@@ -607,6 +608,14 @@ int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate) 
			cmp_connection_release(&bebob->out_conn);

			return err;

		}



		err = amdtp_domain_set_events_per_period(&bebob->domain,

							 frames_per_period);

		if (err < 0) {

			cmp_connection_release(&bebob->out_conn);

			cmp_connection_release(&bebob->in_conn);

			return err;

		}

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE