Commit 4c9eda8f authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-motu: queue event for parameter change in register DSP model 



This commit is a preparation to notify parameter change of register DSP
to userspace application. A simple queue is added to store encoded data
for the change as long as ALSA hwdep character device is opened by
application.

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


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

sound/firewire/motu/motu-hwdep.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -258,5 +258,7 @@ int snd_motu_create_hwdep_device(struct snd_motu *motu) 
	hwdep->private_data = motu;

	hwdep->private_data = motu;

	hwdep->exclusive = true;

	hwdep->exclusive = true;





	motu->hwdep = hwdep;



	return 0;

	return 0;

}
 
}

sound/firewire/motu/motu-register-dsp-message-parser.c

+79 −14
Original line number Original line Diff line number Diff line
@@ -78,6 +78,8 @@ enum register_dsp_msg_type { 
	METER = 0x1f,

	METER = 0x1f,

};

};





#define EVENT_QUEUE_SIZE	16



struct msg_parser {

struct msg_parser {

	spinlock_t lock;

	spinlock_t lock;

	struct snd_firewire_motu_register_dsp_meter meter;

	struct snd_firewire_motu_register_dsp_meter meter;
@@ -90,6 +92,9 @@ struct msg_parser { 




	u8 input_ch;

	u8 input_ch;

	u8 prev_msg_type;

	u8 prev_msg_type;



	u32 event_queue[EVENT_QUEUE_SIZE];

	unsigned int push_pos;

};

};





int snd_motu_register_dsp_message_parser_new(struct snd_motu *motu)

int snd_motu_register_dsp_message_parser_new(struct snd_motu *motu)
@@ -117,6 +122,24 @@ int snd_motu_register_dsp_message_parser_init(struct snd_motu *motu) 
	return 0;

	return 0;

}

}





static void queue_event(struct snd_motu *motu, u8 msg_type, u8 identifier0, u8 identifier1, u8 val)

{

	struct msg_parser *parser = motu->message_parser;

	unsigned int pos = parser->push_pos;

	u32 entry;



	if (!motu->hwdep || motu->hwdep->used == 0)

		return;



	entry = (msg_type << 24) | (identifier0 << 16) | (identifier1 << 8) | val;

	parser->event_queue[pos] = entry;



	++pos;

	if (pos >= EVENT_QUEUE_SIZE)

		pos = 0;

	parser->push_pos = pos;

}



void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const struct pkt_desc *descs,

void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const struct pkt_desc *descs,

					unsigned int desc_count, unsigned int data_block_quadlets)

					unsigned int desc_count, unsigned int data_block_quadlets)

