Skip to content

Commit 00f05b1

Browse files
committed
Tools: Topology1: Fix topologies build with new alsa-lib
This patch fixes build error with alsa-lib commit 541427761292. ALSA lib ops.c:47:(lookup_ops) [error.topology] wrong kcontrol ops value string '' It impacts build of sof-mt8195-mt6359-max98390-rt5682-rtnr.tplg and sof-mt8195-mt6359-max98390-rt5682-google-aec-rtnr.tplg. In the created .conf from m4 conversion, the value of put is an empty string in SectionControlBytes. # control uses bespoke driver get/put/info ID for ext ops extops."extctl" { #258 binds the mixer control to bytes get handlers get "258" put "" } The use of m4 macro CONTROLBYTES_OPS() requires three parameters while originally there was only two. All other usages of CONTROLBYTES_EXTOPS() in SOF are with 258, 258 as 2nd and 3rd parameters, so it is assumed it should be same for RTNR controls also. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent a32d983 commit 00f05b1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tools/topology/topology1/sof/pipe-rtnr-capture.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CONTROLBYTES_PRIV(DEF_RTNR_PRIV,
4242
# RTNR Bytes control with max value of 255
4343
C_CONTROLBYTES_READONLY(DEF_RTNR_BYTES, PIPELINE_ID,
4444
CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get handlers, 258),
45-
CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get handlers, 258),
45+
CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get handlers, 258, 258),
4646
, , ,
4747
CONTROLBYTES_MAX(, 256),
4848
,

tools/topology/topology1/sof/pipe-rtnr-google-rtc-audio-processing-capture.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CONTROLBYTES_PRIV(DEF_RTNR_PRIV,
4444
# RTNR Bytes control with max value of 255
4545
C_CONTROLBYTES_READONLY(DEF_RTNR_BYTES, PIPELINE_ID,
4646
CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258),
47-
CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get/put handlers, 258),
47+
CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get/put handlers, 258, 258),
4848
, , ,
4949
CONTROLBYTES_MAX(, 256),
5050
,

0 commit comments

Comments
 (0)