From aa589343fdd29144e85e167268fb3913e12a79e0 Mon Sep 17 00:00:00 2001 From: Pin-chih Lin Date: Thu, 27 Oct 2022 18:19:37 +0800 Subject: [PATCH] topology: waves: remove deprecated kcontrol widget and data Fix aligned to pipe-waves-codec-playback.m4 due to module_adapter design change. Signed-off-by: Pin-chih Lin --- .../sof/pipe-waves-codec-demux-playback.m4 | 34 ++----------------- .../sof/pipe-waves-demux-eq-iir-playback.m4 | 34 ++----------------- 2 files changed, 4 insertions(+), 64 deletions(-) diff --git a/tools/topology/topology1/sof/pipe-waves-codec-demux-playback.m4 b/tools/topology/topology1/sof/pipe-waves-codec-demux-playback.m4 index 71775b68b..ada3a749d 100644 --- a/tools/topology/topology1/sof/pipe-waves-codec-demux-playback.m4 +++ b/tools/topology/topology1/sof/pipe-waves-codec-demux-playback.m4 @@ -36,22 +36,14 @@ define(`SETUP_PARAMS_NAME', `Waves' `ENDPOINT_NAME' `Setup' PIPELINE_ID) CONTROLBYTES_PRIV(PP_SETUP_CONFIG, ` bytes "0x53,0x4f,0x46,0x00,' ` 0x00,0x00,0x00,0x00,' -` 0x20,0x00,0x00,0x00,' +` 0x0c,0x00,0x00,0x00,' ` 0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' - -` 0x00,0x01,0x41,0x57,' -` 0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,' -` 0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,' - ` 0x00,0x00,0x00,0x00,' ` 0x0c,0x00,0x00,0x00,' - ` 0x00,0x00,0x00,0x00"' ) @@ -64,28 +56,6 @@ C_CONTROLBYTES(SETUP_PARAMS_NAME, PIPELINE_ID, , PP_SETUP_CONFIG) -define(`RUNTIME_PARAMS_NAME', `Waves' `ENDPOINT_NAME' `Runtime' PIPELINE_ID) - -CONTROLBYTES_PRIV(PP_RUNTIME_PARAMS, -` bytes "0x53,0x4f,0x46,0x00,' -` 0x01,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x10,0x00,0x03,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00"' -) - -# Post process Bytes control for runtime config -C_CONTROLBYTES(RUNTIME_PARAMS_NAME, PIPELINE_ID, - CONTROLBYTES_OPS(bytes), - CONTROLBYTES_EXTOPS(void, 258, 258), - , , , - CONTROLBYTES_MAX(, 8192), - , - PP_RUNTIME_PARAMS) - # demux Bytes control with max value of 255 C_CONTROLBYTES(concat(`DEMUX', PIPELINE_ID), PIPELINE_ID, CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258, 258), @@ -125,7 +95,7 @@ W_DATA(DEF_PGA_CONF, DEF_PGA_TOKENS) W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, 2, 0, SCHEDULE_CORE) W_CODEC_ADAPTER(0, PIPELINE_FORMAT, DAI_PERIODS, DAI_PERIODS, SCHEDULE_CORE, - LIST(` ', "RUNTIME_PARAMS_NAME", "SETUP_PARAMS_NAME")) + LIST(` ', "SETUP_PARAMS_NAME")) # "Master Playback Volume" has 2 source and x sink periods for DAI ping-pong W_PGA(1, PIPELINE_FORMAT, DAI_PERIODS, 2, DEF_PGA_CONF, SCHEDULE_CORE, diff --git a/tools/topology/topology1/sof/pipe-waves-demux-eq-iir-playback.m4 b/tools/topology/topology1/sof/pipe-waves-demux-eq-iir-playback.m4 index 16a3a8953..6615912ff 100644 --- a/tools/topology/topology1/sof/pipe-waves-demux-eq-iir-playback.m4 +++ b/tools/topology/topology1/sof/pipe-waves-demux-eq-iir-playback.m4 @@ -23,22 +23,14 @@ define(`SETUP_PARAMS_NAME', `Waves' `ENDPOINT_NAME' `Setup' PIPELINE_ID) CONTROLBYTES_PRIV(PP_SETUP_CONFIG, ` bytes "0x53,0x4f,0x46,0x00,' ` 0x00,0x00,0x00,0x00,' -` 0x20,0x00,0x00,0x00,' +` 0x0c,0x00,0x00,0x00,' ` 0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' - -` 0x00,0x01,0x41,0x57,' -` 0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,' -` 0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,' - ` 0x00,0x00,0x00,0x00,' ` 0x0c,0x00,0x00,0x00,' - ` 0x00,0x00,0x00,0x00"' ) @@ -51,28 +43,6 @@ C_CONTROLBYTES(SETUP_PARAMS_NAME, PIPELINE_ID, , PP_SETUP_CONFIG) -define(`RUNTIME_PARAMS_NAME', `Waves' `ENDPOINT_NAME' `Runtime' PIPELINE_ID) - -CONTROLBYTES_PRIV(PP_RUNTIME_PARAMS, -` bytes "0x53,0x4f,0x46,0x00,' -` 0x01,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x10,0x00,0x03,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00,' -` 0x00,0x00,0x00,0x00"' -) - -# Post process Bytes control for runtime config -C_CONTROLBYTES(RUNTIME_PARAMS_NAME, PIPELINE_ID, - CONTROLBYTES_OPS(bytes), - CONTROLBYTES_EXTOPS(void, 258, 258), - , , , - CONTROLBYTES_MAX(, 8192), - , - PP_RUNTIME_PARAMS) - # demux Bytes control with max value of 255 C_CONTROLBYTES(concat(`DEMUX', PIPELINE_ID), PIPELINE_ID, CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258, 258), @@ -106,7 +76,7 @@ C_CONTROLBYTES(DEF_EQIIR_COEF, PIPELINE_ID, W_PCM_PLAYBACK(PCM_ID, Speaker Playback, 2, 0, SCHEDULE_CORE) W_CODEC_ADAPTER(0, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE, - LIST(` ', "RUNTIME_PARAMS_NAME", "SETUP_PARAMS_NAME")) + LIST(` ', "SETUP_PARAMS_NAME")) # "EQ IIR" has x sink period and 2 source periods W_EQ_IIR(0, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE,