From 90fbcd54f3c0ee562a7557c9d010099c73536cf8 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 27 Mar 2019 18:00:39 +0200 Subject: [PATCH] topology: add param check to DAI_CONFIG() Abort build if not all mandatory arguments are passed to the macro. Signed-off-by: Kai Vehmanen --- tools/topology/m4/dai.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/topology/m4/dai.m4 b/tools/topology/m4/dai.m4 index d904555b7..4e7816b2c 100644 --- a/tools/topology/m4/dai.m4 +++ b/tools/topology/m4/dai.m4 @@ -125,9 +125,8 @@ define(`D_DAI', `SectionDAI."'N_DAI`" {' dnl DAI Config) define(`N_DAI_CONFIG', `DAICONFIG.'$1) - dnl DAI_CONFIG(type, idx, link_id, name, ssp_config/dmic_config) -define(`DAI_CONFIG', +define(`DO_DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$3`"' @@ -164,6 +163,11 @@ define(`DAI_CONFIG', `DEBUG_DAI_CONFIG($1, $3)' ) +dnl DAI_CONFIG(type, idx, link_id, name, ssp_config/dmic_config) +define(`DAI_CONFIG', +`ifelse(`$#', `5', `DO_DAI_CONFIG($1, $2, $3, $4, $5)', `$#', `4', `DO_DAI_CONFIG($1, $2, $3, $4)', `fatal_error(`Invalid parameters ($#) to DAI_CONFIG')')' +) + dnl DAI_ADD(pipeline, dnl pipe id, dai type, dai_index, dai_be, dnl buffer, periods, format,