mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: rename once_list to boot_list

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-10-06 10:47:11 +02:00
parent 61749cf400
commit 2b217b7010
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ucm/main.c
View file

@ -577,7 +577,7 @@ static int check_empty_configuration(snd_use_case_mgr_t *uc_mgr)
{ {
if (!list_empty(&uc_mgr->verb_list)) if (!list_empty(&uc_mgr->verb_list))
return 0; return 0;
if (!list_empty(&uc_mgr->once_list)) if (!list_empty(&uc_mgr->boot_list))
return 0; return 0;
return -ENXIO; return -ENXIO;
} }
@ -976,7 +976,7 @@ int snd_use_case_mgr_open(snd_use_case_mgr_t **uc_mgr,
if (mgr == NULL) if (mgr == NULL)
return -ENOMEM; return -ENOMEM;
INIT_LIST_HEAD(&mgr->verb_list); INIT_LIST_HEAD(&mgr->verb_list);
INIT_LIST_HEAD(&mgr->once_list); INIT_LIST_HEAD(&mgr->boot_list);
INIT_LIST_HEAD(&mgr->default_list); INIT_LIST_HEAD(&mgr->default_list);
INIT_LIST_HEAD(&mgr->value_list); INIT_LIST_HEAD(&mgr->value_list);
INIT_LIST_HEAD(&mgr->active_modifiers); INIT_LIST_HEAD(&mgr->active_modifiers);
@ -1878,10 +1878,10 @@ static int set_boot_user(snd_use_case_mgr_t *uc_mgr,
uc_error("error: wrong value for _boot (%s)", value); uc_error("error: wrong value for _boot (%s)", value);
return -EINVAL; return -EINVAL;
} }
err = execute_sequence(uc_mgr, &uc_mgr->once_list, err = execute_sequence(uc_mgr, &uc_mgr->boot_list,
&uc_mgr->value_list, NULL, NULL); &uc_mgr->value_list, NULL, NULL);
if (err < 0) { if (err < 0) {
uc_error("Unable to execute once sequence"); uc_error("Unable to execute boot sequence");
return err; return err;
} }
return err; return err;

6
src/ucm/parser.c
View file

@ -1746,11 +1746,11 @@ static int parse_controls_boot(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
{ {
int err; int err;
if (!list_empty(&uc_mgr->once_list)) { if (!list_empty(&uc_mgr->boot_list)) {
uc_error("Once list is not empty"); uc_error("Boot list is not empty");
return -EINVAL; return -EINVAL;
} }
err = parse_sequence(uc_mgr, &uc_mgr->once_list, cfg); err = parse_sequence(uc_mgr, &uc_mgr->boot_list, cfg);
if (err < 0) { if (err < 0) {
uc_error("Unable to parse BootSequence"); uc_error("Unable to parse BootSequence");
return err; return err;

2
src/ucm/ucm_local.h
View file

@ -223,7 +223,7 @@ struct snd_use_case_mgr {
struct list_head verb_list; struct list_head verb_list;
/* boot settings - sequence */ /* boot settings - sequence */
struct list_head once_list; struct list_head boot_list;
/* default settings - sequence */ /* default settings - sequence */
struct list_head default_list; struct list_head default_list;

2
src/ucm/utils.c
View file

@ -681,7 +681,7 @@ void uc_mgr_free_verb(snd_use_case_mgr_t *uc_mgr)
list_del(&verb->list); list_del(&verb->list);
free(verb); free(verb);
} }
uc_mgr_free_sequence(&uc_mgr->once_list); uc_mgr_free_sequence(&uc_mgr->boot_list);
uc_mgr_free_sequence(&uc_mgr->default_list); uc_mgr_free_sequence(&uc_mgr->default_list);
uc_mgr_free_value(&uc_mgr->value_list); uc_mgr_free_value(&uc_mgr->value_list);
uc_mgr_free_value(&uc_mgr->variable_list); uc_mgr_free_value(&uc_mgr->variable_list);