From a9cb19ada34fdcb4ce40aa0bdfbb9eaaf5eda66d Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 27 Mar 2019 18:44:23 +0200 Subject: [PATCH] topology: add param check to PIPELINE_*() macros Abort build if not all mandatory arguments are passed to the top-level pipeline macros. Signed-off-by: Kai Vehmanen --- tools/topology/m4/pipeline.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/topology/m4/pipeline.m4 b/tools/topology/m4/pipeline.m4 index 833780c02..923ac412c 100644 --- a/tools/topology/m4/pipeline.m4 +++ b/tools/topology/m4/pipeline.m4 @@ -40,6 +40,7 @@ dnl pipe id, pcm, max channels, format, dnl frames, period, priority, core, dnl time_domain) define(`PIPELINE_PCM_ADD', +`ifelse(`$#', `9', `undefine(`PCM_ID')' `undefine(`PIPELINE_ID')' `undefine(`PIPELINE_CHANNELS')' @@ -61,6 +62,7 @@ define(`PIPELINE_PCM_ADD', `define(`DAI_FORMAT', $5)' `include($1)' `DEBUG_PCM_ADD($1, $3)' +,`fatal_error(`Invalid parameters ($#) to PIPELINE_PCM_ADD')')' ) dnl PIPELINE_PCM_DAI_ADD(pipeline, @@ -69,6 +71,7 @@ dnl frames, period, priority, core, dnl dai type, dai_index, dai format, dnl periods, time_domain) define(`PIPELINE_PCM_DAI_ADD', +`ifelse(`$#', `13', `undefine(`PCM_ID')' `undefine(`PIPELINE_ID')' `undefine(`PIPELINE_CHANNELS')' @@ -97,6 +100,7 @@ define(`PIPELINE_PCM_DAI_ADD', `define(`DAI_PERIODS', $13)' `define(`DAI_NAME', $10$11)' `include($1)' +,`fatal_error(`Invalid parameters ($#) to PIPELINE_PCM_DAI_ADD')')' ) dnl PIPELINE_ADD(pipeline, @@ -104,6 +108,7 @@ dnl pipe id, max channels, format, dnl frames, period, priority, core, dnl sched_comp, time_domain) define(`PIPELINE_ADD', +`ifelse(`$#', `9', `undefine(`PIPELINE_ID')' `undefine(`PIPELINE_CHANNELS')' `undefine(`PIPELINE_FORMAT')' @@ -122,6 +127,7 @@ define(`PIPELINE_ADD', `define(`SCHEDULE_TIME_DOMAIN', $10)' `define(`SCHED_COMP', $9)' `include($1)' +,`fatal_error(`Invalid parameters ($#) to PIPELINE_ADD')')' ) divert(0)dnl