ucm: rename once_list to boot_list

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/ucm/main.c b/src/ucm/main.c
index 00b417089f134202c1a5b11e928353565165c832..49865df8c70e7497a572321c5caac27260f01fcc 100644 (file)
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -577,7 +577,7 @@ static int check_empty_configuration(snd_use_case_mgr_t *uc_mgr)
 {
        if (!list_empty(&uc_mgr->verb_list))
                return 0;
-       if (!list_empty(&uc_mgr->once_list))
+       if (!list_empty(&uc_mgr->boot_list))
                return 0;
        return -ENXIO;
 }
@@ -976,7 +976,7 @@ int snd_use_case_mgr_open(snd_use_case_mgr_t **uc_mgr,
        if (mgr == NULL)
                return -ENOMEM;
        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->value_list);
        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);
                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);
        if (err < 0) {
-               uc_error("Unable to execute once sequence");
+               uc_error("Unable to execute boot sequence");
                return err;
        }
        return err;

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 8af232d2755e04113be4a1e54760c4bcaad08ab8..75b78826f260a52466bcda6db8c09be46c73695e 100644 (file)
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -1746,11 +1746,11 @@ static int parse_controls_boot(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
 {
        int err;
 
-       if (!list_empty(&uc_mgr->once_list)) {
-               uc_error("Once list is not empty");
+       if (!list_empty(&uc_mgr->boot_list)) {
+               uc_error("Boot list is not empty");
                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) {
                uc_error("Unable to parse BootSequence");
                return err;

diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h
index dd72e3f55f956c5f243025ff6f32a97aa7e67b84..e564e839c064b404e32e747bc38ef78babdcf20f 100644 (file)
--- a/src/ucm/ucm_local.h
+++ b/src/ucm/ucm_local.h
@@ -223,7 +223,7 @@ struct snd_use_case_mgr {
        struct list_head verb_list;
 
        /* boot settings - sequence */
-       struct list_head once_list;
+       struct list_head boot_list;
 
        /* default settings - sequence */
        struct list_head default_list;

diff --git a/src/ucm/utils.c b/src/ucm/utils.c
index fbced51a25431630888c9933fc5222d04058c279..df6fd4dee06536671e7a7d08421e7e08a884fdee 100644 (file)
--- a/src/ucm/utils.c
+++ b/src/ucm/utils.c
@@ -681,7 +681,7 @@ void uc_mgr_free_verb(snd_use_case_mgr_t *uc_mgr)
                list_del(&verb->list);
                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_value(&uc_mgr->value_list);
        uc_mgr_free_value(&uc_mgr->variable_list);