Takashi Iwai
0fcb2a0c4b
- Backport upstream fixes: ucm-parser fixes and enhancements, configure script cleanup, fixes of 5.6 kernel ABI, O_CLOEXEC flag fix: 0064-ucm-parser-cosmetic-fixes-in-the-comments.patch 0065-configure.ac-remove-an-unnecessary-libtool-fix.patch 0066-ucm-parser-use-correct-filename-in-parser_master_fil.patch 0067-ucm-the-ucm2-subdirectory-is-driver-name-based.patch 0068-ucm-implement-RenameDevice-and-RemoveDevice-verb-man.patch 0069-ucm-fill-missing-device-entries-conflicting-supporte.patch 0070-control-Remove-access-to-the-deprecated-dimen-fields.patch 0071-topology-Drop-SNDRV_CTL_ELEM_ACCESS_TIMESTAMP-access.patch 0072-uapi-Sync-with-5.6-kernel-ABI.patch 0073-ucm-parser-add-error-message-to-verb_dev_list_add.patch 0074-do-not-set-close-on-exec-flag-on-descriptor-if-it-wa.patch OBS-URL: https://build.opensuse.org/request/show/774837 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=267
136 lines
4.0 KiB
Diff
136 lines
4.0 KiB
Diff
From fdf96312fa3c9261db2954afcde8c6a15d2ebe44 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 7 Feb 2020 16:18:11 +0100
|
|
Subject: [PATCH 69/74] ucm: fill missing device entries (conflicting /
|
|
supported)
|
|
|
|
It is not necessary to maintain this information in sync in the configuration
|
|
files. Fill the missing entries to the complementary devices.
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/ucm/parser.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
src/ucm/ucm_local.h | 1 +
|
|
src/ucm/utils.c | 25 +++++++++++++++++++++++++
|
|
3 files changed, 75 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
|
index f9a8f6283c3a..23bf6a63f31e 100644
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -1112,6 +1112,52 @@ static int parse_modifier_name(snd_use_case_mgr_t *uc_mgr,
|
|
return parse_compound(uc_mgr, cfg, parse_modifier, data1, data2);
|
|
}
|
|
|
|
+static int verb_dev_list_add(struct use_case_verb *verb,
|
|
+ enum dev_list_type dst_type,
|
|
+ const char *dst,
|
|
+ const char *src)
|
|
+{
|
|
+ struct use_case_device *device;
|
|
+ struct list_head *pos;
|
|
+
|
|
+ list_for_each(pos, &verb->device_list) {
|
|
+ device = list_entry(pos, struct use_case_device, list);
|
|
+ if (strcmp(device->name, dst) != 0)
|
|
+ continue;
|
|
+ if (device->dev_list.type != dst_type) {
|
|
+ if (list_empty(&device->dev_list.list)) {
|
|
+ device->dev_list.type = dst_type;
|
|
+ } else {
|
|
+ uc_error("error: incompatible device list type ('%s', '%s')",
|
|
+ device->name, src);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ }
|
|
+ return uc_mgr_put_to_dev_list(&device->dev_list, src);
|
|
+ }
|
|
+ return -ENOENT;
|
|
+}
|
|
+
|
|
+static int verb_dev_list_check(struct use_case_verb *verb)
|
|
+{
|
|
+ struct list_head *pos, *pos2;
|
|
+ struct use_case_device *device;
|
|
+ struct dev_list_node *dlist;
|
|
+ int err;
|
|
+
|
|
+ list_for_each(pos, &verb->device_list) {
|
|
+ device = list_entry(pos, struct use_case_device, list);
|
|
+ list_for_each(pos2, &device->dev_list.list) {
|
|
+ dlist = list_entry(pos2, struct dev_list_node, list);
|
|
+ err = verb_dev_list_add(verb, device->dev_list.type,
|
|
+ dlist->name, device->name);
|
|
+ if (err < 0)
|
|
+ return err;
|
|
+ }
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int verb_device_management(struct use_case_verb *verb)
|
|
{
|
|
struct list_head *pos;
|
|
@@ -1141,7 +1187,9 @@ static int verb_device_management(struct use_case_verb *verb)
|
|
/* those lists are no longer used */
|
|
uc_mgr_free_dev_name_list(&verb->rename_list);
|
|
uc_mgr_free_dev_name_list(&verb->remove_list);
|
|
- return 0;
|
|
+
|
|
+ /* handle conflicting/supported lists */
|
|
+ return verb_dev_list_check(verb);
|
|
}
|
|
|
|
/*
|
|
diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h
|
|
index ba8d2acb3355..acec4bf67e30 100644
|
|
--- a/src/ucm/ucm_local.h
|
|
+++ b/src/ucm/ucm_local.h
|
|
@@ -262,6 +262,7 @@ int uc_mgr_config_load(int format, const char *file, snd_config_t **cfg);
|
|
int uc_mgr_import_master_config(snd_use_case_mgr_t *uc_mgr);
|
|
int uc_mgr_scan_master_configs(const char **_list[]);
|
|
|
|
+int uc_mgr_put_to_dev_list(struct dev_list *dev_list, const char *name);
|
|
int uc_mgr_remove_device(struct use_case_verb *verb, const char *name);
|
|
int uc_mgr_rename_device(struct use_case_verb *verb, const char *src,
|
|
const char *dst);
|
|
diff --git a/src/ucm/utils.c b/src/ucm/utils.c
|
|
index 60a591725835..50b2a1df4a6a 100644
|
|
--- a/src/ucm/utils.c
|
|
+++ b/src/ucm/utils.c
|
|
@@ -328,6 +328,31 @@ void uc_mgr_free_dev_list(struct dev_list *dev_list)
|
|
}
|
|
}
|
|
|
|
+int uc_mgr_put_to_dev_list(struct dev_list *dev_list, const char *name)
|
|
+{
|
|
+ struct list_head *pos;
|
|
+ struct dev_list_node *dlist;
|
|
+ char *n;
|
|
+
|
|
+ list_for_each(pos, &dev_list->list) {
|
|
+ dlist = list_entry(pos, struct dev_list_node, list);
|
|
+ if (strcmp(dlist->name, name) == 0)
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ dlist = calloc(1, sizeof(*dlist));
|
|
+ if (dlist == NULL)
|
|
+ return -ENOMEM;
|
|
+ n = strdup(name);
|
|
+ if (n == NULL) {
|
|
+ free(dlist);
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+ dlist->name = n;
|
|
+ list_add(&dlist->list, &dev_list->list);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int uc_mgr_rename_in_dev_list(struct dev_list *dev_list, const char *src,
|
|
const char *dst)
|
|
{
|
|
--
|
|
2.16.4
|
|
|