From 62315289243efc9d60e43cdaa20d2ba2722ce05b Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Fri, 5 Aug 2022 17:46:34 +0300 Subject: [PATCH] topology: Fix setup control bytes comments setup config data was removed with commit 5763c74bf408d ("codec_adapter: Remove setup config from module data") update documentation to reflect this. Signed-off-by: Daniel Baluta --- .../topology1/sof/pipe-codec-adapter-capture.m4 | 10 +--------- .../topology1/sof/pipe-codec-adapter-playback.m4 | 10 +--------- .../sof/pipe-eq-iir-codec-adapter-playback.m4 | 10 +--------- .../topology1/sof/pipe-host-codec-adapter-playback.m4 | 10 +--------- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 b/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 index c62fe1b97..65d85f040 100644 --- a/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 +++ b/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 @@ -21,21 +21,13 @@ include(`bytecontrol.m4') # and the corresponding max bytenum on your own. # Codec Adapter setup config control bytes (little endian) -# : bytes "abi_header, ca_config, [codec_param0, codec_param1...]" +# : bytes "abi_header, [codec_param0, codec_param1...]" # - 32 bytes abi_header: you could get by command "sof-ctl -t 0 -g -b" # - [0:3]: magic number 0x00464f53 # - [4:7]: type 0 # - [8:11]: payload size in bytes (not including abi header bytes) # - [12:15]: abi 3.1.0 # - [16:31]: reserved 0s -# - 20 bytes ca_config: codec adapter setup config parameters, for more details please refer -# struct ca_config under audio/codec_adapter/codec/generic.h -# - [0]: API ID, e.g. 0x01 -# - [1:3]: codec ID, e.g. 0xd03311 -# - [4:7]: reserved 0s -# - [8:11]: sample rate, e.g. 48000 -# - [12:15]: sample width in bits, e.g. 32 -# - [16:19]: channels, e.g. 2 # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h # - [0:3]: param ID diff --git a/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 index eb75022e1..cd7d42308 100644 --- a/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 +++ b/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 @@ -21,21 +21,13 @@ include(`bytecontrol.m4') # and the corresponding max bytenum on your own. # Codec Adapter setup config control bytes (little endian) -# : bytes "abi_header, ca_config, [codec_param0, codec_param1...]" +# : bytes "abi_header, [codec_param0, codec_param1...]" # - 32 bytes abi_header: you could get by command "sof-ctl -t 0 -g -b" # - [0:3]: magic number 0x00464f53 # - [4:7]: type 0 # - [8:11]: payload size in bytes (not including abi header bytes) # - [12:15]: abi 3.1.0 # - [16:31]: reserved 0s -# - 20 bytes ca_config: codec adapter setup config parameters, for more details please refer -# struct ca_config under audio/codec_adapter/codec/generic.h -# - [0]: API ID, e.g. 0x01 -# - [1:3]: codec ID, e.g. 0xd03311 -# - [4:7]: reserved 0s -# - [8:11]: sample rate, e.g. 48000 -# - [12:15]: sample width in bits, e.g. 32 -# - [16:19]: channels, e.g. 2 # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h # - [0:3]: param ID diff --git a/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 index 647e32756..6327a413e 100644 --- a/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 +++ b/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 @@ -22,21 +22,13 @@ include(`eq_iir.m4') # and the corresponding max bytenum on your own. # Codec Adapter setup config control bytes (little endian) -# : bytes "abi_header, ca_config, [codec_param0, codec_param1...]" +# : bytes "abi_header, [codec_param0, codec_param1...]" # - 32 bytes abi_header: you could get by command "sof-ctl -t 0 -g -b" # - [0:3]: magic number 0x00464f53 # - [4:7]: type 0 # - [8:11]: payload size in bytes (not including abi header bytes) # - [12:15]: abi 3.1.0 # - [16:31]: reserved 0s -# - 20 bytes ca_config: codec adapter setup config parameters, for more details please refer -# struct ca_config under audio/codec_adapter/codec/generic.h -# - [0]: API ID, e.g. 0x01 -# - [1:3]: codec ID, e.g. 0xd03311 -# - [4:7]: reserved 0s -# - [8:11]: sample rate, e.g. 48000 -# - [12:15]: sample width in bits, e.g. 32 -# - [16:19]: channels, e.g. 2 # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h # - [0:3]: param ID diff --git a/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 index b5a5dc25e..18ca1777b 100644 --- a/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 +++ b/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 @@ -21,21 +21,13 @@ include(`bytecontrol.m4') # and the corresponding max bytenum on your own. # Codec Adapter setup config control bytes (little endian) -# : bytes "abi_header, ca_config, [codec_param0, codec_param1...]" +# : bytes "abi_header, [codec_param0, codec_param1...]" # - 32 bytes abi_header: you could get by command "sof-ctl -t 0 -g -b" # - [0:3]: magic number 0x00464f53 # - [4:7]: type 0 # - [8:11]: payload size in bytes (not including abi header bytes) # - [12:15]: abi 3.1.0 # - [16:31]: reserved 0s -# - 20 bytes ca_config: codec adapter setup config parameters, for more details please refer -# struct ca_config under audio/codec_adapter/codec/generic.h -# - [0]: API ID, e.g. 0x01 -# - [1:3]: codec ID, e.g. 0xd03311 -# - [4:7]: reserved 0s -# - [8:11]: sample rate, e.g. 48000 -# - [12:15]: sample width in bits, e.g. 32 -# - [16:19]: channels, e.g. 2 # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h # - [0:3]: param ID