Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 167e1fb1 authored by Jorge Sanjuan's avatar Jorge Sanjuan Committed by Takashi Iwai
Browse files

ALSA: usb-audio: Change in connectors control creation interface 



Change build_connector_control() and get_connector_control_name()
so they take `struct usb_mixer_interface` as input argument instead
of `struct mixer_build`.

This is preliminary work to add support for connectors control
for UAC3 BADD devices. No functional change.

Signed-off-by: default avatarJorge Sanjuan <jorge.sanjuan@codethink.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2dd5aa15

sound/usb/mixer.c

+10 −10
Original line number Diff line number Diff line
@@ -1653,11 +1653,11 @@ static void build_feature_ctl_badd(struct usb_mixer_interface *mixer, 
			NULL, NULL, unitid, 0, 0);

}



static void get_connector_control_name(struct mixer_build *state,

static void get_connector_control_name(struct usb_mixer_interface *mixer,

				       struct usb_audio_term *term,

				       bool is_input, char *name, int name_size)

{

	int name_len = get_term_name(state->chip, term, name, name_size, 0);

	int name_len = get_term_name(mixer->chip, term, name, name_size, 0);



	if (name_len == 0)

		strlcpy(name, "Unknown", name_size);
@@ -1674,7 +1674,7 @@ static void get_connector_control_name(struct mixer_build *state, 
}



/* Build a mixer control for a UAC connector control (jack-detect) */

static void build_connector_control(struct mixer_build *state,

static void build_connector_control(struct usb_mixer_interface *mixer,

				    struct usb_audio_term *term, bool is_input)

{

	struct snd_kcontrol *kctl;
@@ -1683,7 +1683,7 @@ static void build_connector_control(struct mixer_build *state, 
	cval = kzalloc(sizeof(*cval), GFP_KERNEL);

	if (!cval)

		return;

	snd_usb_mixer_elem_init_std(&cval->head, state->mixer, term->id);

	snd_usb_mixer_elem_init_std(&cval->head, mixer, term->id);

	/*

	 * UAC2: The first byte from reading the UAC2_TE_CONNECTOR control returns the

	 * number of channels connected.
@@ -1694,7 +1694,7 @@ static void build_connector_control(struct mixer_build *state, 
	 * This boolean ctl will simply report if any channels are connected

	 * or not.

	 */

	if (state->mixer->protocol == UAC_VERSION_2)

	if (mixer->protocol == UAC_VERSION_2)

		cval->control = UAC2_TE_CONNECTOR;

	else /* UAC_VERSION_3 */

		cval->control = UAC3_TE_INSERTION;
@@ -1705,11 +1705,11 @@ static void build_connector_control(struct mixer_build *state, 
	cval->max = 1;

	kctl = snd_ctl_new1(&usb_connector_ctl_ro, cval);

	if (!kctl) {

		usb_audio_err(state->chip, "cannot malloc kcontrol\n");

		usb_audio_err(mixer->chip, "cannot malloc kcontrol\n");

		kfree(cval);

		return;

	}

	get_connector_control_name(state, term, is_input, kctl->id.name,

	get_connector_control_name(mixer, term, is_input, kctl->id.name,

				   sizeof(kctl->id.name));

	kctl->private_free = snd_usb_mixer_elem_free;

	snd_usb_mixer_add_control(&cval->head, kctl);
@@ -2042,7 +2042,7 @@ static int parse_audio_input_terminal(struct mixer_build *state, int unitid, 


	/* Check for jack detection. */

	if (uac_v2v3_control_is_readable(bmctls, control))

		build_connector_control(state, &iterm, true);

		build_connector_control(state->mixer, &iterm, true);



	return 0;

}
@@ -2990,7 +2990,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer) 


			if (uac_v2v3_control_is_readable(le16_to_cpu(desc->bmControls),

							 UAC2_TE_CONNECTOR)) {

				build_connector_control(&state, &state.oterm,

				build_connector_control(state.mixer, &state.oterm,

							false);

			}

		} else {  /* UAC_VERSION_3 */
@@ -3017,7 +3017,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer) 


			if (uac_v2v3_control_is_readable(le32_to_cpu(desc->bmControls),

							 UAC3_TE_INSERTION)) {

				build_connector_control(&state, &state.oterm,

				build_connector_control(state.mixer, &state.oterm,

							false);

			}

		}