Skip to contentSkip to conversation

ALSA: Add snd_ctl_update() to dynamically update a control

PATCH Superseded Dimitris Papastamos 4 participants 8 messages Mar 15, 2011 – Mar 16, 2011

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 ALSA: Add snd_ctl_update() to dynamically update a control

Add a function to dynamically update a given control. If the control does not already exist, a third parameter is used to determine whether to actually add that control. This is useful in cases where downloadable firmware at runtime can add or update existing controls. A separate patch needs to be made to make ALSA Mixer cope with this.

---
 include/sound/control.h |    1 +
 sound/core/control.c    |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 0 deletions(-)
include/sound/control.h +1 -0
index e67db28..12e4de7 100644
@@ -113,6 +113,7 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, v
 void snd_ctl_free_one(struct snd_kcontrol * kcontrol);
 int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol);
 int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);
+int snd_ctl_update(struct snd_card * card, struct snd_kcontrol * kcontrol, int add_on_update);
 int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id);
 int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id);
 int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
sound/core/control.c +46 -0

52 lines not on this page · raw message

Signature · 1 line
1.7.4.1
#1 lore raw

PATCH v2 2/2 ASoC: soc-core: Add helper function to handle dynamic update of controls

This function can be used to update or add controls at runtime. It will always try to add a given control if it does not already exist.

---
 include/sound/soc.h  |    2 ++
 sound/soc/soc-core.c |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)
include/sound/soc.h +2 -0
index bfa4836..509c1ea 100644
@@ -344,6 +344,8 @@ struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
 				  const char *prefix);
 int snd_soc_add_controls(struct snd_soc_codec *codec,
 	const struct snd_kcontrol_new *controls, int num_controls);
+int snd_soc_update_controls(struct snd_soc_codec *codec,
+	const struct snd_kcontrol_new *controls, int num_controls);
 int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_info *uinfo);
 int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,
