From 8530a952244c1427838c5b54e21ac340dccaee2a Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 5 Apr 2021 12:23:11 +0300 Subject: [PATCH] topology: codec_adapter: Prepare switching to shimmed CA interface Each codec family is now having its own UUID. We keep the old codec_adapter UUID to be used with Cadence family codecs. All other codec families (e.g passthrough, waves) needs to use new uuids. The topology files will just need to define CA_UID macro. e.g for waves codec, topology file should contain: DECLARE_SOF_RT_UUID("Waves codec", waves_codec_uuid, 0xd944281a, 0xafe9, 0x4695, 0xa0, 0x43, 0xd7, 0xf6, 0x2b, 0x89, 0x53, 0x8e); define(`CA_UUID', cadence_codec_uuid) Signed-off-by: Daniel Baluta --- tools/topology/m4/codec_adapter.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/topology/m4/codec_adapter.m4 b/tools/topology/m4/codec_adapter.m4 index c5e932433..8387867e2 100644 --- a/tools/topology/m4/codec_adapter.m4 +++ b/tools/topology/m4/codec_adapter.m4 @@ -4,6 +4,8 @@ dnl Define macro for CODEC_ADAPTER widget DECLARE_SOF_RT_UUID("codec_adapter", ca_uuid, 0xd8218443, 0x5ff3, 0x4a4c, 0xb3, 0x88, 0x6c, 0xfe, 0x07, 0xb9, 0x56, 0xaa); +ifdef(`CA_UUID', `', `define(`CA_UUID', ca_uuid)'); + dnl N_CODEC_ADAPTER(name) define(`N_CODEC_ADAPTER', `CODEC_ADAPTER'PIPELINE_ID`.'$1) @@ -12,7 +14,7 @@ define(`W_CODEC_ADAPTER', `SectionVendorTuples."'N_CODEC_ADAPTER($1)`_tuples_uuid" {' ` tokens "sof_comp_tokens"' ` tuples."uuid" {' -` SOF_TKN_COMP_UUID' STR(ca_uuid) +` SOF_TKN_COMP_UUID' STR(CA_UUID) ` }' `}' `SectionData."'N_CODEC_ADAPTER($1)`_data_uuid" {'