ASoC: core: Change SOC_SINGLE/DOUBLE_VALUE representation (30d86ba4) · Commits · 戴 / test

SOC_SINGLE/DOUBLE_VALUE is used for mixer controls, where the bits are within one register. Assign .rreg to be the same as .reg for these types. With this change we can tell if the mixer in question: is mono: mc->reg == mc->rreg && mc->shift == mc->rshift is stereo, within single register: mc->reg == mc->rreg && mc->shift != mc->rshift is stereo, in two registers: mc->reg != mc->rreg The patch provide a small inline function to query, if the mixer is stereo, or mono. Signed-off-by:

Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by:

Mark Brown <broonie@opensource.wolfsonmicro.com>

include/sound/soc.h

+15 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,9 @@
		*/
		#define SOC_DOUBLE_VALUE(xreg, shift_left, shift_right, xmax, xinvert) \
		((unsigned long)&(struct soc_mixer_control) \
		{.reg = xreg, .shift = shift_left, .rshift = shift_right, \
		.max = xmax, .platform_max = xmax, .invert = xinvert})
		{.reg = xreg, .rreg = xreg, .shift = shift_left, \
		.rshift = shift_right, .max = xmax, .platform_max = xmax, \
		.invert = xinvert})
		#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
		SOC_DOUBLE_VALUE(xreg, xshift, xshift, xmax, xinvert)
		#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
		@@ -947,6 +948,18 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
		INIT_LIST_HEAD(&card->dapm_list);
		}

		static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
		{
		if (mc->reg == mc->rreg && mc->shift == mc->rshift)
		return 0;
		/*
		* mc->reg == mc->rreg && mc->shift != mc->rshift, or
		* mc->reg != mc->rreg means that the control is
		* stereo (bits in one register or in two registers)
		*/
		return 1;
		}

		int snd_soc_util_init(void);
		void snd_soc_util_exit(void);

Admin message