{

{
@@ -172,19 +195,34 @@ void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const str 




					switch (msg_type) {

					switch (msg_type) {

					case MIXER_SRC_GAIN:

					case MIXER_SRC_GAIN:

						if (param->mixer.source[mixer_ch].gain[mixer_src_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);

							param->mixer.source[mixer_ch].gain[mixer_src_ch] = val;

							param->mixer.source[mixer_ch].gain[mixer_src_ch] = val;

						}

						break;

						break;

					case MIXER_SRC_PAN:

					case MIXER_SRC_PAN:

						if (param->mixer.source[mixer_ch].pan[mixer_src_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);

							param->mixer.source[mixer_ch].pan[mixer_src_ch] = val;

							param->mixer.source[mixer_ch].pan[mixer_src_ch] = val;

						}

						break;

						break;

					case MIXER_SRC_FLAG:

					case MIXER_SRC_FLAG:

						if (param->mixer.source[mixer_ch].flag[mixer_src_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);

							param->mixer.source[mixer_ch].flag[mixer_src_ch] = val;

							param->mixer.source[mixer_ch].flag[mixer_src_ch] = val;

						}

						break;

						break;

					case MIXER_SRC_PAIRED_BALANCE:

					case MIXER_SRC_PAIRED_BALANCE:

						if (param->mixer.source[mixer_ch].paired_balance[mixer_src_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);

							param->mixer.source[mixer_ch].paired_balance[mixer_src_ch] = val;

							param->mixer.source[mixer_ch].paired_balance[mixer_src_ch] = val;

						}

						break;

						break;

					case MIXER_SRC_PAIRED_WIDTH:

					case MIXER_SRC_PAIRED_WIDTH:

						if (param->mixer.source[mixer_ch].paired_width[mixer_src_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);

							param->mixer.source[mixer_ch].paired_width[mixer_src_ch] = val;

							param->mixer.source[mixer_ch].paired_width[mixer_src_ch] = val;

						}

						break;

						break;

					default:

					default:

						break;

						break;
@@ -203,10 +241,16 @@ void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const str 
				if (mixer_ch < SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT) {

				if (mixer_ch < SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT) {

					switch (msg_type) {

					switch (msg_type) {

					case MIXER_OUTPUT_PAIRED_VOLUME:

					case MIXER_OUTPUT_PAIRED_VOLUME:

						if (param->mixer.output.paired_volume[mixer_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, 0, val);

							param->mixer.output.paired_volume[mixer_ch] = val;

							param->mixer.output.paired_volume[mixer_ch] = val;

						}

						break;

						break;

					case MIXER_OUTPUT_PAIRED_FLAG:

					case MIXER_OUTPUT_PAIRED_FLAG:

						if (param->mixer.output.paired_flag[mixer_ch] != val) {

							queue_event(motu, msg_type, mixer_ch, 0, val);

							param->mixer.output.paired_flag[mixer_ch] = val;

							param->mixer.output.paired_flag[mixer_ch] = val;

						}

						break;

						break;

					default:

					default:

						break;

						break;
@@ -215,19 +259,34 @@ void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const str 
				break;

				break;

			}

			}

			case MAIN_OUTPUT_PAIRED_VOLUME:

			case MAIN_OUTPUT_PAIRED_VOLUME:

				if (parser->param.output.main_paired_volume != val) {

					queue_event(motu, msg_type, 0, 0, val);

					parser->param.output.main_paired_volume = val;

					parser->param.output.main_paired_volume = val;

				}

				break;

				break;

			case HP_OUTPUT_PAIRED_VOLUME:

			case HP_OUTPUT_PAIRED_VOLUME:

				if (parser->param.output.hp_paired_volume != val) {

					queue_event(motu, msg_type, 0, 0, val);

					parser->param.output.hp_paired_volume = val;

					parser->param.output.hp_paired_volume = val;

				}

				break;

				break;

			case HP_OUTPUT_PAIRED_ASSIGNMENT:

			case HP_OUTPUT_PAIRED_ASSIGNMENT:

				if (parser->param.output.hp_paired_assignment != val) {

					queue_event(motu, msg_type, 0, 0, val);

					parser->param.output.hp_paired_assignment = val;

					parser->param.output.hp_paired_assignment = val;

				}

				break;

				break;

			case LINE_INPUT_BOOST:

			case LINE_INPUT_BOOST:

				if (parser->param.line_input.boost_flag != val) {

					queue_event(motu, msg_type, 0, 0, val);

					parser->param.line_input.boost_flag = val;

					parser->param.line_input.boost_flag = val;

				}

				break;

				break;

			case LINE_INPUT_NOMINAL_LEVEL:

			case LINE_INPUT_NOMINAL_LEVEL:

				if (parser->param.line_input.nominal_level_flag != val) {

					queue_event(motu, msg_type, 0, 0, val);

					parser->param.line_input.nominal_level_flag = val;

					parser->param.line_input.nominal_level_flag = val;

				}

				break;

				break;

			case INPUT_GAIN_AND_INVERT:

			case INPUT_GAIN_AND_INVERT:

			case INPUT_FLAG:

			case INPUT_FLAG:
@@ -243,10 +302,16 @@ void snd_motu_register_dsp_message_parser_parse(struct snd_motu *motu, const str 
				if (input_ch < SNDRV_FIREWIRE_MOTU_REGISTER_DSP_INPUT_COUNT) {

				if (input_ch < SNDRV_FIREWIRE_MOTU_REGISTER_DSP_INPUT_COUNT) {

					switch (msg_type) {

					switch (msg_type) {

					case INPUT_GAIN_AND_INVERT:

					case INPUT_GAIN_AND_INVERT:

						if (param->input.gain_and_invert[input_ch] != val) {

							queue_event(motu, msg_type, input_ch, 0, val);

							param->input.gain_and_invert[input_ch] = val;

							param->input.gain_and_invert[input_ch] = val;

						}

						break;

						break;

					case INPUT_FLAG:

					case INPUT_FLAG:

						if (param->input.flag[input_ch] != val) {

							queue_event(motu, msg_type, input_ch, 0, val);

							param->input.flag[input_ch] = val;

							param->input.flag[input_ch] = val;

						}

						break;

						break;

					default:

					default:

						break;

						break;

sound/firewire/motu/motu.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,7 @@ struct snd_motu { 
	int dev_lock_count;

	int dev_lock_count;

	bool dev_lock_changed;

	bool dev_lock_changed;

	wait_queue_head_t hwdep_wait;

	wait_queue_head_t hwdep_wait;

	struct snd_hwdep *hwdep;





	struct amdtp_domain domain;

	struct amdtp_domain domain;