From cc51ff8f0c4a67bc3bcbf0af3a3c3c4a3eaeb0d1 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Tue, 5 Mar 2019 18:43:39 +0800 Subject: [PATCH] topology: change token name from effect to process The token can be used for more generic processing, not only effect component, let's rename it. Signed-off-by: Ranjani Sridharan Signed-off-by: Keyon Jie --- tools/topology/m4/eq_fir.m4 | 4 ++-- tools/topology/m4/eq_iir.m4 | 4 ++-- tools/topology/sof/tokens.m4 | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/topology/m4/eq_fir.m4 b/tools/topology/m4/eq_fir.m4 index 75d1d9f7d..27e17a84d 100644 --- a/tools/topology/m4/eq_fir.m4 +++ b/tools/topology/m4/eq_fir.m4 @@ -28,9 +28,9 @@ define(`W_EQ_FIR', ` tuples "'N_EQ_FIR($1)`_tuples_str"' `}' `SectionVendorTuples."'N_EQ_FIR($1)`_tuples_str_type" {' -` tokens "sof_effect_tokens"' +` tokens "sof_process_tokens"' ` tuples."string" {' -` SOF_TKN_EFFECT_TYPE' "EQFIR" +` SOF_TKN_PROCESS_TYPE' "EQFIR" ` }' `}' `SectionData."'N_EQ_FIR($1)`_data_str_type" {' diff --git a/tools/topology/m4/eq_iir.m4 b/tools/topology/m4/eq_iir.m4 index 1f6466bd9..ce720f49d 100644 --- a/tools/topology/m4/eq_iir.m4 +++ b/tools/topology/m4/eq_iir.m4 @@ -28,9 +28,9 @@ define(`W_EQ_IIR', ` tuples "'N_EQ_IIR($1)`_tuples_str"' `}' `SectionVendorTuples."'N_EQ_IIR($1)`_tuples_str_type" {' -` tokens "sof_effect_tokens"' +` tokens "sof_process_tokens"' ` tuples."string" {' -` SOF_TKN_EFFECT_TYPE' "EQIIR" +` SOF_TKN_PROCESS_TYPE' "EQIIR" ` }' `}' `SectionData."'N_EQ_IIR($1)`_data_str_type" {' diff --git a/tools/topology/sof/tokens.m4 b/tools/topology/sof/tokens.m4 index 91298b89f..75eda998e 100644 --- a/tools/topology/sof/tokens.m4 +++ b/tools/topology/sof/tokens.m4 @@ -85,6 +85,7 @@ SectionVendorTokens."sof_tone_tokens" { SOF_TKN_TONE_SAMPLE_RATE "800" } -SectionVendorTokens."sof_effect_tokens" { - SOF_TKN_EFFECT_TYPE "900" +SectionVendorTokens."sof_process_tokens" { + SOF_TKN_PROCESS_TYPE "900" + SOF_TKN_PROCESS_SUBTYPE "901" }