sound/soc/soc-core.c +33 -0
index 17efacd..815103a 100644
@@ -2420,6 +2420,39 @@ int snd_soc_add_controls(struct snd_soc_codec *codec,
 EXPORT_SYMBOL_GPL(snd_soc_add_controls);
 
 /**
+ * snd_soc_update_controls - update an array of controls
+ * Convienience function to update a list of controls.
+ *
+ * @codec: codec to update controls of
+ * @controls: array of controls to update
+ * @num_controls: number of elements in the array
+ *
+ * Return 0 for success, else error.
+ */
+int snd_soc_update_controls(struct snd_soc_codec *codec,
+	const struct snd_kcontrol_new *controls, int num_controls)
+{
+	struct snd_card *card = codec->card->snd_card;
+	int err, i;
+
+	for (i = 0; i < num_controls; i++) {
+		const struct snd_kcontrol_new *control = &controls[i];
+		/* always add on update if not already added */
+		err = snd_ctl_update(card, snd_soc_cnew(control, codec,
+							control->name,
+							codec->name_prefix), 1);
+		if (err < 0) {
+			dev_err(codec->dev, "%s: Failed to update %s: %d\n",
+				codec->name, control->name, err);
+			return err;
+		}
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_update_controls);
+
+/**
  * snd_soc_info_enum_double - enumerated double mixer info callback
  * @kcontrol: mixer control
  * @uinfo: control element information
Signature · 1 line
1.7.4.1
#2 lore raw
In reply to Dimitris Papastamos
Quoted 7 lines · Dimitris Papastamos

Add a function to dynamically update a given control. If the control does not already exist, a third parameter is used to determine whether to actually add that control. This is useful in cases where downloadable firmware at runtime can add or update existing controls.

+ * Updates the control instance created via snd_ctl_new() or
+ * snd_ctl_new1() of the given card.

This description was copied from snd_ctl_add(), and the "created ..." part isn't really useful here.

It should be mentioned that the old control is destroyed, because some drivers store volatile state in the control's private_data/_value, or keep a pointer to the control('s ID) to be able to call snd_ctl_notify() for it later.

Quoted 2 lines

+ * Returns zero if successful, or a negative error code on failure.
+ *

superfluous empty line

sound/core/control.c int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol) · line 412

Quoted 2 lines
sound/core/control.c +2 -0
+int snd_ctl_update(struct snd_card *card, struct snd_kcontrol *kcontrol,
+		   int add_on_update)

add_on_update should be bool

Review

Quoted 2 lines
(quoted diff) +2 -0
+	up_write(&card->controls_rwsem);
+	ret = snd_ctl_add(card, kcontrol);

Doing this outside the semaphore doesn't look good.

I wonder whether snd_ctl_add() is the right function to use, because it will assign a different numid event if the control didn't change.

Quoted 1 line

A separate patch needs to be made to make ALSA Mixer cope with this.

What happens?

Regards,
Clemens

#3 lore raw

At Tue, 15 Mar 2011 15:17:58 +0100,

Quoted 5 lines · Clemens Ladisch

Review

Quoted 3 lines
(quoted diff) +2 -0
+	up_write(&card->controls_rwsem);
+	ret = snd_ctl_add(card, kcontrol);

Doing this outside the semaphore doesn't look good.

Using an internal function without semaphore would be preferred, yes.

Quoted 2 lines

I wonder whether snd_ctl_add() is the right function to use, because it will assign a different numid event if the control didn't change.

Hm, actually the function can compare whether it's really changed or not. If any change, it makes really sense to assign a different numid.

Takashi

#6 lore raw
In reply to Clemens Ladisch
Quoted 1 line · Clemens Ladisch

Doing this outside the semaphore doesn't look good.

Yes, I was thinking about the same thing, wasn't sure about nesting rw semaphores though.

Quoted 2 lines

I wonder whether snd_ctl_add() is the right function to use, because it will assign a different numid event if the control didn't change.

Hm, indeed. I can probably inline a slightly different version of snd_ctl_add()?

Quoted 3 lines
Quoted 1 line

A separate patch needs to be made to make ALSA Mixer cope with this.

What happens?

It doesn't break or anything hopefully. It will probably need support for handling the update of the controls (without exiting and starting it again). I've only tested it against alsa-utils 1.0.20 and it worked fine with a few changes (updating the controls on the fly).

Thanks,
Dimitris

#4 lore raw
In reply to Takashi Iwai

2011/3/15 Takashi Iwai <[email protected]>

Quoted 8 lines

At Tue, 15 Mar 2011 15:17:58 +0100,

Quoted 5 lines · Clemens Ladisch

Review

Quoted 3 lines
(quoted diff) +2 -0
+   up_write(&card->controls_rwsem);
+   ret = snd_ctl_add(card, kcontrol);

Doing this outside the semaphore doesn't look good.

Quoted 11 lines

Using an internal function without semaphore would be preferred, yes.

Quoted 2 lines

I wonder whether snd_ctl_add() is the right function to use, because it will assign a different numid event if the control didn't change.

Hm, actually the function can compare whether it's really changed or not. If any change, it makes really sense to assign a different numid.

does it mean that the driver can update "Input Source" controls for those HDA codec on a motherboard with 3 audio jacks at rear panel ?

i.e. remove/add "Rear Mic" and "Line in" from/to "Input Source" when user switch "channel_mode" between 2 and 6 or switch"smart51" on/off

#5 lore raw

At Wed, 16 Mar 2011 08:56:36 +0800,

Quoted 23 lines · Raymond Yau

2011/3/15 Takashi Iwai <[email protected]>

Quoted 8 lines

At Tue, 15 Mar 2011 15:17:58 +0100,

Quoted 5 lines · Clemens Ladisch

Review

Quoted 3 lines
(quoted diff) +2 -0
+   up_write(&card->controls_rwsem);
+   ret = snd_ctl_add(card, kcontrol);

Doing this outside the semaphore doesn't look good.

Quoted 11 lines

Using an internal function without semaphore would be preferred, yes.

Quoted 2 lines

I wonder whether snd_ctl_add() is the right function to use, because it will assign a different numid event if the control didn't change.

Hm, actually the function can compare whether it's really changed or not. If any change, it makes really sense to assign a different numid.

Quoted 5 lines

does it mean that the driver can update "Input Source" controls for those HDA codec on a motherboard with 3 audio jacks at rear panel ?

i.e. remove/add "Rear Mic" and "Line in" from/to "Input Source" when user switch "channel_mode" between 2 and 6 or switch"smart51" on/off

In theory, yes. But, practically, I'm afraid that this is rather confusing for normal desktop apps. Most of mixer apps aren't written robustly for handling the dynamically changed control elements.

Takashi

#7 lore raw
In reply to Dimitris Papastamos

2011/3/16 Dimitris Papastamos <[email protected]>

Quoted 13 lines · Clemens Ladisch
Quoted 5 lines
Quoted 3 lines

A separate patch needs to be made to make ALSA Mixer cope with this.

What happens?

It doesn't break or anything hopefully. It will probably need support for handling the update of the controls (without exiting and starting it again). I've only tested it against alsa-utils 1.0.20 and it worked fine with a few changes (updating the controls on the fly).

It depend on how the driver update control, since snd_mixer_selem just combine "volume" and "switch" controls of same name into a single selem

if the driver just change the name of volume control, I guess alsamixer still need to reload the mixer