On Mon, 17 Mar 2014 11:29:42 +0200 Jyri Sarha jsarha@ti.com wrote:
On 03/15/2014 01:09 PM, Jean-Francois Moine wrote:
The DAI link array and the properties (fmt, sysclk slots) are hard-coded for a single CPU / CODEC link.
This patch dynamically allocates the DAI link array and the properties with the aim of supporting many DAI links.
Signed-off-by: Jean-Francois Moine moinejf@free.fr
sound/soc/generic/simple-card.c | 49 +++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index ca7e63e..a55dc46 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -20,9 +20,11 @@
struct simple_card_data { struct snd_soc_card snd_card;
- struct asoc_simple_dai cpu_dai;
- struct asoc_simple_dai codec_dai;
- struct snd_soc_dai_link snd_link;
- struct simple_dais {
struct asoc_simple_dai cpu_dai;
struct asoc_simple_dai codec_dai;
- } *dais;
- struct snd_soc_dai_link dai_link[]; /* dynamically allocated */ };
This is only an implementation detail, but wouldn't it produce a cleaner implementation if you would write the above structure like this:
struct simple_card_data { struct snd_soc_card snd_card; struct simple_dai_links { struct snd_soc_dai_link dai_link; struct asoc_simple_dai cpu_dai; struct asoc_simple_dai codec_dai; } *dai_links; };
or even
struct simple_card_data { struct snd_soc_card snd_card; struct simple_dai_links { struct snd_soc_dai_link dai_link; struct asoc_simple_dai cpu_dai; struct asoc_simple_dai codec_dai; } dai_links[]; /* dynamically allocated */ };
But, as said this only an implementation detail.
Jyri,
No, this would not work. The DAI link in the struct snd_soc_card is an array of struct snd_soc_dai_link. There cannot be anything between the elements!