On Mon, 23 Aug 2010 16:21:45 +0100 Mark Brown broonie@opensource.wolfsonmicro.com wrote:
+int _snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
- const struct snd_soc_dapm_widget *widget,
- int num, const char *name_prefix);
Best not in the header; these are not things individual drivers should be worrying their pretty little heads about. If they should be used by individual drivers then we need better names than just _.
Yeah, I picked up _ prefix so that name indicates that these functions are more like for internal use and drivers should use them only exceptionally. What I'm thinking if we can rid of them completely.
_From your commit 26b01cc it looks like there's a work in progress to support DAI-less codecs/amplifiers. If that would be possible then there is no need to register controls from other drivers in machine DAI init. Well, CPU DAI controls are possible but they don't need a prefix I think.
@@ -539,6 +543,7 @@ struct snd_soc_dai_link { const char *platform_name; /* for multi-platform */ const char *cpu_dai_name; const char *codec_dai_name;
const char *kcontrol_prefix; /* kcontrol prefix for multi-codec */
/* Keep DAI active over suspend */ unsigned int ignore_suspend:1;
I don't see how a DAI link can ever be used to configure prefix names - there's just not any real association between DAI links and controls, and as soon as you hit mixing any that does exist gets lost. Probably a table of CODEC to prefix mappings would be better.
Sorry, I didn't emphasis this well enough that this hack was temporary just after your comment to first version and it got finally removed in yesterday's version :-)
if (codec->kcontrol_prefix && !w->prefixed) {name_len += 1 + strlen(codec->kcontrol_prefix);snprintf(prefix, sizeof(prefix), "%s.",codec->kcontrol_prefix);A space would probably be more idiomatic for the separator.
Ok, makes sense.
+int _snd_soc_dapm_add_routes(struct snd_soc_codec *codec,
const struct snd_soc_dapm_route *route, int num,const char *name_prefix){ int i, ret;
for (i = 0; i < num; i++) {
ret = snd_soc_dapm_add_route(codec, route);
ret = snd_soc_dapm_add_route(codec, route, name_prefix);This one is a bit more fun. For this to work properly we need to consider what happens with the cross-device links in the DAI maps which means we need to able to cope with separate prefixes for the source and the sink.
Prefixing is not problem I think since we can specify them in machine's audio map (like two mono amplifiers registered to 1st codec are prefixed below) but how to link DAPMs of two codec together?
static const struct snd_soc_dapm_route audio_map1[] = { {"Left AMP input", NULL, "LLOUT"}, {"Right AMP input, NULL, "RLOUT"}, {"Speaker", NULL, "Left AMP output"}, {"Speaker, NULL, "Right AMP output"},
{"Codec B Left input"}, NULL, "LLOUT"}, {"Codec B Right input"}, NULL, "RLOUT"}, };
static const struct snd_soc_dapm_route audio_map2[] = { {"foo bar", NULL, "Codec B Left input"}, {"foo bar", NULL, "Codec B Right input"}, };