- Backport upstream fixes: surround41/50 chmap fix, UCM documents, config string fix, PCM timestamp query API, replacement of list.h with LGPL: 0023-surround41-50.conf-Use-chmap-syntax-for-better-flexi.patch 0024-ucm-docs-fix-doxygen-exclude-patch-for-UCM-local-hea.patch 0025-ucm-docs-Fix-doxygen-formatting-for-UCM-main-page.patch 0026-docs-Add-UCM-link-to-main-doxygen-page.patch 0027-Replace-unsafe-characters-with-_-in-card-name.patch 0028-pcm-add-helper-functions-to-query-timestamping-capab.patch 0029-pcm-add-support-for-get-set_audio_htstamp_config.patch 0030-pcm-add-support-for-new-STATUS_EXT-ioctl.patch 0031-test-fix-audio_time-with-new-get-set-audio_tstamp_co.patch 0032-test-audio_time-show-report-validity-and-accuracy.patch 0033-pcm-restore-hw-params-on-set-latency-failed.patch 0034-Replace-list.h-with-its-own-version.patch - Backport topology API addition patches: 0035-topology-uapi-Add-UAPI-headers-for-topology-ABI.patch 0036-topology-Add-topology-core-parser.patch 0037-topology-Add-text-section-parser.patch 0038-topology-Add-PCM-parser.patch 0039-topology-Add-operations-parser.patch 0040-topology-Add-private-data-parser.patch 0041-topology-Add-DAPM-object-parser.patch 0042-topology-Add-CTL-parser.patch 0043-topology-Add-Channel-map-parser.patch 0044-topology-Add-binary-file-builder.patch 0045-topology-autotools-Add-build-support-for-topology-co.patch 0046-topology-doxygen-Add-doxygen-support-for-topology-co.patch 0047-conf-topology-Add-topology-file-for-broadwell-audio-.patch 0048-topology-Fix-missing-inclusion-of-ctype.h.patch OBS-URL: https://build.opensuse.org/request/show/320429 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=186
421 lines
8.9 KiB
Diff
421 lines
8.9 KiB
Diff
From 5b379da2a0a1084349e918a52f471c03e37af703 Mon Sep 17 00:00:00 2001
|
|
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
|
Date: Wed, 29 Jul 2015 17:45:18 +0100
|
|
Subject: [PATCH 40/49] topology: Add private data parser
|
|
|
|
Parse private data and store for attachment to other objects. Data can come
|
|
file or be locally defined as bytes, shorts or words.
|
|
|
|
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/topology/data.c | 396 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 396 insertions(+)
|
|
create mode 100644 src/topology/data.c
|
|
|
|
diff --git a/src/topology/data.c b/src/topology/data.c
|
|
new file mode 100644
|
|
index 000000000000..ae664721935d
|
|
--- /dev/null
|
|
+++ b/src/topology/data.c
|
|
@@ -0,0 +1,396 @@
|
|
+/*
|
|
+ Copyright(c) 2014-2015 Intel Corporation
|
|
+ All rights reserved.
|
|
+
|
|
+ This program is free software; you can redistribute it and/or modify
|
|
+ it under the terms of version 2 of the GNU General Public License as
|
|
+ published by the Free Software Foundation.
|
|
+
|
|
+ This program is distributed in the hope that it will be useful, but
|
|
+ WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ General Public License for more details.
|
|
+
|
|
+ Authors: Mengdong Lin <mengdong.lin@intel.com>
|
|
+ Yao Jin <yao.jin@intel.com>
|
|
+ Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
|
+*/
|
|
+
|
|
+#include "list.h"
|
|
+#include "tplg_local.h"
|
|
+
|
|
+/* Get Private data from a file. */
|
|
+static int tplg_parse_data_file(snd_config_t *cfg, struct tplg_elem *elem)
|
|
+{
|
|
+ struct snd_soc_tplg_private *priv = NULL;
|
|
+ const char *value = NULL;
|
|
+ char filename[MAX_FILE];
|
|
+ char *env = getenv(ALSA_CONFIG_TPLG_VAR);
|
|
+ FILE *fp;
|
|
+ size_t size, bytes_read;
|
|
+ int ret = 0;
|
|
+
|
|
+ tplg_dbg("data DataFile: %s\n", elem->id);
|
|
+
|
|
+ if (snd_config_get_string(cfg, &value) < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ /* prepend alsa config directory to path */
|
|
+ snprintf(filename, sizeof(filename), "%s/%s",
|
|
+ env ? env : ALSA_TPLG_DIR, value);
|
|
+
|
|
+ fp = fopen(filename, "r");
|
|
+ if (fp == NULL) {
|
|
+ SNDERR("error: invalid data file path '%s'\n",
|
|
+ filename);
|
|
+ ret = -errno;
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
+ fseek(fp, 0L, SEEK_END);
|
|
+ size = ftell(fp);
|
|
+ fseek(fp, 0L, SEEK_SET);
|
|
+ if (size <= 0) {
|
|
+ SNDERR("error: invalid data file size %zu\n", size);
|
|
+ ret = -EINVAL;
|
|
+ goto err;
|
|
+ }
|
|
+ if (size > TPLG_MAX_PRIV_SIZE) {
|
|
+ SNDERR("error: data file too big %zu\n", size);
|
|
+ ret = -EINVAL;
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
+ priv = calloc(1, sizeof(*priv) + size);
|
|
+ if (!priv) {
|
|
+ ret = -ENOMEM;
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
+ bytes_read = fread(&priv->data, 1, size, fp);
|
|
+ if (bytes_read != size) {
|
|
+ ret = -errno;
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
+ elem->data = priv;
|
|
+ priv->size = size;
|
|
+ elem->size = sizeof(*priv) + size;
|
|
+ return 0;
|
|
+
|
|
+err:
|
|
+ if (priv)
|
|
+ free(priv);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static void dump_priv_data(struct tplg_elem *elem)
|
|
+{
|
|
+ struct snd_soc_tplg_private *priv = elem->data;
|
|
+ unsigned char *p = (unsigned char *)priv->data;
|
|
+ unsigned int i, j = 0;
|
|
+
|
|
+ tplg_dbg(" elem size = %d, priv data size = %d\n",
|
|
+ elem->size, priv->size);
|
|
+
|
|
+ for (i = 0; i < priv->size; i++) {
|
|
+ if (j++ % 8 == 0)
|
|
+ tplg_dbg("\n");
|
|
+
|
|
+ tplg_dbg(" 0x%x", *p++);
|
|
+ }
|
|
+
|
|
+ tplg_dbg("\n\n");
|
|
+}
|
|
+
|
|
+/* get number of hex value elements in CSV list */
|
|
+static int get_hex_num(const char *str)
|
|
+{
|
|
+ int commas = 0, values = 0, len = strlen(str);
|
|
+ const char *end = str + len;
|
|
+
|
|
+ /* we expect "0x0, 0x0, 0x0" */
|
|
+ while (str < end) {
|
|
+
|
|
+ /* skip white space */
|
|
+ if (isspace(*str)) {
|
|
+ str++;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ /* find delimeters */
|
|
+ if (*str == ',') {
|
|
+ commas++;
|
|
+ str++;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ /* find 0x[0-9] values */
|
|
+ if (*str == '0' && str + 2 <= end) {
|
|
+ if (str[1] == 'x' && str[2] >= '0' && str[2] <= 'f') {
|
|
+ values++;
|
|
+ str += 3;
|
|
+ } else {
|
|
+ str++;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ str++;
|
|
+ }
|
|
+
|
|
+ /* there should always be one less comma than value */
|
|
+ if (values -1 != commas)
|
|
+ return -EINVAL;
|
|
+
|
|
+ return values;
|
|
+}
|
|
+
|
|
+static int write_hex(char *buf, char *str, int width)
|
|
+{
|
|
+ long val;
|
|
+ void *p = &val;
|
|
+
|
|
+ errno = 0;
|
|
+ val = strtol(str, NULL, 16);
|
|
+
|
|
+ if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
|
|
+ || (errno != 0 && val == 0)) {
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ switch (width) {
|
|
+ case 1:
|
|
+ *(unsigned char *)buf = *(unsigned char *)p;
|
|
+ break;
|
|
+ case 2:
|
|
+ *(unsigned short *)buf = *(unsigned short *)p;
|
|
+ break;
|
|
+ case 4:
|
|
+ *(unsigned int *)buf = *(unsigned int *)p;
|
|
+ break;
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int copy_data_hex(char *data, int off, const char *str, int width)
|
|
+{
|
|
+ char *tmp, *s = NULL, *p = data;
|
|
+ int ret;
|
|
+
|
|
+ tmp = strdup(str);
|
|
+ if (tmp == NULL)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ p += off;
|
|
+ s = strtok(tmp, ",");
|
|
+
|
|
+ while (s != NULL) {
|
|
+ ret = write_hex(p, s, width);
|
|
+ if (ret < 0) {
|
|
+ free(tmp);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ s = strtok(NULL, ",");
|
|
+ p += width;
|
|
+ }
|
|
+
|
|
+ free(tmp);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int tplg_parse_data_hex(snd_config_t *cfg, struct tplg_elem *elem,
|
|
+ int width)
|
|
+{
|
|
+ struct snd_soc_tplg_private *priv;
|
|
+ const char *value = NULL;
|
|
+ int size, esize, off, num;
|
|
+ int ret;
|
|
+
|
|
+ tplg_dbg(" data: %s\n", elem->id);
|
|
+
|
|
+ if (snd_config_get_string(cfg, &value) < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ num = get_hex_num(value);
|
|
+ if (num <= 0) {
|
|
+ SNDERR("error: malformed hex variable list %s\n", value);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ size = num * width;
|
|
+ priv = elem->data;
|
|
+
|
|
+ if (esize > TPLG_MAX_PRIV_SIZE) {
|
|
+ SNDERR("error: data too big %d\n", esize);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ if (priv != NULL) {
|
|
+ off = priv->size;
|
|
+ esize = elem->size + size;
|
|
+ priv = realloc(priv, esize);
|
|
+ } else {
|
|
+ off = 0;
|
|
+ esize = sizeof(*priv) + size;
|
|
+ priv = calloc(1, esize);
|
|
+ }
|
|
+
|
|
+ if (!priv)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ elem->data = priv;
|
|
+ priv->size += size;
|
|
+ elem->size = esize;
|
|
+
|
|
+ ret = copy_data_hex(priv->data, off, value, width);
|
|
+
|
|
+ dump_priv_data(elem);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+
|
|
+/* Parse Private data.
|
|
+ *
|
|
+ * Object private data can either be from file or defined as bytes, shorts,
|
|
+ * words.
|
|
+ */
|
|
+int tplg_parse_data(snd_tplg_t *tplg, snd_config_t *cfg,
|
|
+ void *private ATTRIBUTE_UNUSED)
|
|
+{
|
|
+ snd_config_iterator_t i, next;
|
|
+ snd_config_t *n;
|
|
+ const char *id, *val = NULL;
|
|
+ int err = 0;
|
|
+ struct tplg_elem *elem;
|
|
+
|
|
+ elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_DATA);
|
|
+ if (!elem)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ snd_config_for_each(i, next, cfg) {
|
|
+
|
|
+ n = snd_config_iterator_entry(i);
|
|
+ if (snd_config_get_id(n, &id) < 0) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp(id, "file") == 0) {
|
|
+ err = tplg_parse_data_file(n, elem);
|
|
+ if (err < 0) {
|
|
+ SNDERR("error: failed to parse data file\n");
|
|
+ return err;
|
|
+ }
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp(id, "bytes") == 0) {
|
|
+ err = tplg_parse_data_hex(n, elem, 1);
|
|
+ if (err < 0) {
|
|
+ SNDERR("error: failed to parse data bytes\n");
|
|
+ return err;
|
|
+ }
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp(id, "shorts") == 0) {
|
|
+ err = tplg_parse_data_hex(n, elem, 2);
|
|
+ if (err < 0) {
|
|
+ SNDERR("error: failed to parse data shorts\n");
|
|
+ return err;
|
|
+ }
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp(id, "words") == 0) {
|
|
+ err = tplg_parse_data_hex(n, elem, 4);
|
|
+ if (err < 0) {
|
|
+ SNDERR("error: failed to parse data words\n");
|
|
+ return err;
|
|
+ }
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp(id, "index") == 0) {
|
|
+ if (snd_config_get_string(n, &val) < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ elem->index = atoi(val);
|
|
+ tplg_dbg("\t%s: %d\n", id, elem->index);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp(id, "type") == 0) {
|
|
+ if (snd_config_get_string(n, &val) < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ elem->vendor_type = atoi(val);
|
|
+ tplg_dbg("\t%s: %d\n", id, elem->index);
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return err;
|
|
+}
|
|
+
|
|
+/* copy private data into the bytes extended control */
|
|
+int tplg_copy_data(struct tplg_elem *elem, struct tplg_elem *ref)
|
|
+{
|
|
+ struct snd_soc_tplg_private *priv;
|
|
+ int priv_data_size;
|
|
+
|
|
+ if (!ref)
|
|
+ return -EINVAL;
|
|
+
|
|
+ tplg_dbg("Data '%s' used by '%s'\n", ref->id, elem->id);
|
|
+ priv_data_size = ref->data->size;
|
|
+
|
|
+ switch (elem->type) {
|
|
+ case OBJECT_TYPE_MIXER:
|
|
+ elem->mixer_ctrl = realloc(elem->mixer_ctrl,
|
|
+ elem->size + priv_data_size);
|
|
+ if (!elem->mixer_ctrl)
|
|
+ return -ENOMEM;
|
|
+ priv = &elem->mixer_ctrl->priv;
|
|
+ break;
|
|
+
|
|
+ case OBJECT_TYPE_ENUM:
|
|
+ elem->enum_ctrl = realloc(elem->enum_ctrl,
|
|
+ elem->size + priv_data_size);
|
|
+ if (!elem->enum_ctrl)
|
|
+ return -ENOMEM;
|
|
+ priv = &elem->enum_ctrl->priv;
|
|
+ break;
|
|
+
|
|
+ case OBJECT_TYPE_BYTES:
|
|
+ elem->bytes_ext = realloc(elem->bytes_ext,
|
|
+ elem->size + priv_data_size);
|
|
+ if (!elem->bytes_ext)
|
|
+ return -ENOMEM;
|
|
+ priv = &elem->bytes_ext->priv;
|
|
+ break;
|
|
+
|
|
+
|
|
+ case OBJECT_TYPE_DAPM_WIDGET:
|
|
+ elem->widget = realloc(elem->widget,
|
|
+ elem->size + priv_data_size);
|
|
+ if (!elem->widget)
|
|
+ return -ENOMEM;
|
|
+ priv = &elem->widget->priv;
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ SNDERR("elem '%s': type %d private data not supported \n",
|
|
+ elem->id, elem->type);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ elem->size += priv_data_size;
|
|
+ priv->size = priv_data_size;
|
|
+ ref->compound_elem = 1;
|
|
+ memcpy(priv->data, ref->data->data, priv_data_size);
|
|
+ return 0;
|
|
+}
|
|
--
|
|
2.5.0
|
|
|