Takashi Iwai
6ab9f38ea9
- Backport upstream fixes: more topology fixes, a memory leak fix in mixer API, alsactl string handling fix, UCM config fixes: 0032-Update-the-attributes.m4-macro-file-from-xine.patch 0033-topology-avoid-to-use-the-atoi-directly-when-expecte.patch 0034-topology-use-snd_config_get_bool-instead-own-impleme.patch 0035-topology-fix-tplg_get_integer-handle-errno-ERANGE.patch 0036-topology-add-tplg_get_unsigned-function.patch 0037-topology-convert-builder-to-use-the-mallocated-memor.patch 0038-topology-add-binary-output-from-the-builder.patch 0039-topology-parser-recode-tplg_parse_config.patch 0040-topology-add-snd_tplg_load-remove-snd_tplg_build_bin.patch 0041-topology-move-the-topology-element-table-from-builde.patch 0042-topology-add-parser-to-the-tplg_table.patch 0043-topology-add-snd_tplg_save.patch 0044-topology-add-snd_tplg_create-with-flags.patch 0045-topology-add-snd_tplg_version-function.patch 0046-topology-cleanup-the-SNDERR-calls.patch 0047-topology-dapm-fix-the-SNDERR-Undefined.patch 0048-topology-fix-the-unitialized-tuples.patch 0049-topology-implement-shorter-hexa-uuid-00-00-parser.patch 0050-topology-fix-the-TPLG_DEBUG-compilation.patch 0051-topology-fix-the-ops-parser-accept-integer-hexa-valu.patch 0052-topology-fix-the-wrong-memory-access-object-realloc.patch 0053-topology-implement-snd_tplg_decode.patch 0054-topology-move-the-elem-list-delete-to-tplg_elem_free.patch 0055-topology-unify-the-log-mechanism.patch 0056-topology-tplg_dbg-cleanups.patch 0057-topology-cosmetic-changes-functions.patch 0058-mixer-Fix-memory-leak-for-more-than-16-file-descript.patch OBS-URL: https://build.opensuse.org/request/show/766329 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=265
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From 1482d1f254fe42d83d904e52c911df8693b62653 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Sun, 29 Dec 2019 20:05:14 +0100
|
|
Subject: [PATCH 50/63] topology: fix the TPLG_DEBUG compilation
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/channel.c | 2 +-
|
|
src/topology/data.c | 5 ++++-
|
|
src/topology/pcm.c | 2 +-
|
|
3 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/topology/channel.c b/src/topology/channel.c
|
|
index 110775a8053d..390c3f164e97 100644
|
|
--- a/src/topology/channel.c
|
|
+++ b/src/topology/channel.c
|
|
@@ -129,7 +129,7 @@ int tplg_parse_channel(snd_tplg_t *tplg, snd_config_t *cfg,
|
|
else if (strcmp(id, "shift") == 0)
|
|
channel->shift = value;
|
|
|
|
- tplg_dbg("\t\t%s = %s\n", id, value);
|
|
+ tplg_dbg("\t\t%s = %d\n", id, value);
|
|
}
|
|
|
|
tplg->channel_idx++;
|
|
diff --git a/src/topology/data.c b/src/topology/data.c
|
|
index 1ddd3c509e64..7b4bdccde602 100644
|
|
--- a/src/topology/data.c
|
|
+++ b/src/topology/data.c
|
|
@@ -230,9 +230,11 @@ err:
|
|
return ret;
|
|
}
|
|
|
|
-static void dump_priv_data(struct tplg_elem *elem)
|
|
+static void dump_priv_data(struct tplg_elem *elem ATTRIBUTE_UNUSED)
|
|
{
|
|
+#ifdef TPLG_DEBUG
|
|
struct snd_soc_tplg_private *priv = elem->data;
|
|
+ unsigned char *p = (unsigned char *)priv->data;
|
|
unsigned int i;
|
|
|
|
tplg_dbg(" elem size = %d, priv data size = %d\n",
|
|
@@ -246,6 +248,7 @@ static void dump_priv_data(struct tplg_elem *elem)
|
|
}
|
|
|
|
tplg_dbg("\n\n");
|
|
+#endif
|
|
}
|
|
|
|
static inline int check_nibble(unsigned char c)
|
|
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
|
|
index bc3070816867..8e5afbe6ea72 100644
|
|
--- a/src/topology/pcm.c
|
|
+++ b/src/topology/pcm.c
|
|
@@ -881,7 +881,7 @@ int tplg_parse_pcm(snd_tplg_t *tplg, snd_config_t *cfg,
|
|
|
|
pcm->compress = ival;
|
|
|
|
- tplg_dbg("\t%s: %s\n", id, val);
|
|
+ tplg_dbg("\t%s: %d\n", id, ival);
|
|
continue;
|
|
}
|
|
|
|
--
|
|
2.16.4
|
|
|