Signed-off-by: Liam Girdwood lrg@slimlogic.co.uk --- src/ucm/ucm_local.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 9f71d42..13e82da 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -115,8 +115,6 @@ struct use_case_device { struct list_head list; struct list_head active_list;

- unsigned int active: 1; - char *name; char *comment;

Signed-off-by: Liam Girdwood lrg@slimlogic.co.uk --- src/ucm/parser.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 7d547f4..f3a75e6 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -633,13 +633,6 @@ static int parse_device_name(snd_use_case_mgr_t *uc_mgr, data1, (void *)id); }

-static int parse_device(snd_use_case_mgr_t *uc_mgr, - struct use_case_verb *verb, - snd_config_t *cfg) -{ - return parse_compound(uc_mgr, cfg, parse_device_name, verb, NULL); -} - static int parse_modifier_name(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg, void *data1, @@ -824,7 +817,8 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,

/* find device sections and parse them */ if (strcmp(id, "SectionDevice") == 0) { - err = parse_device(uc_mgr, verb, n); + err = parse_compound(uc_mgr, n, + parse_device_name, verb, NULL); if (err < 0) { uc_error("error: %s failed to parse device", file);

Signed-off-by: Liam Girdwood lrg@slimlogic.co.uk --- src/ucm/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/ucm/main.c b/src/ucm/main.c index 64e4279..fae89a2 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -587,6 +587,8 @@ int snd_use_case_mgr_open(snd_use_case_mgr_t **mgr, INIT_LIST_HEAD(&uc_mgr->verb_list); INIT_LIST_HEAD(&uc_mgr->default_list); INIT_LIST_HEAD(&uc_mgr->value_list); + INIT_LIST_HEAD(&uc_mgr->active_modifiers); + INIT_LIST_HEAD(&uc_mgr->active_devices); pthread_mutex_init(&uc_mgr->mutex, NULL);

uc_mgr->card_name = strdup(card_name);

Signed-off-by: Liam Girdwood lrg@slimlogic.co.uk --- src/ucm/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/ucm/main.c b/src/ucm/main.c index 403f5c5..3a61679 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -959,6 +959,9 @@ static int get_value1(const char **value, struct list_head *value_list, struct ucm_value *val; struct list_head *pos;

+ if (!value_list) + return -ENOENT; + list_for_each(pos, value_list) { val = list_entry(pos, struct ucm_value, list); if (check_identifier(identifier, val->name)) {

Make sure the supported device of a modifier is enabled before we enable the modifier.

Signed-off-by: Liam Girdwood lrg@slimlogic.co.uk --- src/ucm/main.c | 54 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/ucm/main.c b/src/ucm/main.c index 4c13547..5f44461 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -463,19 +463,52 @@ static inline struct use_case_device * device_name); }

+static int is_modifier_supported(snd_use_case_mgr_t *uc_mgr, + struct use_case_modifier *modifier) +{ + struct dev_list *device; + struct list_head *pos; + + list_for_each(pos, &modifier->dev_list) { + device = list_entry(pos, struct dev_list, list); + if (find(&uc_mgr->active_devices, + struct use_case_device, active_list, name, device->name)) + return 1; + + } + return 0; +} + /** * \brief Find modifier * \param verb Use case verb * \param modifier_name modifier to find * \return structure on success, otherwise a NULL (not found) */ -static inline struct use_case_modifier * - find_modifier(struct use_case_verb *verb, - const char *modifier_name) +static struct use_case_modifier * + find_modifier(snd_use_case_mgr_t *uc_mgr, const char *modifier_name) { - return find(&verb->modifier_list, - struct use_case_modifier, list, name, - modifier_name); + struct use_case_modifier *modifier; + struct use_case_verb *verb = uc_mgr->active_verb; + struct list_head *pos; + char name[64], *cpos; + + list_for_each(pos, &verb->modifier_list) { + modifier = list_entry(pos, struct use_case_modifier, list); + + strncpy(name, modifier->name, sizeof(name)); + cpos = strchr(name, '.'); + if (!cpos) + continue; + *cpos= '\0'; + + if (strcmp(name, modifier_name)) + continue; + + if (is_modifier_supported(uc_mgr, modifier)) + return modifier; + } + return NULL; }

/** @@ -1011,7 +1044,7 @@ static int get_value(snd_use_case_mgr_t *uc_mgr, int err;

if (modifier != NULL) { - mod = find_modifier(uc_mgr->active_verb, modifier); + mod = find_modifier(uc_mgr, modifier); if (mod != NULL) { err = get_value1(value, &mod->value_list, identifier); if (err >= 0 || err != -ENOENT) @@ -1242,7 +1275,8 @@ static int set_modifier_user(snd_use_case_mgr_t *uc_mgr,

if (uc_mgr->active_verb == NULL) return -ENOENT; - modifier = find_modifier(uc_mgr->active_verb, modifier_name); + + modifier = find_modifier(uc_mgr, modifier_name); if (modifier == NULL) return -ENOENT; return set_modifier(uc_mgr, modifier, enable); @@ -1319,10 +1353,10 @@ static int switch_modifier(snd_use_case_mgr_t *uc_mgr, uc_error("error: modifier %s already enabled", new_modifier); return -EINVAL; } - xold = find_modifier(uc_mgr->active_verb, old_modifier); + xold = find_modifier(uc_mgr, old_modifier); if (xold == NULL) return -ENOENT; - xnew = find_modifier(uc_mgr->active_verb, new_modifier); + xnew = find_modifier(uc_mgr, new_modifier); if (xnew == NULL) return -ENOENT; err = 0;

Signed-off-by: Liam Girdwood lrg@slimlogic.co.uk --- src/control/ctlparse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c index c8300f3..a929816 100644 --- a/src/control/ctlparse.c +++ b/src/control/ctlparse.c @@ -208,8 +208,8 @@ int snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str) } str++; } - *ptr = '\0'; } + *ptr = '\0'; snd_ctl_elem_id_set_name(dst, buf); } else if (!strncasecmp(str, "index=", 6)) { str += 6;