Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.de>, Vinod Koul <vinod.koul@intel.com>,
	Mark Brown <broonie@kernel.org>,
	Liam Girdwood <liam.r.girdwood@linux.intel.com>
Subject: [PATCH v2 10/13] topology: Add Channel map parser.
Date: Wed,  1 Jul 2015 14:44:32 +0100	[thread overview]
Message-ID: <1435758275-4047-10-git-send-email-liam.r.girdwood@linux.intel.com> (raw)
In-Reply-To: <1435758275-4047-1-git-send-email-liam.r.girdwood@linux.intel.com>

Add support for parsing channel map to control registers.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
 src/topology/channel.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 src/topology/channel.c

diff --git a/src/topology/channel.c b/src/topology/channel.c
new file mode 100644
index 0000000..e33c70d
--- /dev/null
+++ b/src/topology/channel.c
@@ -0,0 +1,128 @@
+/*
+  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"
+
+/* mapping of channel text names to types */
+static const struct map_elem channel_map[] = {
+	{"mono", SNDRV_CHMAP_MONO},	/* mono stream */
+	{"fl", SNDRV_CHMAP_FL},		/* front left */
+	{"fr", SNDRV_CHMAP_FR},		/* front right */
+	{"rl", SNDRV_CHMAP_RL},		/* rear left */
+	{"rr", SNDRV_CHMAP_RR},		/* rear right */
+	{"fc", SNDRV_CHMAP_FC},		/* front center */
+	{"lfe", SNDRV_CHMAP_LFE},	/* LFE */
+	{"sl", SNDRV_CHMAP_SL},		/* side left */
+	{"sr", SNDRV_CHMAP_SR},		/* side right */
+	{"rc", SNDRV_CHMAP_RC},		/* rear center */
+	{"flc", SNDRV_CHMAP_FLC},	/* front left center */
+	{"frc", SNDRV_CHMAP_FRC},	/* front right center */
+	{"rlc", SNDRV_CHMAP_RLC},	/* rear left center */
+	{"rrc", SNDRV_CHMAP_RRC},	/* rear right center */
+	{"flw", SNDRV_CHMAP_FLW},	/* front left wide */
+	{"frw", SNDRV_CHMAP_FRW},	/* front right wide */
+	{"flh", SNDRV_CHMAP_FLH},	/* front left high */
+	{"fch", SNDRV_CHMAP_FCH},	/* front center high */
+	{"frh", SNDRV_CHMAP_FRH},	/* front right high */
+	{"tc", SNDRV_CHMAP_TC},		/* top center */
+	{"tfl", SNDRV_CHMAP_TFL},	/* top front left */
+	{"tfr", SNDRV_CHMAP_TFR},	/* top front right */
+	{"tfc", SNDRV_CHMAP_TFC},	/* top front center */
+	{"trl", SNDRV_CHMAP_TRL},	/* top rear left */
+	{"trr", SNDRV_CHMAP_TRR},	/* top rear right */
+	{"trc", SNDRV_CHMAP_TRC},	/* top rear center */
+	{"tflc", SNDRV_CHMAP_TFLC},	/* top front left center */
+	{"tfrc", SNDRV_CHMAP_TFRC},	/* top front right center */
+	{"tsl", SNDRV_CHMAP_TSL},	/* top side left */
+	{"tsr", SNDRV_CHMAP_TSR},	/* top side right */
+	{"llfe", SNDRV_CHMAP_LLFE},	/* left LFE */
+	{"rlfe", SNDRV_CHMAP_RLFE},	/* right LFE */
+	{"bc", SNDRV_CHMAP_BC},		/* bottom center */
+	{"blc", SNDRV_CHMAP_BLC},	/* bottom left center */
+	{"brc", SNDRV_CHMAP_BRC},	/* bottom right center */
+};
+
+
+static int lookup_channel(const char *c)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(channel_map); i++) {
+		if (strcasecmp(channel_map[i].name, c) == 0) {
+			return channel_map[i].id;
+		}
+	}
+
+	return -EINVAL;
+}
+
+/* Parse a channel.
+ *
+ * channel."channel_map.name" {
+ *		reg "0"	(register)
+ *		shift "0" (shift)
+ * }
+ */
+int tplg_parse_channel(snd_tplg_t *tplg,
+	snd_config_t *cfg, void *private)
+{
+	snd_config_iterator_t i, next;
+	snd_config_t *n;
+	struct snd_soc_tplg_channel *channel = private;
+	const char *id, *value;
+
+	if (tplg->channel_idx >= SND_SOC_TPLG_MAX_CHAN)
+		return -EINVAL;
+
+	channel += tplg->channel_idx;
+	snd_config_get_id(cfg, &id);
+	tplg_dbg("\tChannel %s at index %d\n", id, tplg->channel_idx);
+
+	channel->id = lookup_channel(id);
+	if (channel->id < 0) {
+		fprintf(stderr, "error: invalid channel %s\n", id);
+		return -EINVAL;
+	}
+
+	channel->size = sizeof(*channel);
+	tplg_dbg("\tChan %s = %d\n", id, channel->id);
+
+	snd_config_for_each(i, next, cfg) {
+
+		n = snd_config_iterator_entry(i);
+
+		/* get id */
+		if (snd_config_get_id(n, &id) < 0)
+			continue;
+
+		/* get value */
+		if (snd_config_get_string(n, &value) < 0)
+			continue;
+
+		if (strcmp(id, "reg") == 0)
+			channel->reg = atoi(value);
+		else if (strcmp(id, "shift") == 0)
+			channel->shift = atoi(value);
+
+		tplg_dbg("\t\t%s = %s\n", id, value);
+	}
+
+	tplg->channel_idx++;
+	return 0;
+}
-- 
2.1.4

  parent reply	other threads:[~2015-07-01 13:45 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-01 13:44 [PATCH v2 01/13] topology: uapi: Add UAPI headers for topology ABI Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 02/13] conf: topology: Add topology file for broadwell audio DSP Liam Girdwood
2015-07-01 15:47   ` Takashi Iwai
2015-07-01 16:16     ` Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 03/13] topology: Add topology core parser Liam Girdwood
2015-07-01 16:00   ` Takashi Iwai
2015-07-01 13:44 ` [PATCH v2 04/13] topology: Add text section parser Liam Girdwood
2015-07-01 16:03   ` Takashi Iwai
2015-07-01 13:44 ` [PATCH v2 05/13] topology: Add PCM parser Liam Girdwood
2015-07-01 16:14   ` Takashi Iwai
2015-07-01 16:20     ` Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 06/13] topology: Add operations parser Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 07/13] topology: Add private data parser Liam Girdwood
2015-07-01 16:20   ` Takashi Iwai
2015-07-07 15:54     ` Liam Girdwood
2015-07-07 16:19       ` Takashi Iwai
2015-07-08  8:57         ` Liam Girdwood
2015-07-08 13:31           ` Jin, Yao
2015-07-08 14:14             ` Takashi Iwai
2015-07-08 14:21               ` Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 08/13] topology: Add DAPM object parser Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 09/13] topology: Add CTL parser Liam Girdwood
2015-07-01 13:44 ` Liam Girdwood [this message]
2015-07-01 13:44 ` [PATCH v2 11/13] topology: Add binary file builder Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 12/13] topology: autotools: Add build support for topology core Liam Girdwood
2015-07-01 13:44 ` [PATCH v2 13/13] topology: doxygen: Add doxygen " Liam Girdwood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435758275-4047-10-git-send-email-liam.r.girdwood@linux.intel.com \
    --to=liam.r.girdwood@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=tiwai@suse.de \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox