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

topology: set default values for C_CONTROLBYTES string members 

When the string fields left empty, the alsa topology parser treats
SND_CONFIG_TYPE_STRING type config as -EINVAL, so set defauls values.

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
This commit is contained in:
Yong Zhi 2021-11-29 19:00:43 -06:00 committed by Liam Girdwood
parent c30dffcc35
commit 47b159fca3
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/topology/topology1/m4/bytecontrol.m4
View File

@ -1,5 +1,8 @@
divert(-1)
# don't care value
define(`XX', 0x00)
dnl Define macro for byte control
dnl CONTROLBYTES_MAX(comment, value)
@ -60,9 +63,10 @@ define(`C_CONTROLBYTES',
` # control uses bespoke driver get/put/info ID for ext ops'
` $4'
`'
` base STR($5)'
` num_regs STR($6)'
` mask STR($7)'
` # default base/num_regs/mask to avoid NULL STR'
` ifelse($5, `', base STR(XX), base STR($5))'
` ifelse($6, `', num_regs STR(XX), num_regs STR($6)`')'
` ifelse($7, `', mask STR(XX), mask STR($7)`')'
` $8'
` $9'
` access ['
@ -88,9 +92,9 @@ define(`C_CONTROLBYTES_VOLATILE_READONLY',
` # control uses bespoke driver get/put/info ID for ext ops'
` $4'
`'
` base STR($5)'
` num_regs STR($6)'
` mask STR($7)'
` ifelse($5, `', base STR(XX), base STR($5))'
` ifelse($6, `', num_regs STR(XX), num_regs STR($6)`')'
` ifelse($7, `', mask STR(XX), mask STR($7)`')'
` $8'
` $9'
` access ['
@ -116,9 +120,9 @@ define(`C_CONTROLBYTES_WRITEONLY',
` # control uses bespoke driver get/put/info ID for ext ops'
` $4'
`'
` base STR($5)'
` num_regs STR($6)'
` mask STR($7)'
` ifelse($5, `', base STR(XX), base STR($5))'
` ifelse($6, `', num_regs STR(XX), num_regs STR($6)`')'
` ifelse($7, `', mask STR(XX), mask STR($7)`')'
` $8'
` $9'
` access ['
@ -143,9 +147,9 @@ define(`C_CONTROLBYTES_VOLATILE_RW',
` # control uses bespoke driver get/put/info ID for ext ops'
` $4'
`'
` base STR($5)'
` num_regs STR($6)'
` mask STR($7)'
` ifelse($5, `', base STR(XX), base STR($5))'
` ifelse($6, `', num_regs STR(XX), num_regs STR($6)`')'
` ifelse($7, `', mask STR(XX), mask STR($7)`')'
` $8'
` $9'
` access ['