alsa-lib topology support
v3 cover alsa-lib topology support
This series adds support for parsing topology data text files and converting to the binary topology format accepted by the kernel.
Changes since V2 :-
o Added documentation in doxygen format describing API and text file format.
o use SNDERR macro for error reporting.
o Added text copy helper.
o Make all parsed keywords lowercase
o Assignment for some structure copies instead of memcpy().
o Fixed the private data parser to handle byte, short and word data.
Changes since V1 :-
o Terminate all strncpy() strings with NULL.
o Use snd_pcm_format_value() instead of local lookup.
o Set a maximum size for private data files.
o Set capture/playback stream direction for new PCMs
o Only set TLV access flags for TLV CTLs.
Liam Girdwood (13):
topology: uapi: Add UAPI headers for topology ABI
topology: Add topology core parser.
topology: Add text section parser.
topology: Add PCM parser.
topology: Add operations parser
topology: Add private data parser
topology: Add DAPM object parser
topology: Add CTL parser
topology: Add Channel map parser.
topology: Add binary file builder.
topology: autotools: Add build support for topology core
topology: doxygen: Add doxygen support for topology core.
conf: topology: Add topology file for broadwell audio DSP
configure.ac | 11 +- doc/doxygen.cfg.in | 7 +- doc/index.doxygen | 1 + include/Makefile.am | 4 + include/sound/Makefile.am | 3 +- include/sound/asoc.h | 388 ++++++++++++++++++ include/sound/tlv.h | 23 ++ include/topology.h | 497 ++++++++++++++++++++++ src/Makefile.am | 7 + src/conf/Makefile.am | 2 +- src/conf/topology/Makefile.am | 1 + src/conf/topology/broadwell/Makefile.am | 4 + src/conf/topology/broadwell/broadwell.conf | 375 +++++++++++++++++ src/topology/Makefile.am | 19 + src/topology/builder.c | 327 +++++++++++++++ src/topology/channel.c | 122 ++++++ src/topology/ctl.c | 613 +++++++++++++++++++++++++++ src/topology/dapm.c | 562 +++++++++++++++++++++++++ src/topology/data.c | 396 ++++++++++++++++++ src/topology/elem.c | 187 +++++++++ src/topology/ops.c | 84 ++++ src/topology/parser.c | 359 ++++++++++++++++ src/topology/pcm.c | 639 +++++++++++++++++++++++++++++ src/topology/text.c | 88 ++++ src/topology/tplg_local.h | 234 +++++++++++ 25 files changed, 4948 insertions(+), 5 deletions(-) create mode 100644 include/sound/asoc.h create mode 100644 include/sound/tlv.h create mode 100644 include/topology.h create mode 100644 src/conf/topology/Makefile.am create mode 100644 src/conf/topology/broadwell/Makefile.am create mode 100644 src/conf/topology/broadwell/broadwell.conf create mode 100644 src/topology/Makefile.am create mode 100644 src/topology/builder.c create mode 100644 src/topology/channel.c create mode 100644 src/topology/ctl.c create mode 100644 src/topology/dapm.c create mode 100644 src/topology/data.c create mode 100644 src/topology/elem.c create mode 100644 src/topology/ops.c create mode 100644 src/topology/parser.c create mode 100644 src/topology/pcm.c create mode 100644 src/topology/text.c create mode 100644 src/topology/tplg_local.h
Signature · 1 line
2.1.4
PATCH v3 1/13 topology: uapi: Add UAPI headers for topology ABI
--- include/sound/Makefile.am | 3 +- include/sound/asoc.h | 388 ++++++++++++++++++++++++++++++++++++++++++++++ include/sound/tlv.h | 23 +++ 3 files changed, 413 insertions(+), 1 deletion(-) create mode 100644 include/sound/asoc.h create mode 100644 include/sound/tlv.h
include/sound/Makefile.am +2 -1
@@ -1,6 +1,7 @@ alsasoundincludedir = ${includedir}/alsa/sound alsasoundinclude_HEADERS = asound_fm.h hdsp.h hdspm.h sb16_csp.h \ - sscape_ioctl.h emu10k1.h type_compat.h + sscape_ioctl.h emu10k1.h type_compat.h \ + asoc.h tlv.h noinst_HEADERS = asound.h asoundef.h asequencer.h
include/sound/asoc.h new file +388 -0
388 lines not on this page · raw message
include/sound/tlv.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* 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. +*/ + +#ifndef __UAPI_SOUND_TLV_H +#define __UAPI_SOUND_TLV_H + +#define SNDRV_CTL_TLVT_CONTAINER 0/* one level down - group of TLVs */ +#define SNDRV_CTL_TLVT_DB_SCALE 1/* dB scale */ +#define SNDRV_CTL_TLVT_DB_LINEAR 2/* linear volume */ +#define SNDRV_CTL_TLVT_DB_RANGE 3/* dB range container */ +#define SNDRV_CTL_TLVT_DB_MINMAX 4/* dB scale with min/max */ +#define SNDRV_CTL_TLVT_DB_MINMAX_MUTE 5/* dB scale with min/max with mute */ + +#endif
Signature · 1 line
2.1.4
PATCH v3 2/13 topology: Add topology core parser.
In reply to Liam GirdwoodThe topology core parses the high level topology file and calls the individual object parsers when any new object element is detected at the high level.
--- include/topology.h | 497 ++++++++++++++++++++++++++++++++++++++++++++++ src/topology/elem.c | 187 +++++++++++++++++ src/topology/parser.c | 359 +++++++++++++++++++++++++++++++++ src/topology/tplg_local.h | 234 ++++++++++++++++++++++ 4 files changed, 1277 insertions(+) create mode 100644 include/topology.h create mode 100644 src/topology/elem.c create mode 100644 src/topology/parser.c create mode 100644 src/topology/tplg_local.h
include/topology.h new file +497 -0
@@ -0,0 +1,497 @@ +/* +* +* This library is free software; you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* 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 Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +* +* Copyright (C) 2015 Intel Corporation +* +*/ + +#ifndef __ALSA_TOPOLOGY_H +#define __ALSA_TOPOLOGY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** +* \defgroup topology Topology Interface +* \{ +*/ + +/*! \page topology ALSA Topology Interface +* +* The topology interface allows developers to define DSP topologies in a text +* file format and to convert the text topology to a binary topology +* representation that can be understood by the kernel. The topology core +* currently recognises the following object types :- +* +* * Controls (mixer, enumerated and byte) including TLV data. +* * PCMs (FE and BE configurations and capabilities) +* * DAPM widgets +* * DAPM graph elements. +* * Private data for each object type. +* * Manifest (containing count of each object type) +* +* <h3>Topology File Format</h3> +* +* The topology text format uses the standard ALSA configuration file format to +* describe each topology object type. This allows topology objects to include +* other topology objects as part of thier definition. i.e. a TLV data object +* can be shared amongst many control objects that use the same TLV data. +* +* +* <h4>Controls</h4> +* Topology audio controls can belong to three different types :- +* * Mixer control +* * Enumerated control +* * Byte control +* +* Each control type can contain TLV data, private data, operations and also +* belong to widget objects.<br> +* +* <h5>Control Operations</h5> +* Driver Kcontrol callback info(), get() and put() operations are mapped with +* the CTL ops section in topology configuration files. The ctl ops section can +* assign operations using the standard names (listed below) for the standard +* kcontrol types or use ID numbers (>256) to map to bespoke driver controls.<br> +* +* <pre> +* +* ops."ctl" { +* info "volsw" +* get "257" +* put "257" +* } +* +* </pre> +* +* This mapping shows info() using the standard "volsw" info callback whilst +* the get() and put() are mapped to bespoke driver callbacks. <br> +* +* The Standard operations names for control get(), put() and info calls +* are :- +* * volsw +* * volsw_sx +* * volsw_xr_sx +* * enum +* * bytes +* * enum_value +* * range +* * strobe +* +* <h5>Control TLV Data</h5> +* Controls can also use TLV data to represent dB information. This can be done +* by defining a TLV section and using the TLV section within the control. +* The TLV data for DBScale types are defined as follows :- +* +* <pre> +* scale { +* min "-9000" +* step "300" +* mute "1" +* } +* </pre> +* +* Where the meanings and values for min, step and mute are exactly the same +* as defined in driver code. +* +* <h5>Control Channel Mapping</h5> +* Controls can also specify which channels they are mapped with. This is useful +* for userspace as it allows applications to determine the correct control +* channel for Left and Right etc. Channel maps are defined as follows :- +* +* <pre> +* channel."name" { +* reg "0" +* shift "0" +* } +* </pre> +* +* The channel map reg is the register offset for the control, shift is the +* bit shift within the register for the channel and the section name is the +* channel name and can be one of the following :- +* +* <pre> +* * mono # mono stream +* * fl # front left +* * fr # front right +* * rl # rear left +* * rr # rear right +* * fc # front center +* * lfe # LFE +* * sl # side left +* * sr # side right +* * rc # rear center +* * flc # front left center +* * frc # front right center +* * rlc # rear left center +* * rrc # rear right center +* * flw # front left wide +* * frw # front right wide +* * flh # front left high +* * fch # front center high +* * frh # front right high +* * tc # top center +* * tfl # top front left +* * tfr # top front right +* * tfc # top front center +* * trl # top rear left +* * trr # top rear right +* * trc # top rear center +* * tflc # top front left center +* * tfrc # top front right center +* * tsl # top side left +* * tsr # top side right +* * llfe # left LFE +* * rlfe # right LFE +* * bc # bottom center +* * blc # bottom left center +* * brc # bottom right center +* </pre> +* +* <h5>Control Private Data</h5> +* Controls can also have private data. This can be done by defining a private +* data section and including the section within the control. The private data +* section is defined as follows :- +* +* <pre> +* SectionData."pdata for EQU1" { +* file "/path/to/file" +* bytes "0x12,0x34,0x56,0x78" +* shorts "0x1122,0x3344,0x5566,0x7788" +* words "0xaabbccdd,0x11223344,0x66aa77bb,0xefef1234" +* }; +* </pre> +* The file, bytes, shorts and words keywords are all mutulally exclusive as +* the private data should only be taken from one source. The private data can +* either be read from a separate file or defined in the topology file using +* the bytes, shorts or words keywords. +* +* <h5>Mixer Controls</h5> +* A mixer control is defined as a new section that can include channel mapping, +* TLV data, callback operations and private data. The mixer section also +* includes a few other config options that are shown here :- +* +* <pre> +* SectionControlMixer."mixer name" { +* comment "optional comments" +* +* index "1" # Index number +* +* channel."name" { # Channel maps +* .... +* } +* +* ops."ctl" { # Ops callback functions +* .... +* } +* +* max "32" # Max control value +* invert "0" # Whether control values are inverted +* +* tlv "tld_data" # optional TLV data +* +* data "pdata for mixer1" # optional private data +* } +* </pre> +* +* The section name is used to define the mixer name. The index number can be +* used to identify topology objects groups. This allows driver operations on +* objects with index number N and can be used to add/remove pipelines of +* objects whilst other objects are unaffected. +* +* <h5>Byte Controls</h5> +* A byte control is defined as a new section that can include channel mapping, +* TLV data, callback operations and private data. The bytes section also +* includes a few other config options that are shown here :- +* +* <pre> +* SectionControlBytes."name" { +* comment "optional comments" +* +* index "1" # Index number +* +* channel."name" { # Channel maps +* .... +* } +* +* ops."ctl" { # Ops callback functions +* .... +* } +* +* base "0" # Register base +* num_regs "16" # Number of registers +* mask "0xff" # Mask +* max "255" # Maximum value +* +* tlv "tld_data" # optional TLV data +* +* data "pdata for mixer1" # optional private data +* } +* </pre> +* +* <h5>Enumerated Controls</h5> +* A enumerated control is defined as a new section (like mixer and byte) that +* can include channel mapping, callback operations, private data and +* text strings to represent the enumerated control options.<br> +* +* The text strings for the enumerated controls are defined in a seperate +* section as follows :- +* +* <pre> +* SectionText."name" { +* +* Values [ +* "value1" +* "value2" +"value3" +* ] +* } +* </pre> +* +* All the enumerated text values are listed in the values list.<br> +* The enumerated control is similar to the other controls and defined as +* follows :- +* +* <pre> +* SectionControlMixer."name" { +* comment "optional comments" +* +* index "1" # Index number +* +* texts "EQU1" # Enumerated text items +* +* channel."name" { # Channel maps +* .... +* } +* +* ops."ctl" { # Ops callback functions +* .... +* } +* +* data "pdata for mixer1" # optional private data +* } +* </pre> +* +* <h4>DAPM Graph</h4> +* DAPM graphs can easily be defined using the topology file. The format is +* very similar to the DAPM graph kernel format. :- +* +* <pre> +* SectionGraph."dsp" { +* index "1" # Index number +* +* lines [ +* "sink1, control, source1" +* "sink2, , source2" +* ] +* } +* </pre> +* +* The lines in the graph are defined as a variable size list of sinks, +* controls and sources. The control name is optional as some graph lines have +* no associated controls. The section name can be used to differentiate the +* graph with other graphs, it's not used by the kernel atm. +* +* <h4>DAPM Widgets</h4> +* DAPM wigets are similar to controls in that they can include many other +* objects. Widgets can contain private data, mixer controls and enum controls. +* +* The following widget types are supported and match the driver types :- +* +* * input +* * output +* * mux +* * mixer +* * pga +* * out_drv +* * adc +* * dac +* * switch +* * pre +* * post +* * aif_in +* * aif_out +* * dai_in +* * dai_out +* * dai_link +* +* Widgets are defined as follows :- +* +* <pre> +* SectionWidget."name" { +* +* index "1" # Index number +* +* type "aif_in" # Widget type - detailed above +* +* no_pm "true" # No PM control bit. +* reg "20" # PM bit register offset +* shift "0" # PM bit register shift +* invert "1 # PM bit is inverted +* subseq "8" # subsequence number +* +* event_type "1" # DAPM widget event type +* event_flags "1" # DAPM widget event flags +* +* mixer "name" # Optional Mixer Control +* enum "name" # Optional Enum Control +* +* data "name" # optional private data +* } +* </pre> +* +* The section name is the widget name. The mixer and enum fields are mutually +* exclusive and used to include controls into the widget. The index and data +* fields are the same for widgets as they are for controls whilst the other +* fields map on very closely to the driver widget fields. +* +* <h4>PCM Capabilities</h4> +* Topology can also define the capabilities of FE and BE PCMs. Capabilities +* can be defined with the following section :- +* +* <pre> +* SectionPCMCapabilities."name" { +* +* formats "S24_LE,S16_LE" # Supported formats +* rate_min "48000" # Max supported sample rate +* rate_max "48000" # Min suppoprted sample rate +* channels_min "2" # Min number of channels +* channels_max "2" # max number of channels +* } +* </pre> +* The supported formats use the same naming convention as the driver macros. +* The PCM capabilities name can be reffered to and included by BE, PCM and +* Codec <-> codec topology sections. +* +* <h4>PCM Configurations</h4> +* PCM runtime configurations can be defined for playback and capture stream +* directions with the following section :- +* +* <pre> +* SectionPCMConfig."name" { +* +* config."playback" { # playback config +* format "S16_LE" # playback format +* rate "48000" # playback sample rate +* channels "2" # playback channels +* tdm_slot "0xf" # playback TDM slot +* } +* +* config."capture" { # capture config +* format "S16_LE" # capture format +* rate "48000" # capture sample rate +* channels "2" # capture channels +* tdm_slot "0xf" # capture TDM slot +* } +* } +* </pre> +* +* The supported formats use the same naming convention as the driver macros. +* The PCM configuration name can be reffered to and included by BE, PCM and +* Codec <-> codec topology sections. +* +* <h4>PCM Configurations</h4> +* PCM, BE and Codec to Codec link sections define the supported capabilities +* and configurations for supported playback and capture streams. The +* definitions and content for PCMs, BE and Codec links are the same with the +* exception of the section type :- +* +* <pre> +* SectionPCM."name" { +* .... +* } +* SectionBE."name" { +* .... +* } +* SectionCC."name" { +* .... +* } +* </pre> +* +* The section types above should be used for PCMs, Back Ends and Codec to Codec +* links respectively.<br> +* +* The data for each section is defined as follows :- +* +* <pre> +* SectionPCM."name" { +* +* index "1" # Index number +* +* id "0" # used for binding to the PCM +* +* pcm."playback" { +* capabilities "capabilities1" # capbilities for playback +* +* configs [ # supported configs for playback +* "config1" +* "config2" +* ] +* } +* +* pcm."capture" { +* capabilities "capabilities2" # capabilities for capture +* +* configs [ # supported configs for capture +* "config1" +* "config2" +* "config3" +* ] +* } +* } +* </pre> +* +*/ + +/** Topology context */ +typedef struct snd_tplg snd_tplg_t ; + +/** +* \brief Create a new topology parser instance. +* \return New topology parser instance +*/ +snd_tplg_t *snd_tplg_new (void ); + +/** +* \brief Free a topology parser instance. +* \param tplg Topology parser instance +*/ +void snd_tplg_free (snd_tplg_t *tplg); + +/** +* \brief Parse and build topology text file into binary file. +* \param tplg Topology instance. +* \param infile Topology text input file to be parsed +* \param outfile Binary topology output file. +* \return Zero on sucess, otherwise a negative error code +*/ +int snd_tplg_build_file (snd_tplg_t *tplg,const char *infile, +const char *outfile); + +/** +* \brief Enable verbose reporting of binary file output +* \param tplg Topology Instance +* \param verbose Enable verbose output level if non zero +*/ +void snd_tplg_verbose (snd_tplg_t *tplg,int verbose); + +/* \} */ + +#ifdef __cplusplus +} +#endif + +#endif /* __ALSA_TOPOLOGY_H */
src/topology/elem.c new file +187 -0
187 lines not on this page · raw message
src/topology/parser.c new file +359 -0
359 lines not on this page · raw message
src/topology/tplg_local.h new file +234 -0
234 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH v3 3/13 topology: Add text section parser.
In reply to Liam GirdwoodParse text lists (like enum values) and store for later attachment to other objects.
--- src/topology/text.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/topology/text.c
src/topology/text.c new file +88 -0
@@ -0,0 +1,88 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> + +*/ + +#include "list.h" +#include "tplg_local.h" + +#define TEXT_SIZE_MAX \ + (SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + +static int parse_text_values (snd_config_t *cfg,struct tplg_elem *elem) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +const char *value =NULL ; +int j =0 ; + +tplg_dbg (" Text Values: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); + +if (j ==SND_SOC_TPLG_NUM_TEXTS ) { +tplg_dbg ("error: text string number exceeds %d\n" , j); +return -ENOMEM ; + } + +/* get value */ +if (snd_config_get_string (n, &value) <0 ) +continue ; + +elem_copy_text (&elem->texts[j][0 ], value, +SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); +tplg_dbg ("\t%s\n" , &elem->texts[j][0 ]); + + j++; + } + +return 0 ; +} + +/* Parse Text data */ +int tplg_parse_text (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; +int err =0 ; +struct tplg_elem *elem; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_TEXT ); +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,"values" ) ==0 ) { + err =parse_text_values (n, elem); +if (err <0 ) { +SNDERR ("error: failed to parse text values" ); +return err; + } +continue ; + } + } + +return err; +}
Signature · 1 line
2.1.4
PATCH v3 4/13 topology: Add PCM parser.
In reply to Liam GirdwoodParse PCM configurations and capabilities. These can then be used to define the capabilities and config for FE DAI links, PCM devices and codec <-> codec style links.
--- src/topology/pcm.c | 639 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 639 insertions(+) create mode 100644 src/topology/pcm.c
src/topology/pcm.c new file +639 -0
@@ -0,0 +1,639 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#include "list.h" +#include "tplg_local.h" + +struct tplg_elem *lookup_pcm_dai_stream (struct list_head *base,const char * id) +{ +struct list_head *pos; +struct tplg_elem *elem; +struct snd_soc_tplg_pcm_dai *pcm_dai; + +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); +if (elem->type !=OBJECT_TYPE_PCM ) +return NULL ; + + pcm_dai = elem->pcm; + +if (pcm_dai && (!strcmp (pcm_dai->capconf[0 ].caps.name, id) + || !strcmp (pcm_dai->capconf[1 ].caps.name, id))) +return elem; + } + +return NULL ; +} + +/* copy referenced caps to the pcm */ +static void copy_pcm_caps (const char *id,struct snd_soc_tplg_stream_caps *caps, +struct tplg_elem *ref_elem) +{ +struct snd_soc_tplg_stream_caps *ref_caps = ref_elem->stream_caps; + +tplg_dbg ("Copy pcm caps (%ld bytes) from '%s' to '%s' \n" , +sizeof (*caps), ref_elem->id, id); + + *caps = *ref_caps; +} + +/* copy referenced config to the pcm */ +static void copy_pcm_config (const char *id, +struct snd_soc_tplg_stream_config *cfg,struct tplg_elem *ref_elem) +{ +struct snd_soc_tplg_stream_config *ref_cfg = ref_elem->stream_cfg; + +tplg_dbg ("Copy pcm config (%ld bytes) from '%s' to '%s' \n" , +sizeof (*cfg), ref_elem->id, id); + + *cfg = *ref_cfg; +} + +/* check referenced config and caps for a pcm */ +static int tplg_build_pcm_cfg_caps (snd_tplg_t *tplg,struct tplg_elem *elem) +{ +struct tplg_elem *ref_elem =NULL ; +struct snd_soc_tplg_pcm_cfg_caps *capconf; +struct snd_soc_tplg_pcm_dai *pcm_dai; +unsigned int i, j; + +switch (elem->type) { +case OBJECT_TYPE_PCM : + pcm_dai = elem->pcm; +break ; +case OBJECT_TYPE_BE : + pcm_dai = elem->be; +break ; +case OBJECT_TYPE_CC : + pcm_dai = elem->cc; +break ; +default : +return -EINVAL ; + } + +for (i =0 ; i <2 ; i++) { + capconf = &pcm_dai->capconf[i]; + + ref_elem =tplg_elem_lookup (&tplg->pcm_caps_list, + capconf->caps.name,OBJECT_TYPE_STREAM_CAPS ); + +if (ref_elem !=NULL ) +copy_pcm_caps (elem->id, &capconf->caps, ref_elem); + +for (j =0 ; j < capconf->num_configs; j++) { + ref_elem =tplg_elem_lookup (&tplg->pcm_config_list, + capconf->configs[j].name, +OBJECT_TYPE_STREAM_CONFIG ); + +if (ref_elem !=NULL ) +copy_pcm_config (elem->id, + &capconf->configs[j], + ref_elem); + } + } + +return 0 ; +} + +int tplg_build_pcm_dai (snd_tplg_t *tplg,unsigned int type) +{ +struct list_head *base, *pos; +struct tplg_elem *elem; +int err =0 ; + +switch (type) { +case OBJECT_TYPE_PCM : + base = &tplg->pcm_list; +break ; +case OBJECT_TYPE_BE : + base = &tplg->be_list; +break ; +case OBJECT_TYPE_CC : + base = &tplg->cc_list; +break ; +default : +return -EINVAL ; + } + +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); +if (elem->type != type) { +SNDERR ("error: invalid elem '%s'\n" , elem->id); +return -EINVAL ; + } + + err =tplg_build_pcm_cfg_caps (tplg, elem); +if (err <0 ) +return err; + } + +return 0 ; +} + +/* PCM stream configuration */ +static int tplg_parse_stream_cfg(snd_tplg_t *tplg ATTRIBUTE_UNUSED, +snd_config_t *cfg,void *private) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +struct snd_soc_tplg_stream_config *sc = private; +struct snd_soc_tplg_stream *stream; +const char *id, *val; +snd_pcm_format_t format; +int ret; + +snd_config_get_id (cfg, &id); + +if (strcmp (id,"playback" ) ==0 ) + stream = &sc->playback; +else if (strcmp (id,"capture" ) ==0 ) + stream = &sc->capture; +else +return -EINVAL ; + +tplg_dbg ("\t%s:\n" , id); + + stream->size =sizeof (*stream); + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); + +if (snd_config_get_id (n, &id) <0 ) +return -EINVAL ; + +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +if (strcmp (id,"format" ) ==0 ) { + format =snd_pcm_format_value (val); +if (format ==SND_PCM_FORMAT_UNKNOWN ) { +SNDERR ("error: unsupported stream format %s\n" , + val); +return -EINVAL ; + } + + stream->format = format; +tplg_dbg ("\t\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"rate" ) ==0 ) { + stream->rate =atoi (val); +tplg_dbg ("\t\t%s: %d\n" , id, stream->rate); +continue ; + } + +if (strcmp (id,"channels" ) ==0 ) { + stream->channels =atoi (val); +tplg_dbg ("\t\t%s: %d\n" , id, stream->channels); +continue ; + } + +if (strcmp (id,"tdm_slot" ) ==0 ) { + stream->tdm_slot =strtol (val,NULL ,16 ); +tplg_dbg ("\t\t%s: 0x%x\n" , id, stream->tdm_slot); +continue ; + } + } + +return 0 ; +} + +/* Parse pcm configuration */ +int tplg_parse_pcm_config (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_stream_config *sc; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id; +int err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_STREAM_CONFIG ); +if (!elem) +return -ENOMEM ; + + sc = elem->stream_cfg; + sc->size = elem->size; + +tplg_dbg (" PCM Config: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +continue ; + +if (strcmp (id,"config" ) ==0 ) { + err =tplg_parse_compound (tplg, n, + tplg_parse_stream_cfg, sc); +if (err <0 ) +return err; +continue ; + } + } + +return 0 ; +} + +static int split_format (struct snd_soc_tplg_stream_caps *caps,char *str) +{ +char *s =NULL ; +snd_pcm_format_t format; +int i =0 , ret; + + s =strtok (str,"," ); +while ((s !=NULL ) && (i <SND_SOC_TPLG_MAX_FORMATS )) { + format =snd_pcm_format_value (s); +if (format ==SND_PCM_FORMAT_UNKNOWN ) { +SNDERR ("error: unsupported stream format %s\n" , s); +return -EINVAL ; + } + + caps->formats[i] = format; + s =strtok (NULL ,", " ); + i++; + } + +return 0 ; +} + +/* Parse pcm Capabilities */ +int tplg_parse_pcm_caps (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_stream_caps *sc; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val; +char *s; +int err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_STREAM_CAPS ); +if (!elem) +return -ENOMEM ; + + sc = elem->stream_caps; + sc->size = elem->size; +elem_copy_text (sc->name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + +tplg_dbg (" PCM Capabilities: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +continue ; + +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +if (strcmp (id,"formats" ) ==0 ) { + s =strdup (val); +if (s ==NULL ) +return -ENOMEM ; + + err =split_format (sc, s); +free (s); + +if (err <0 ) +return err; + +tplg_dbg ("\t\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"rate_min" ) ==0 ) { + sc->rate_min =atoi (val); +tplg_dbg ("\t\t%s: %d\n" , id, sc->rate_min); +continue ; + } + +if (strcmp (id,"rate_max" ) ==0 ) { + sc->rate_max =atoi (val); +tplg_dbg ("\t\t%s: %d\n" , id, sc->rate_max); +continue ; + } + +if (strcmp (id,"channels_min" ) ==0 ) { + sc->channels_min =atoi (val); +tplg_dbg ("\t\t%s: %d\n" , id, sc->channels_min); +continue ; + } + +if (strcmp (id,"channels_max" ) ==0 ) { + sc->channels_max =atoi (val); +tplg_dbg ("\t\t%s: %d\n" , id, sc->channels_max); +continue ; + } + } + +return 0 ; +} + +static int tplg_parse_pcm_cfg(snd_tplg_t *tplg ATTRIBUTE_UNUSED, +snd_config_t *cfg,void *private) +{ +struct snd_soc_tplg_pcm_cfg_caps *capconf = private; +struct snd_soc_tplg_stream_config *configs = capconf->configs; +unsigned int *num_configs = &capconf->num_configs; +const char *value; + +if (*num_configs ==SND_SOC_TPLG_STREAM_CONFIG_MAX ) +return -EINVAL ; + +if (snd_config_get_string (cfg, &value) <0 ) +return EINVAL ; + +elem_copy_text (configs[*num_configs].name, value, +SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + + *num_configs +=1 ; + +tplg_dbg ("\t\t\t%s\n" , value); + +return 0 ; +} + +/* Parse the cap and config of a pcm */ +int tplg_parse_pcm_cap_cfg (snd_tplg_t *tplg,snd_config_t *cfg, +void *private) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +struct tplg_elem *elem = private; +struct snd_soc_tplg_pcm_dai *pcm_dai; +const char *id, *value; +int err, stream; + +if (elem->type ==OBJECT_TYPE_PCM ) + pcm_dai = elem->pcm; +else if (elem->type ==OBJECT_TYPE_BE ) + pcm_dai = elem->be; +else if (elem->type ==OBJECT_TYPE_CC ) + pcm_dai = elem->cc; +else +return -EINVAL ; + +snd_config_get_id (cfg, &id); + +tplg_dbg ("\t%s:\n" , id); + +if (strcmp (id,"playback" ) ==0 ) { + stream =SND_SOC_TPLG_STREAM_PLAYBACK ; + pcm_dai->playback =1 ; + }else if (strcmp (id,"capture" ) ==0 ) { + stream =SND_SOC_TPLG_STREAM_CAPTURE ; + pcm_dai->capture =1 ; + }else +return -EINVAL ; + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); + +/* get id */ +if (snd_config_get_id (n, &id) <0 ) +continue ; + +if (strcmp (id,"capabilities" ) ==0 ) { +if (snd_config_get_string (n, &value) <0 ) +continue ; + +elem_copy_text (pcm_dai->capconf[stream].caps.name, value, +SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + +tplg_dbg ("\t\t%s\n\t\t\t%s\n" , id, value); +continue ; + } + +if (strcmp (id,"configs" ) ==0 ) { +tplg_dbg ("\t\tconfigs:\n" ); + err =tplg_parse_compound (tplg, n, tplg_parse_pcm_cfg, + &pcm_dai->capconf[stream]); +if (err <0 ) +return err; +continue ; + } + } + +return 0 ; +} + +/* Parse pcm */ +int tplg_parse_pcm (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_pcm_dai *pcm_dai; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_PCM ); +if (!elem) +return -ENOMEM ; + + pcm_dai = elem->pcm; + pcm_dai->size = elem->size; +elem_copy_text (pcm_dai->name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + +tplg_dbg (" PCM: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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,"id" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + pcm_dai->id =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, pcm_dai->id); +continue ; + } + +if (strcmp (id,"pcm" ) ==0 ) { + err =tplg_parse_compound (tplg, n, + tplg_parse_pcm_cap_cfg, elem); +if (err <0 ) +return err; +continue ; + } + } + +return 0 ; +} + +/* Parse be */ +int tplg_parse_be (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_pcm_dai *pcm_dai; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_BE ); +if (!elem) +return -ENOMEM ; + + pcm_dai = elem->be; + pcm_dai->size = elem->size; +elem_copy_text (pcm_dai->name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + +tplg_dbg (" BE: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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,"id" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + pcm_dai->id =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, pcm_dai->id); +continue ; + } + +if (strcmp (id,"be" ) ==0 ) { + err =tplg_parse_compound (tplg, n, + tplg_parse_pcm_cap_cfg, elem); +if (err <0 ) +return err; +continue ; + } + } + +return 0 ; +} + +/* Parse cc */ +int tplg_parse_cc (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_pcm_dai *pcm_dai; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_CC ); +if (!elem) +return -ENOMEM ; + + pcm_dai = elem->cc; + pcm_dai->size = elem->size; + +tplg_dbg (" CC: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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,"id" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + pcm_dai->id =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, pcm_dai->id); +continue ; + } + +if (strcmp (id,"cc" ) ==0 ) { + err =tplg_parse_compound (tplg, n, + tplg_parse_pcm_cap_cfg, elem); +if (err <0 ) +return err; +continue ; + } + } + +return 0 ; +}
Signature · 1 line
2.1.4
PATCH v3 5/13 topology: Add operations parser
In reply to Liam GirdwoodParse operations so we can bind them to kcontrols in the kernel.
--- src/topology/ops.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 src/topology/ops.c
src/topology/ops.c new file +84 -0
@@ -0,0 +1,84 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#include "list.h" +#include "tplg_local.h" + +/* mapping of kcontrol text names to types */ +static const struct map_elem control_map[] = { + {"volsw" ,SND_SOC_TPLG_CTL_VOLSW }, + {"volsw_sx" ,SND_SOC_TPLG_CTL_VOLSW_SX }, + {"volsw_xr_sx" ,SND_SOC_TPLG_CTL_VOLSW_XR_SX }, + {"enum" ,SND_SOC_TPLG_CTL_ENUM }, + {"bytes" ,SND_SOC_TPLG_CTL_BYTES }, + {"enum_value" ,SND_SOC_TPLG_CTL_ENUM_VALUE }, + {"range" ,SND_SOC_TPLG_CTL_RANGE }, + {"strobe" ,SND_SOC_TPLG_CTL_STROBE }, +}; + +static int lookup_ops (const char *c) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (control_map); i++) { +if (strcmp (control_map[i].name, c) ==0 ) +return control_map[i].id; + } + +/* cant find string name in our table so we use its ID number */ +return atoi (c); +} + +/* Parse Control operations. Ops can come from standard names above or +* bespoke driver controls with numbers >= 256 +*/ +int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED, +snd_config_t *cfg,void *private) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +struct snd_soc_tplg_ctl_hdr *hdr = private; +const char *id, *value; + +tplg_dbg ("\tOps\n" ); + hdr->size =sizeof (*hdr); + +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 - try strings then ints */ +if (snd_config_get_string (n, &value) <0 ) +continue ; + +if (strcmp (id,"info" ) ==0 ) + hdr->ops.info =lookup_ops (value); +else if (strcmp (id,"put" ) ==0 ) + hdr->ops.put =lookup_ops (value); +else if (strcmp (id,"get" ) ==0 ) + hdr->ops.get =lookup_ops (value); + +tplg_dbg ("\t\t%s = %s\n" , id, value); + } + +return 0 ; +}
Signature · 1 line
2.1.4
PATCH v3 6/13 topology: Add private data parser
In reply to Liam GirdwoodParse private data and store for attachment to other objects. Data can come file or be locally defined as bytes, shorts or words.
--- src/topology/data.c | 396 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 396 insertions(+) create mode 100644 src/topology/data.c
src/topology/data.c new file +396 -0
@@ -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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#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 ; +}
Signature · 1 line
2.1.4
PATCH v3 7/13 topology: Add DAPM object parser
In reply to Liam GirdwoodParse DAPM objects including widgets and graph elements.
--- src/topology/dapm.c | 562 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 562 insertions(+) create mode 100644 src/topology/dapm.c
src/topology/dapm.c new file +562 -0
@@ -0,0 +1,562 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#include "list.h" +#include "tplg_local.h" + +/* mapping of widget text names to types */ +static const struct map_elem widget_map[] = { + {"input" ,SND_SOC_TPLG_DAPM_INPUT }, + {"output" ,SND_SOC_TPLG_DAPM_OUTPUT }, + {"mux" ,SND_SOC_TPLG_DAPM_MUX }, + {"mixer" ,SND_SOC_TPLG_DAPM_MIXER }, + {"pga" ,SND_SOC_TPLG_DAPM_PGA }, + {"out_drv" ,SND_SOC_TPLG_DAPM_OUT_DRV }, + {"adc" ,SND_SOC_TPLG_DAPM_ADC }, + {"dac" ,SND_SOC_TPLG_DAPM_DAC }, + {"switch" ,SND_SOC_TPLG_DAPM_SWITCH }, + {"pre" ,SND_SOC_TPLG_DAPM_PRE }, + {"post" ,SND_SOC_TPLG_DAPM_POST }, + {"aif_in" ,SND_SOC_TPLG_DAPM_AIF_IN }, + {"aif_out" ,SND_SOC_TPLG_DAPM_AIF_OUT }, + {"dai_in" ,SND_SOC_TPLG_DAPM_DAI_IN }, + {"dai_out" ,SND_SOC_TPLG_DAPM_DAI_OUT }, + {"dai_link" ,SND_SOC_TPLG_DAPM_DAI_LINK }, +}; + +/* mapping of widget kcontrol text names to types */ +static const struct map_elem widget_control_map[] = { + {"volsw" ,SND_SOC_TPLG_DAPM_CTL_VOLSW }, + {"enum_double" ,SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE }, + {"enum_virt" ,SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT }, + {"enum_value" ,SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE }, +}; + +static int lookup_widget (const char *w) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (widget_map); i++) { +if (strcmp (widget_map[i].name, w) ==0 ) +return widget_map[i].id; + } + +return -EINVAL ; +} + +static int tplg_parse_dapm_mixers (snd_config_t *cfg,struct tplg_elem *elem) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +const char *value =NULL ; + +tplg_dbg (" DAPM Mixer Controls: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); + +/* get value */ +if (snd_config_get_string (n, &value) <0 ) +continue ; + +tplg_ref_add (elem,OBJECT_TYPE_MIXER , value); +tplg_dbg ("\t\t %s\n" , value); + } + +return 0 ; +} + +static int tplg_parse_dapm_enums (snd_config_t *cfg,struct tplg_elem *elem) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +const char *value =NULL ; + +tplg_dbg (" DAPM Enum Controls: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); + +/* get value */ +if (snd_config_get_string (n, &value) <0 ) +continue ; + +tplg_ref_add (elem,OBJECT_TYPE_ENUM , value); +tplg_dbg ("\t\t %s\n" , value); + } + +return 0 ; +} + +/* move referenced controls to the widget */ +static int copy_dapm_control (struct tplg_elem *elem,struct tplg_elem *ref) +{ +struct snd_soc_tplg_dapm_widget *widget = elem->widget; +struct snd_soc_tplg_mixer_control *mixer_ctrl = ref->mixer_ctrl; +struct snd_soc_tplg_enum_control *enum_ctrl = ref->enum_ctrl; + +tplg_dbg ("Control '%s' used by '%s'\n" , ref->id, elem->id); +tplg_dbg ("\tparent size: %d + %d -> %d, priv size -> %d\n" , + elem->size, ref->size, elem->size + ref->size, + widget->priv.size); + + widget =realloc (widget, elem->size + ref->size); +if (!widget) +return -ENOMEM ; + + elem->widget = widget; + +/* copy new widget at the end */ +if (ref->type ==OBJECT_TYPE_MIXER ) +memcpy ((void *)widget + elem->size, mixer_ctrl, ref->size); +else if (ref->type ==OBJECT_TYPE_ENUM ) +memcpy ((void *)widget + elem->size, enum_ctrl, ref->size); + + elem->size += ref->size; + widget->num_kcontrols++; + ref->compound_elem =1 ; +return 0 ; +} + +/* check referenced controls for a widget */ +static int tplg_build_widget (snd_tplg_t *tplg, +struct tplg_elem *elem) +{ +struct tplg_ref *ref; +struct list_head *base, *pos; +int err =0 ; + + base = &elem->ref_list; + +/* for each ref in this control elem */ +list_for_each (pos, base) { + + ref = list_entry(pos, struct tplg_ref, list); +if (ref->id ==NULL || ref->elem) +continue ; + +switch (ref->type) { +case OBJECT_TYPE_MIXER : + ref->elem =tplg_elem_lookup (&tplg->mixer_list, + ref->id,OBJECT_TYPE_MIXER ); +if (ref->elem) + err =copy_dapm_control (elem, ref->elem); +break ; + +case OBJECT_TYPE_ENUM : + ref->elem =tplg_elem_lookup (&tplg->enum_list, + ref->id,OBJECT_TYPE_ENUM ); +if (ref->elem) + err =copy_dapm_control (elem, ref->elem); +break ; + +case OBJECT_TYPE_DATA : + ref->elem =tplg_elem_lookup (&tplg->pdata_list, + ref->id,OBJECT_TYPE_DATA ); +if (ref->elem) + err =tplg_copy_data (elem, ref->elem); +break ; +default : +break ; + } + +if (!ref->elem) { +SNDERR ("error: cannot find control '%s'" +" referenced by widget '%s'\n" , + ref->id, elem->id); +return -EINVAL ; + } + +if (err <0 ) +return err; + } + +return 0 ; +} + +int tplg_build_widgets (snd_tplg_t *tplg) +{ + +struct list_head *base, *pos; +struct tplg_elem *elem; +int err; + + base = &tplg->widget_list; +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); +if (!elem->widget || elem->type !=OBJECT_TYPE_DAPM_WIDGET ) { +SNDERR ("error: invalid widget '%s'\n" , + elem->id); +return -EINVAL ; + } + + err =tplg_build_widget (tplg, elem); +if (err <0 ) +return err; + +/* add widget to manifest */ + tplg->manifest.widget_elems++; + } + +return 0 ; +} + +int tplg_build_routes (snd_tplg_t *tplg) +{ +struct list_head *base, *pos; +struct tplg_elem *elem; +struct snd_soc_tplg_dapm_graph_elem *route; + + base = &tplg->route_list; + +list_for_each (pos, base) { + elem = list_entry(pos, struct tplg_elem, list); + +if (!elem->route || elem->type !=OBJECT_TYPE_DAPM_GRAPH ) { +SNDERR ("error: invalid route '%s'\n" , + elem->id); +return -EINVAL ; + } + + route = elem->route; +tplg_dbg ("\nCheck route: sink '%s', control '%s', source '%s'\n" , + route->sink, route->control, route->source); + +/* validate sink */ +if (strlen (route->sink) <=0 ) { +SNDERR ("error: no sink\n" ); +return -EINVAL ; + + } +if (!tplg_elem_lookup (&tplg->widget_list, route->sink, +OBJECT_TYPE_DAPM_WIDGET )) { +SNDERR ("warning: undefined sink widget/stream '%s'\n" , + route->sink); + } + +/* validate control name */ +if (strlen (route->control)) { +if (!tplg_elem_lookup (&tplg->mixer_list, + route->control,OBJECT_TYPE_MIXER ) && + !tplg_elem_lookup (&tplg->enum_list, + route->control,OBJECT_TYPE_ENUM )) { +SNDERR ("warning: Undefined mixer/enum control '%s'\n" , + route->control); + } + } + +/* validate source */ +if (strlen (route->source) <=0 ) { +SNDERR ("error: no source\n" ); +return -EINVAL ; + + } +if (!tplg_elem_lookup (&tplg->widget_list, route->source, +OBJECT_TYPE_DAPM_WIDGET )) { +SNDERR ("warning: Undefined source widget/stream '%s'\n" , + route->source); + } + +/* add graph to manifest */ + tplg->manifest.graph_elems++; + } + +return 0 ; +} + +#define LINE_SIZE 1024 + +/* line is defined as '"source, control, sink"' */ +static int tplg_parse_line (const char *text, +struct snd_soc_tplg_dapm_graph_elem *line) +{ +char buf[LINE_SIZE ]; +unsigned int len, i; +const char *source =NULL , *sink =NULL , *control =NULL ; + +elem_copy_text (buf, text,LINE_SIZE ); + + len =strlen (buf); +if (len <=2 ) { +SNDERR ("error: invalid route \"%s\"\n" , buf); +return -EINVAL ; + } + +/* find first , */ +for (i =1 ; i < len; i++) { +if (buf[i] ==',' ) + goto second; + } +SNDERR ("error: invalid route \"%s\"\n" , buf); +return -EINVAL ; + +second: +/* find second , */ + sink = buf; + control = &buf[i +2 ]; + buf[i] =0 ; + +for (; i < len; i++) { +if (buf[i] ==',' ) + goto done; + } + +SNDERR ("error: invalid route \"%s\"\n" , buf); +return -EINVAL ; + +done: + buf[i] =0 ; + source = &buf[i +2 ]; + +strcpy (line->source, source); +strcpy (line->control, control); +strcpy (line->sink, sink); +return 0 ; +} + + +static int tplg_parse_routes (snd_tplg_t *tplg,snd_config_t *cfg) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +struct tplg_elem *elem; +struct snd_soc_tplg_dapm_graph_elem *line =NULL ; +int err; + +snd_config_for_each (i, next, cfg) { +const char *val; + + n =snd_config_iterator_entry (i); +if (snd_config_get_string (n, &val) <0 ) +continue ; + + elem =tplg_elem_new (); +if (!elem) +return -ENOMEM ; + +list_add_tail (&elem->list, &tplg->route_list); +strcpy (elem->id,"line" ); + elem->type =OBJECT_TYPE_DAPM_GRAPH ; + elem->size =sizeof (*line); + + line =calloc (1 ,sizeof (*line)); +if (!line) +return -ENOMEM ; + + elem->route = line; + + err =tplg_parse_line (val, line); +if (err <0 ) +return err; + +tplg_dbg ("route: sink '%s', control '%s', source '%s'\n" , + line->sink, line->control, line->source); + } + +return 0 ; +} + +int tplg_parse_dapm_graph (snd_tplg_t *tplg,snd_config_t *cfg, + void *private ATTRIBUTE_UNUSED) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +int err; +const char *graph_id; + +if (snd_config_get_type (cfg) !=SND_CONFIG_TYPE_COMPOUND ) { +SNDERR ("error: compound is expected for dapm graph definition\n" ); +return -EINVAL ; + } + +snd_config_get_id (cfg, &graph_id); + +snd_config_for_each (i, next, cfg) { +const char *id; + + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) { +continue ; + } + +if (strcmp (id,"lines" ) ==0 ) { + err =tplg_parse_routes (tplg, n); +if (err <0 ) { +SNDERR ("error: failed to parse dapm graph %s\n" , + graph_id); +return err; + } +continue ; + } + } + +return 0 ; +} + +/* DAPM Widget */ +int tplg_parse_dapm_widget (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_dapm_widget *widget; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int widget_type, err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_DAPM_WIDGET ); +if (!elem) +return -ENOMEM ; + +tplg_dbg (" Widget: %s\n" , elem->id); + + widget = elem->widget; +elem_copy_text (widget->name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + widget->size = elem->size; + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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 ; + + widget_type =lookup_widget (val); +if (widget_type <0 ){ +SNDERR ("Widget '%s': Unsupported widget type %s\n" , + elem->id, val); +return -EINVAL ; + } + + widget->id = widget_type; +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"no_pm" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +if (strcmp (val,"true" ) ==0 ) + widget->reg =-1 ; + +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"shift" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + widget->shift =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, widget->shift); +continue ; + } + +if (strcmp (id,"reg" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + widget->reg =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, widget->reg); +continue ; + } + +if (strcmp (id,"invert" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + widget->invert =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, widget->invert); +continue ; + } + +if (strcmp (id,"subseq" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + widget->subseq=atoi (val); +tplg_dbg ("\t%s: %d\n" , id, widget->subseq); +continue ; + } + +if (strcmp (id,"event_type" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + widget->event_type =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, widget->event_type); +continue ; + } + +if (strcmp (id,"event_flags" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + widget->event_flags =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, widget->event_flags); +continue ; + } + +if (strcmp (id,"enum" ) ==0 ) { + err =tplg_parse_dapm_enums (n, elem); +if (err <0 ) +return err; + +continue ; + } + +if (strcmp (id,"mixer" ) ==0 ) { + err =tplg_parse_dapm_mixers (n, elem); +if (err <0 ) +return err; + +continue ; + } + +if (strcmp (id,"data" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +tplg_ref_add (elem,OBJECT_TYPE_DATA , val); +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + } + +return 0 ; +}
Signature · 1 line
2.1.4
PATCH v3 8/13 topology: Add CTL parser
In reply to Liam GirdwoodAdd support to parse mixers, enums and byte controls.
--- src/topology/ctl.c | 613 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 613 insertions(+) create mode 100644 src/topology/ctl.c
src/topology/ctl.c new file +613 -0
@@ -0,0 +1,613 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#include "list.h" +#include "tplg_local.h" + +/* copy referenced TLV to the mixer control */ +static int copy_tlv (struct tplg_elem *elem,struct tplg_elem *ref) +{ +struct snd_soc_tplg_mixer_control *mixer_ctrl = elem->mixer_ctrl; +struct snd_soc_tplg_ctl_tlv *tlv = ref->tlv; + +tplg_dbg ("TLV '%s' used by '%s\n" , ref->id, elem->id); + +/* TLV has a fixed size */ + mixer_ctrl->tlv = *tlv; + +/* set size of TLV data */ + mixer_ctrl->hdr.tlv_size = tlv->count *sizeof (uint32_t ); +return 0 ; +} + +/* check referenced TLV for a mixer control */ +static int tplg_build_mixer_control (snd_tplg_t *tplg, +struct tplg_elem *elem) +{ +struct tplg_ref *ref; +struct list_head *base, *pos; +int err =0 ; + + base = &elem->ref_list; + +/* for each ref in this control elem */ +list_for_each (pos, base) { + + ref = list_entry(pos, struct tplg_ref, list); +if (ref->id ==NULL || ref->elem) +continue ; + +if (ref->type ==OBJECT_TYPE_TLV ) { + ref->elem =tplg_elem_lookup (&tplg->tlv_list, + ref->id,OBJECT_TYPE_TLV ); +if (ref->elem) + err =copy_tlv (elem, ref->elem); + + }else if (ref->type ==OBJECT_TYPE_DATA ) { + ref->elem =tplg_elem_lookup (&tplg->pdata_list, + ref->id,OBJECT_TYPE_DATA ); + err =tplg_copy_data (elem, ref->elem); + } + +if (!ref->elem) { +SNDERR ("error: cannot find '%s' referenced by" +" control '%s'\n" , ref->id, elem->id); +return -EINVAL ; + }else if (err <0 ) +return err; + } + +return 0 ; +} + +static void copy_enum_texts (struct tplg_elem *enum_elem, +struct tplg_elem *ref_elem) +{ +struct snd_soc_tplg_enum_control *ec = enum_elem->enum_ctrl; + +memcpy (ec->texts, ref_elem->texts, +SND_SOC_TPLG_NUM_TEXTS *SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); +} + +/* check referenced text for a enum control */ +static int tplg_build_enum_control (snd_tplg_t *tplg, +struct tplg_elem *elem) +{ +struct tplg_ref *ref; +struct list_head *base, *pos; +int err =0 ; + + base = &elem->ref_list; + +list_for_each (pos, base) { + + ref = list_entry(pos, struct tplg_ref, list); +if (ref->id ==NULL || ref->elem) +continue ; + +if (ref->type ==OBJECT_TYPE_TEXT ) { + ref->elem =tplg_elem_lookup (&tplg->text_list, + ref->id,OBJECT_TYPE_TEXT ); +if (ref->elem) +copy_enum_texts (elem, ref->elem); + + }else if (ref->type ==OBJECT_TYPE_DATA ) { + ref->elem =tplg_elem_lookup (&tplg->pdata_list, + ref->id,OBJECT_TYPE_DATA ); + err =tplg_copy_data (elem, ref->elem); + } +if (!ref->elem) { +SNDERR ("error: cannot find '%s' referenced by" +" control '%s'\n" , ref->id, elem->id); +return -EINVAL ; + }else if (err <0 ) +return err; + } + +return 0 ; +} + +/* check referenced private data for a byte control */ +static int tplg_build_bytes_control (snd_tplg_t *tplg,struct tplg_elem *elem) +{ +struct tplg_ref *ref; +struct list_head *base, *pos; + + base = &elem->ref_list; + +list_for_each (pos, base) { + + ref = list_entry(pos, struct tplg_ref, list); +if (ref->id ==NULL || ref->elem) +continue ; + +/* bytes control only reference one private data section */ + ref->elem =tplg_elem_lookup (&tplg->pdata_list, + ref->id,OBJECT_TYPE_DATA ); +if (!ref->elem) { +SNDERR ("error: cannot find data '%s'" +" referenced by control '%s'\n" , + ref->id, elem->id); +return -EINVAL ; + } + +/* copy texts to enum elem */ +return tplg_copy_data (elem, ref->elem); + } + +return 0 ; +} + +int tplg_build_controls (snd_tplg_t *tplg) +{ +struct list_head *base, *pos; +struct tplg_elem *elem; +int err =0 ; + + base = &tplg->mixer_list; +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); + err =tplg_build_mixer_control (tplg, elem); +if (err <0 ) +return err; + +/* add control to manifest */ + tplg->manifest.control_elems++; + } + + base = &tplg->enum_list; +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); + err =tplg_build_enum_control (tplg, elem); +if (err <0 ) +return err; + +/* add control to manifest */ + tplg->manifest.control_elems++; + } + + base = &tplg->bytes_ext_list; +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); + err =tplg_build_bytes_control (tplg, elem); +if (err <0 ) +return err; + +/* add control to manifest */ + tplg->manifest.control_elems++; + } + +return 0 ; +} + + +/* +* Parse TLV of DBScale type. +* +* Parse DBScale describing min, step, mute in DB. +*/ +static int tplg_parse_tlv_dbscale (snd_config_t *cfg,struct tplg_elem *elem) +{ +snd_config_iterator_t i, next; +snd_config_t *n; +struct snd_soc_tplg_ctl_tlv *tplg_tlv; +const char *id =NULL , *value =NULL ; +int *data; + +tplg_dbg (" scale: %s\n" , elem->id); + + tplg_tlv =calloc (1 ,sizeof (*tplg_tlv)); +if (!tplg_tlv) +return -ENOMEM ; + data = (int *)(tplg_tlv->data); + + elem->tlv = tplg_tlv; + tplg_tlv->numid =SNDRV_CTL_TLVT_DB_SCALE ; + tplg_tlv->count =8 ; + tplg_tlv->size =sizeof (*tplg_tlv); + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); + +/* get ID */ +if (snd_config_get_id (n, &id) <0 ) { +SNDERR ("error: cant get ID\n" ); +return -EINVAL ; + } + +/* get value */ +if (snd_config_get_string (n, &value) <0 ) +continue ; + +tplg_dbg ("\t%s = %s\n" , id, value); + +/* get TLV data */ +if (strcmp (id,"min" ) ==0 ) + data[0 ] =atoi (value); +else if (strcmp (id,"step" ) ==0 ) + data[1 ] =atoi (value); +else if (strcmp (id,"mute" ) ==0 ) + data[2 ] =atoi (value); +else +SNDERR ("error: unknown key %s\n" , id); + } + +return 0 ; +} + +/* Parse TLV */ +int tplg_parse_tlv (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; +int err =0 ; +struct tplg_elem *elem; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_TLV ); +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,"scale" ) ==0 ) { + err =tplg_parse_tlv_dbscale (n, elem); +if (err <0 ) { +SNDERR ("error: failed to DBScale" ); +return err; + } +continue ; + } + } + +return err; +} + +/* Parse Control Bytes */ +int tplg_parse_control_bytes (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_bytes_control *be; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int err; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_BYTES ); +if (!elem) +return -ENOMEM ; + + be = elem->bytes_ext; + be->size = elem->size; +elem_copy_text (be->hdr.name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + be->hdr.type =SND_SOC_TPLG_TYPE_BYTES ; + +tplg_dbg (" Control Bytes: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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,"base" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + be->base =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, be->base); +continue ; + } + +if (strcmp (id,"num_regs" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + be->num_regs =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, be->num_regs); +continue ; + } + +if (strcmp (id,"max" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + be->max =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, be->num_regs); +continue ; + } + +if (strcmp (id,"mask" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + be->mask =strtol (val,NULL ,16 ); +tplg_dbg ("\t%s: %d\n" , id, be->mask); +continue ; + } + +if (strcmp (id,"data" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +tplg_ref_add (elem,OBJECT_TYPE_DATA , val); +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"tlv" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + err =tplg_ref_add (elem,OBJECT_TYPE_TLV , val); +if (err <0 ) +return err; + + be->hdr.access =SNDRV_CTL_ELEM_ACCESS_TLV_READ | +SNDRV_CTL_ELEM_ACCESS_READWRITE ; +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + } + +return 0 ; +} + +/* Parse Control Enums. */ +int tplg_parse_control_enum (snd_tplg_t *tplg,snd_config_t *cfg, + void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_enum_control *ec; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int err, j; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_ENUM ); +if (!elem) +return -ENOMEM ; + +/* init new mixer */ + ec = elem->enum_ctrl; +elem_copy_text (ec->hdr.name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + ec->hdr.type =SND_SOC_TPLG_TYPE_ENUM ; + ec->size = elem->size; + tplg->channel_idx =0 ; + +/* set channel reg to default state */ +for (j =0 ; j <SND_SOC_TPLG_MAX_CHAN ; j++) + ec->channel[j].reg =-1 ; + +tplg_dbg (" Control Enum: %s\n" , elem->id); + +snd_config_for_each (i, next, cfg) { + + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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,"texts" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +tplg_ref_add (elem,OBJECT_TYPE_TEXT , val); +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"channel" ) ==0 ) { +if (ec->num_channels >=SND_SOC_TPLG_MAX_CHAN ) { +SNDERR ("error: too many channels %s\n" , + elem->id); +return -EINVAL ; + } + + err =tplg_parse_compound (tplg, n, tplg_parse_channel, + ec->channel); +if (err <0 ) +return err; + + ec->num_channels = tplg->channel_idx; +continue ; + } + +if (strcmp (id,"ops" ) ==0 ) { + err =tplg_parse_compound (tplg, n, tplg_parse_ops, + &ec->hdr); +if (err <0 ) +return err; +continue ; + } + +if (strcmp (id,"data" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +tplg_ref_add (elem,OBJECT_TYPE_DATA , val); +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + } + +return 0 ; +} + +/* Parse Controls. +* +* Mixer control. Supports multiple channels. +*/ +int tplg_parse_control_mixer (snd_tplg_t *tplg, + snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) +{ +struct snd_soc_tplg_mixer_control *mc; +struct tplg_elem *elem; +snd_config_iterator_t i, next; +snd_config_t *n; +const char *id, *val =NULL ; +int err, j; + + elem =tplg_elem_new_common (tplg, cfg,OBJECT_TYPE_MIXER ); +if (!elem) +return -ENOMEM ; + +/* init new mixer */ + mc = elem->mixer_ctrl; +elem_copy_text (mc->hdr.name, elem->id,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ); + mc->hdr.type =SND_SOC_TPLG_TYPE_MIXER ; + mc->size = elem->size; + tplg->channel_idx =0 ; + +/* set channel reg to default state */ +for (j =0 ; j <SND_SOC_TPLG_MAX_CHAN ; j++) + mc->channel[j].reg =-1 ; + +tplg_dbg (" Control Mixer: %s\n" , elem->id); + +/* giterate trough each mixer elment */ +snd_config_for_each (i, next, cfg) { + n =snd_config_iterator_entry (i); +if (snd_config_get_id (n, &id) <0 ) +continue ; + +/* skip comments */ +if (strcmp (id,"comment" ) ==0 ) +continue ; +if (id[0 ] =='#' ) +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,"channel" ) ==0 ) { +if (mc->num_channels >=SND_SOC_TPLG_MAX_CHAN ) { +SNDERR ("error: too many channels %s\n" , + elem->id); +return -EINVAL ; + } + + err =tplg_parse_compound (tplg, n, tplg_parse_channel, + mc->channel); +if (err <0 ) +return err; + + mc->num_channels = tplg->channel_idx; +continue ; + } + +if (strcmp (id,"max" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + mc->max =atoi (val); +tplg_dbg ("\t%s: %d\n" , id, mc->max); +continue ; + } + +if (strcmp (id,"invert" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +if (strcmp (val,"true" ) ==0 ) + mc->invert =1 ; +else if (strcmp (val,"false" ) ==0 ) + mc->invert =0 ; + +tplg_dbg ("\t%s: %d\n" , id, mc->invert); +continue ; + } + +if (strcmp (id,"ops" ) ==0 ) { + err =tplg_parse_compound (tplg, n, tplg_parse_ops, + &mc->hdr); +if (err <0 ) +return err; +continue ; + } + +if (strcmp (id,"tlv" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + + err =tplg_ref_add (elem,OBJECT_TYPE_TLV , val); +if (err <0 ) +return err; + + mc->hdr.access =SNDRV_CTL_ELEM_ACCESS_TLV_READ | +SNDRV_CTL_ELEM_ACCESS_READWRITE ; +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + +if (strcmp (id,"data" ) ==0 ) { +if (snd_config_get_string (n, &val) <0 ) +return -EINVAL ; + +tplg_ref_add (elem,OBJECT_TYPE_DATA , val); +tplg_dbg ("\t%s: %s\n" , id, val); +continue ; + } + } + +return 0 ; +}
Signature · 1 line
2.1.4
PATCH v3 9/13 topology: Add Channel map parser.
In reply to Liam GirdwoodAdd support for parsing channel map to control registers.
--- src/topology/channel.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 src/topology/channel.c
src/topology/channel.c new file +122 -0
@@ -0,0 +1,122 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#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 mapping. */ +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 ) { +SNDERR ("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 ; +}
Signature · 1 line
2.1.4
PATCH v3 10/13 topology: Add binary file builder.
In reply to Liam GirdwoodBuild the binary output file from all the locally parsed objects and elements.
--- src/topology/builder.c | 327 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) create mode 100644 src/topology/builder.c
src/topology/builder.c new file +327 -0
@@ -0,0 +1,327 @@ +/* +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 <[email protected]> +Yao Jin <[email protected]> +Liam Girdwood <[email protected]> +*/ + +#include "list.h" +#include "tplg_local.h" + +/* verbose output detailing each object size and file position */ +static void verbose (snd_tplg_t *tplg,const char *fmt, ...) +{ +int offset; +va_list va; + +if (!tplg->verbose) +return ; + + offset =lseek (tplg->out_fd,0 ,SEEK_CUR ); + +va_start (va, fmt); +fprintf (stdout,"0x%6.6x/%6.6d -" , offset, offset); +vfprintf (stdout, fmt, va); +va_end (va); +} + +/* write out block header to output file */ +static int write_block_header (snd_tplg_t *tplg,unsigned int type, +unsigned int vendor_type,unsigned int version,unsigned int index, +size_t payload_size,int count) +{ +struct snd_soc_tplg_hdr hdr; +size_t bytes; +int offset =lseek (tplg->out_fd,0 ,SEEK_CUR ); + +memset (&hdr,0 ,sizeof (hdr)); + hdr.magic =SND_SOC_TPLG_MAGIC ; + hdr.abi =SND_SOC_TPLG_ABI_VERSION ; + hdr.type = type; + hdr.vendor_type = vendor_type; + hdr.version = version; + hdr.payload_size = payload_size; + hdr.index = index; + hdr.size =sizeof (hdr); + hdr.count = count; + +/* make sure file offset is aligned with the calculated HDR offset */ +if ((unsigned int )offset != tplg->next_hdr_pos) { +SNDERR ("error: New header is at offset 0x%x but file" +" offset 0x%x is %s by %d bytes\n" , + tplg->next_hdr_pos, offset, + (unsigned int )offset > tplg->next_hdr_pos ?"ahead" :"behind" , +abs (offset - tplg->next_hdr_pos)); +exit (-EINVAL ); + } + +verbose (tplg," header type %d size 0x%lx/%ld vendor %d " +"version %d\n" , type, (long unsigned int )payload_size, + (long int )payload_size, vendor_type, version); + + tplg->next_hdr_pos += hdr.payload_size +sizeof (hdr); + + bytes =write (tplg->out_fd, &hdr,sizeof (hdr)); +if (bytes !=sizeof (hdr)) { +SNDERR ("error: can't write section header %lu\n" , + (long unsigned int )bytes); +return bytes; + } + +return bytes; +} + +static int write_data_block (snd_tplg_t *tplg,int size,int tplg_type, +const char *obj_name,void *data) +{ +int ret; + +/* write the header for this block */ + ret =write_block_header (tplg, tplg_type,0 , +SND_SOC_TPLG_ABI_VERSION ,0 , size,1 ); +if (ret <0 ) { +SNDERR ("error: failed to write %s block %d\n" , obj_name, ret); +return ret; + } + +verbose (tplg," %s : write %d bytes\n" , obj_name, size); + + ret =write (tplg->out_fd, data, size); +if (ret <0 ) { +SNDERR ("error: failed to write %s %d\n" , obj_name, ret); +return ret; + } + +return 0 ; +} + +static int write_elem_block (snd_tplg_t *tplg, +struct list_head *base,int size,int tplg_type,const char *obj_name) +{ +struct list_head *pos; +struct tplg_elem *elem; +int ret, wsize =0 , count =0 , vendor_type; + +/* count number of elements */ +list_for_each (pos, base) + count++; + +/* write the header for this block */ +list_for_each (pos, base) { + elem = list_entry(pos, struct tplg_elem, list); + vendor_type = elem->vendor_type; +break ; + } + + ret =write_block_header (tplg, tplg_type, vendor_type, +SND_SOC_TPLG_ABI_VERSION ,0 , size, count); +if (ret <0 ) { +SNDERR ("error: failed to write %s block %d\n" , + obj_name, ret); +return ret; + } + +/* write each elem to block */ +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); + +/* compound elems have already been copied to other elems */ +if (elem->compound_elem) +continue ; + +if (elem->type !=OBJECT_TYPE_DAPM_GRAPH ) +verbose (tplg," %s '%s': write %d bytes\n" , + obj_name, elem->id, elem->size); +else +verbose (tplg," %s '%s': write %d bytes\n" , + obj_name, elem->route->source, elem->size); + + count =write (tplg->out_fd, elem->obj, elem->size); +if (count <0 ) { +SNDERR ("error: failed to write %s %d\n" , + obj_name, ret); +return ret; + } + + wsize += count; + } + +/* make sure we have written the correct size */ +if (wsize != size) { +SNDERR ("error: size mismatch. Expected %d wrote %d\n" , + size, wsize); +return -EIO ; + } + +return 0 ; +} + +static int calc_block_size (struct list_head *base) +{ +struct list_head *pos; +struct tplg_elem *elem; +int size =0 ; + +list_for_each (pos, base) { + + elem = list_entry(pos, struct tplg_elem, list); + +/* compound elems have already been copied to other elems */ +if (elem->compound_elem) +continue ; + + size += elem->size; + } + +return size; +} + +static int write_block (snd_tplg_t *tplg,struct list_head *base, +int type) +{ +int size; + +/* calculate the block size in bytes for all elems in this list */ + size =calc_block_size (base); +if (size <=0 ) +return size; + +verbose (tplg," block size for type %d is %d\n" , type, size); + +/* write each elem for this block */ +switch (type) { +case OBJECT_TYPE_MIXER : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_MIXER ,"mixer" ); +case OBJECT_TYPE_BYTES : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_BYTES ,"bytes" ); +case OBJECT_TYPE_ENUM : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_ENUM ,"enum" ); +case OBJECT_TYPE_DAPM_GRAPH : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_DAPM_GRAPH ,"route" ); +case OBJECT_TYPE_DAPM_WIDGET : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_DAPM_WIDGET ,"widget" ); +case OBJECT_TYPE_PCM : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_PCM ,"pcm" ); +case OBJECT_TYPE_BE : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_DAI_LINK ,"be" ); +case OBJECT_TYPE_CC : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_DAI_LINK ,"cc" ); +case OBJECT_TYPE_MANIFEST : +return write_data_block (tplg, size,SND_SOC_TPLG_TYPE_MANIFEST , +"manifest" , &tplg->manifest); +case OBJECT_TYPE_DATA : +return write_elem_block (tplg, base, size, +SND_SOC_TPLG_TYPE_PDATA ,"data" ); +default : +return -EINVAL ; + } + +return 0 ; +} + +int tplg_write_data (snd_tplg_t *tplg) +{ +int ret; + +/* write manifest */ + ret =write_data_block (tplg,sizeof (tplg->manifest), +OBJECT_TYPE_MANIFEST ,"manifest" , &tplg->manifest); +if (ret <0 ) { +SNDERR ("failed to write manifest %d\n" , ret); +return ret; + } + +/* write mixer elems. */ + ret =write_block (tplg, &tplg->mixer_list, +OBJECT_TYPE_MIXER ); +if (ret <0 ) { +SNDERR ("failed to write control elems %d\n" , ret); +return ret; + } + +/* write enum control elems. */ + ret =write_block (tplg, &tplg->enum_list, +OBJECT_TYPE_ENUM ); +if (ret <0 ) { +SNDERR ("failed to write control elems %d\n" , ret); +return ret; + } + +/* write bytes extended control elems. */ + ret =write_block (tplg, &tplg->bytes_ext_list, +OBJECT_TYPE_BYTES ); +if (ret <0 ) { +SNDERR ("failed to write control elems %d\n" , ret); +return ret; + } + +/* write widget elems */ + ret =write_block (tplg, &tplg->widget_list, +OBJECT_TYPE_DAPM_WIDGET ); +if (ret <0 ) { +SNDERR ("failed to write widget elems %d\n" , ret); +return ret; + } + +/* write pcm elems */ + ret =write_block (tplg, &tplg->pcm_list, +OBJECT_TYPE_PCM ); +if (ret <0 ) { +SNDERR ("failed to write pcm elems %d\n" , ret); +return ret; + } + +/* write be elems */ + ret =write_block (tplg, &tplg->be_list, +OBJECT_TYPE_BE ); +if (ret <0 ) { +SNDERR ("failed to write be elems %d\n" , ret); +return ret; + } + +/* write cc elems */ + ret =write_block (tplg, &tplg->cc_list, +OBJECT_TYPE_CC ); +if (ret <0 ) { +SNDERR ("failed to write cc elems %d\n" , ret); +return ret; + } + +/* write route elems */ + ret =write_block (tplg, &tplg->route_list, +OBJECT_TYPE_DAPM_GRAPH ); +if (ret <0 ) { +SNDERR ("failed to write graph elems %d\n" , ret); +return ret; + } + +/* write private data */ + ret =write_block (tplg, &tplg->pdata_list, +OBJECT_TYPE_DATA ); +if (ret <0 ) { +SNDERR ("failed to write private data %d\n" , ret); +return ret; + } + +return 0 ; +}
Signature · 1 line
2.1.4
PATCH v3 11/13 topology: autotools: Add build support for topology core
In reply to Liam Girdwood--- configure.ac | 11 ++++++++++- include/Makefile.am | 4 ++++ src/Makefile.am | 7 +++++++ src/topology/Makefile.am | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 src/topology/Makefile.am
configure.ac +10 -1
@@ -380,6 +380,9 @@ AC_ARG_ENABLE(seq, AC_ARG_ENABLE(ucm, AS_HELP_STRING([--disable-ucm], [disable the use-case-manager component]), [build_ucm="$enableval"], [build_ucm="yes"]) +AC_ARG_ENABLE(topology, + AS_HELP_STRING([--disable-topology], [disable the DSP topology component]), + [build_topology="$enableval"], [build_topology="yes"]) AC_ARG_ENABLE(alisp, AS_HELP_STRING([--disable-alisp], [disable the alisp component]), [build_alisp="$enableval"], [build_alisp="yes"])
@@ -422,6 +425,7 @@ AM_CONDITIONAL([BUILD_RAWMIDI], [test x$build_rawmidi = xyes]) AM_CONDITIONAL([BUILD_HWDEP], [test x$build_hwdep = xyes]) AM_CONDITIONAL([BUILD_SEQ], [test x$build_seq = xyes]) AM_CONDITIONAL([BUILD_UCM], [test x$build_ucm = xyes]) +AM_CONDITIONAL([BUILD_TOPOLOGY], [test x$build_topology = xyes]) AM_CONDITIONAL([BUILD_ALISP], [test x$build_alisp = xyes]) AM_CONDITIONAL([BUILD_PYTHON], [test x$build_python = xyes])
@@ -443,6 +447,9 @@ fi if test "$build_ucm" = "yes"; then AC_DEFINE([BUILD_UCM], "1", [Build UCM component]) fi +if test "$build_topology" = "yes"; then + AC_DEFINE([BUILD_TOPOLOGY], "1", [Build DSP Topology component]) +fi dnl PCM Plugins
@@ -643,7 +650,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/pcm/Makefile src/pcm/scopes/Makefile \ src/rawmidi/Makefile src/timer/Makefile \ src/hwdep/Makefile src/seq/Makefile src/ucm/Makefile \ - src/alisp/Makefile \ + src/alisp/Makefile src/topology/Makefile \ src/conf/Makefile src/conf/alsa.conf.d/Makefile \ src/conf/cards/Makefile \ src/conf/pcm/Makefile \
@@ -656,6 +663,8 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PAZ00/Makefile \ src/conf/ucm/GoogleNyan/Makefile \ src/conf/ucm/broadwell-rt286/Makefile \ + src/conf/topology/Makefile \ + src/conf/topology/broadwell/Makefile \ modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ alsalisp/Makefile aserver/Makefile \ test/Makefile test/lsb/Makefile \
include/Makefile.am +4 -0
@@ -50,6 +50,10 @@ if BUILD_UCM alsainclude_HEADERS += use-case.h endif +if BUILD_TOPOLOGY +alsainclude_HEADERS += topology.h +endif + if BUILD_ALISP alsainclude_HEADERS += alisp.h endif
src/Makefile.am +7 -0
@@ -42,6 +42,10 @@ if BUILD_UCM SUBDIRS += ucm libasound_la_LIBADD += ucm/libucm.la endif +if BUILD_TOPOLOGY +SUBDIRS += topology +libasound_la_LIBADD += topology/libtopology.la +endif if BUILD_ALISP SUBDIRS += alisp libasound_la_LIBADD += alisp/libalisp.la
@@ -81,6 +85,9 @@ seq/libseq.la: ucm/libucm.la: $(MAKE) -C ucm libucm.la +topology/libtopology.la: + $(MAKE) -C topology libtopology.la + instr/libinstr.la: $(MAKE) -C instr libinstr.la
src/topology/Makefile.am new file +19 -0
@@ -0,0 +1,19 @@ +EXTRA_LTLIBRARIES = libtopology.la + +libtopology_la_SOURCES =\ + parser.c \ + builder.c \ + ctl.c \ + dapm.c \ + pcm.c \ + data.c \ + text.c \ + channel.c \ + ops.c \ + elem.c + +noinst_HEADERS = tplg_local.h + +all: libtopology.la + +AM_CPPFLAGS=-I$(top_srcdir)/include
Signature · 1 line
2.1.4
PATCH v3 12/13 topology: doxygen: Add doxygen support for topology core.
In reply to Liam Girdwood--- doc/doxygen.cfg.in | 7 +++++-- doc/index.doxygen | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
doc/doxygen.cfg.in +5 -2
@@ -29,6 +29,7 @@ INPUT = @top_srcdir@/doc/index.doxygen \ @top_srcdir@/include/control_external.h \ @top_srcdir@/include/mixer.h \ @top_srcdir@/include/use-case.h \ + @top_srcdir@/include/topology.h \ @top_srcdir@/src/error.c \ @top_srcdir@/src/dlmisc.c \ @top_srcdir@/src/async.c \
@@ -78,7 +79,8 @@ INPUT = @top_srcdir@/doc/index.doxygen \ @top_srcdir@/src/timer \ @top_srcdir@/src/hwdep \ @top_srcdir@/src/seq \ - @top_srcdir@/src/ucm + @top_srcdir@/src/ucm \ + @top_srcdir@/src/topology EXCLUDE = @top_srcdir@/src/control/control_local.h \ @top_srcdir@/src/pcm/atomic.h \ @top_srcdir@/src/pcm/interval.h \
@@ -94,7 +96,8 @@ EXCLUDE = @top_srcdir@/src/control/control_local.h \ @top_srcdir@/src/mixer/mixer_local.h \ @top_srcdir@/src/rawmidi/rawmidi_local.h \ @top_srcdir@/src/seq/seq_local.h \ - @top_srcdir@/src/ucm/ucm_local.h + @top_srcdir@/src/ucm/ucm_local.h \ + @top_srcdir@/src/topology/tplg_local.h RECURSIVE = YES FILE_PATTERNS = *.c *.h EXAMPLE_PATH = @top_srcdir@/test
doc/index.doxygen +1 -0
@@ -41,6 +41,7 @@ may be placed in the library code instead of the kernel driver.</P> <LI>Page \ref timer explains the design of the Timer API. <LI>Page \ref seq explains the design of the Sequencer API. <LI>Page \ref ucm explains the use case API. + <LI>Page \ref topology explains the DSP topology API. </UL> <H2>Configuration</H2>
Signature · 1 line
2.1.4
PATCH v3 13/13 conf: topology: Add topology file for broadwell audio DSP
In reply to Liam Girdwood--- src/conf/Makefile.am | 2 +- src/conf/topology/Makefile.am | 1 + src/conf/topology/broadwell/Makefile.am | 4 + src/conf/topology/broadwell/broadwell.conf | 375 +++++++++++++++++++++++++++++ 4 files changed, 381 insertions(+), 1 deletion(-) create mode 100644 src/conf/topology/Makefile.am create mode 100644 src/conf/topology/broadwell/Makefile.am create mode 100644 src/conf/topology/broadwell/broadwell.conf
src/conf/Makefile.am +1 -1
@@ -1,4 +1,4 @@ -SUBDIRS=cards pcm alsa.conf.d ucm +SUBDIRS=cards pcm alsa.conf.d ucm topology cfg_files = alsa.conf if BUILD_ALISP
src/conf/topology/Makefile.am new file +1 -0
@@ -0,0 +1 @@ +SUBDIRS=broadwell
src/conf/topology/broadwell/Makefile.am new file +4 -0
@@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +topologydir = $(alsaconfigdir)/topology/broadwell +topology_DATA = broadwell.conf +EXTRA_DIST = $(topology_DATA)
src/conf/topology/broadwell/broadwell.conf new file +375 -0
375 lines not on this page · raw message
Signature · 1 line
2.1.4
Quoted 22 lines · Liam Girdwood
This series adds support for parsing topology data text files and converting to the binary topology format accepted by the kernel.
Changes since V2 :-
o Added documentation in doxygen format describing API and text file format.
o use SNDERR macro for error reporting.
o Added text copy helper.
o Make all parsed keywords lowercase
o Assignment for some structure copies instead ofmemcpy().
o Fixed the private data parser to handle byte, short and word data.Changes since V1 :-
o Terminate all
strncpy()strings with NULL.
o Usesnd_pcm_format_value()instead of local lookup.
o Set a maximum size for private data files.
o Set capture/playback stream direction for new PCMs
o Only set TLV access flags for TLV CTLs.
Quoted 14 lines
Liam Girdwood (13):
topology: uapi: Add UAPI headers for topology ABI
topology: Add topology core parser.
topology: Add text section parser.
topology: Add PCM parser.
topology: Add operations parser
topology: Add private data parser
topology: Add DAPM object parser
topology: Add CTL parser
topology: Add Channel map parser.
topology: Add binary file builder.
topology: autotools: Add build support for topology core
topology: doxygen: Add doxygen support for topology core.
conf: topology: Add topology file for broadwell audio DSP
I merged all patches now together with a couple of trivial fixes. (Also fixed the bisectionability in patches 11 and 13).
thanks,
Takashi
Quoted 49 lines
configure.ac | 11 +- doc/doxygen.cfg.in | 7 +- doc/index.doxygen | 1 + include/Makefile.am | 4 + include/sound/Makefile.am | 3 +- include/sound/asoc.h | 388 ++++++++++++++++++ include/sound/tlv.h | 23 ++ include/topology.h | 497 ++++++++++++++++++++++ src/Makefile.am | 7 + src/conf/Makefile.am | 2 +- src/conf/topology/Makefile.am | 1 + src/conf/topology/broadwell/Makefile.am | 4 + src/conf/topology/broadwell/broadwell.conf | 375 +++++++++++++++++ src/topology/Makefile.am | 19 + src/topology/builder.c | 327 +++++++++++++++ src/topology/channel.c | 122 ++++++ src/topology/ctl.c | 613 +++++++++++++++++++++++++++ src/topology/dapm.c | 562 +++++++++++++++++++++++++ src/topology/data.c | 396 ++++++++++++++++++ src/topology/elem.c | 187 +++++++++ src/topology/ops.c | 84 ++++ src/topology/parser.c | 359 ++++++++++++++++ src/topology/pcm.c | 639 +++++++++++++++++++++++++++++ src/topology/text.c | 88 ++++ src/topology/tplg_local.h | 234 +++++++++++ 25 files changed, 4948 insertions(+), 5 deletions(-) create mode 100644 include/sound/asoc.h create mode 100644 include/sound/tlv.h create mode 100644 include/topology.h create mode 100644 src/conf/topology/Makefile.am create mode 100644 src/conf/topology/broadwell/Makefile.am create mode 100644 src/conf/topology/broadwell/broadwell.conf create mode 100644 src/topology/Makefile.am create mode 100644 src/topology/builder.c create mode 100644 src/topology/channel.c create mode 100644 src/topology/ctl.c create mode 100644 src/topology/dapm.c create mode 100644 src/topology/data.c create mode 100644 src/topology/elem.c create mode 100644 src/topology/ops.c create mode 100644 src/topology/parser.c create mode 100644 src/topology/pcm.c create mode 100644 src/topology/text.c create mode 100644 src/topology/tplg_local.hSignature · 1 line
2.1.4
Quoted 4 lines · Takashi Iwai
I merged all patches now together with a couple of trivial fixes. (Also fixed the bisectionability in patches 11 and 13).
Thanks, when are you thinking of doing a new alsa-lib release ?
We have a few more new features/updates to add next week (it's being tested internally on SKL atm). Any chance you could wait until after they were upstreamed ?
Btw, I also have a topology command line utility for alsa-utils that I'll send later today.
Thanks
Liam
Quoted 7 lines · Liam Girdwood
Quoted 4 lines · Takashi Iwai
I merged all patches now together with a couple of trivial fixes. (Also fixed the bisectionability in patches 11 and 13).
Quoted 5 lines
Thanks, when are you thinking of doing a new alsa-lib release ?
We have a few more new features/updates to add next week (it's being tested internally on SKL atm). Any chance you could wait until after they were upstreamed ?
I don't think we hurry for the new release yet.
Quoted 2 lines
Btw, I also have a topology command line utility for alsa-utils that I'll send later today.
That's great. Thanks!
Takashi