OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology: enable override of pga and mixercontrol names 

Currently m4 parses pga and mixercontrol topology names partly from
static strings, pipeline id's and user defined names. This automagically
differentiates the pga's nicely, but makes some pga control names human
unreadable and error prone for example to to pipeline id changes. So
make it possible to define the pga and control name with PGA_NAME and
CONTROL_NAME.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
This commit is contained in:
Jaska Uimonen 2019-10-04 14:20:56 +03:00 committed by Tomasz Lauda
parent a358ea980d
commit 74a4cfe2d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/topology/m4/mixercontrol.m4
View File

@ -30,7 +30,7 @@ define(`CONTROLMIXER_OPS',
dnl C_CONTROLMIXER(name, index, ops, max, invert, tlv, KCONTROL_CHANNELS)
define(`C_CONTROLMIXER',
`SectionControlMixer."$2 $1" {'
`SectionControlMixer."ifdef(`CONTROL_NAME', CONTROL_NAME, $2 $1)" {'
`'
` # control belongs to this index group'
` index STR($2)'

3
tools/topology/m4/pga.m4
View File

@ -3,6 +3,7 @@ divert(-1)
dnl Define macro for PGA widget
dnl PGA name)
define(`N_PGA', `PGA'PIPELINE_ID`.'$1)
dnl W_PGA(name, format, periods_sink, periods_source, kcontrol0. kcontrol1...etc)
@ -26,7 +27,7 @@ define(`W_PGA',
`SectionData."'N_PGA($1)`_data_str" {'
` tuples "'N_PGA($1)`_tuples_str"'
`}'
`SectionWidget."'N_PGA($1)`" {'
`SectionWidget.ifdef(`PGA_NAME', "`PGA_NAME'", "`N_PGA($1)'") {'
` index "'PIPELINE_ID`"'
` type "pga"'
` no_pm "true"'