From 7ce84929f25e69a90180413e025d21f2fc3bc2d0 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Wed, 16 Apr 2025 13:21:11 +0100 Subject: [PATCH] audioreach: cleanup unused in-ports and outports numbers Looks like there is a leftover from old code, AR_TKN_U32_MODULE_IN_PORTS and AR_TKN_U32_MODULE_OUT_PORTS is reduntant to AR_TKN_U32_MODULE_SRC_OP_PORT_ID* and AR_TKN_U32_MODULE_DST_IN_PORT_ID* Signed-off-by: Srinivas Kandagatla --- audioreach/module_codec_dma.m4 | 34 ++++++++----------- audioreach/module_dp.m4 | 12 +++---- audioreach/module_fir.m4 | 8 ++--- audioreach/module_i2s.m4 | 18 +++++----- audioreach/module_log.m4 | 16 ++++----- audioreach/module_mfc.m4 | 10 +++--- audioreach/module_pcmcnv.m4 | 12 +++---- audioreach/module_pcmdec.m4 | 12 +++---- audioreach/module_pcmenc.m4 | 12 +++---- audioreach/module_placeholder_decoder.m4 | 12 +++---- audioreach/module_rdsh.m4 | 12 +++---- audioreach/module_vol_ctrl.m4 | 10 +++--- audioreach/module_wrsh.m4 | 12 +++---- .../subgraph-compress-stream-vol-playback.m4 | 10 +++--- .../subgraph-device-codec-dma-capture.m4 | 4 +-- .../subgraph-device-codec-dma-playback.m4 | 6 ++-- .../subgraph-device-display-port-playback.m4 | 4 +-- audioreach/subgraph-device-i2s-playback.m4 | 4 +-- audioreach/subgraph-stream-capture.m4 | 12 +++---- audioreach/subgraph-stream-playback.m4 | 8 ++--- audioreach/subgraph-stream-vol-playback.m4 | 12 +++---- audioreach/tokens.m4 | 2 -- 22 files changed, 106 insertions(+), 136 deletions(-) diff --git a/audioreach/module_codec_dma.m4 b/audioreach/module_codec_dma.m4 index 75f47f3..3898e25 100644 --- a/audioreach/module_codec_dma.m4 +++ b/audioreach/module_codec_dma.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_CODEC_DMA_RX(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_CODEC_DMA_RX(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl hw-if-type, hw-if-idx, fmt, dev-name, dst-iid) define(`AR_MODULE_CODEC_DMA_RX', `' @@ -13,15 +13,13 @@ define(`AR_MODULE_CODEC_DMA_RX', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_CODEC_DMA_SINK)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($15)' -` AR_TKN_U32_MODULE_HW_IF_TYPE STR($11)' -` AR_TKN_U32_MODULE_HW_IF_IDX STR($12)' -` AR_TKN_U32_MODULE_FMT_DATA STR($13)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($13)' +` AR_TKN_U32_MODULE_HW_IF_TYPE STR($9)' +` AR_TKN_U32_MODULE_HW_IF_IDX STR($10)' +` AR_TKN_U32_MODULE_FMT_DATA STR($11)' ` }' `}' `' @@ -33,7 +31,7 @@ define(`AR_MODULE_CODEC_DMA_RX', ` index STR($1)' ` type "aif_in"' ` no_pm "true"' -` stream_name "$14 Playback"' +` stream_name "$12 Playback"' ` subseq "10"' ` data [' ` "NAME_PREFIX.sub_graph$2_data"' @@ -54,15 +52,13 @@ define(`AR_MODULE_CODEC_DMA_TX', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_CODEC_DMA_SOURCE)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($15)' -` AR_TKN_U32_MODULE_HW_IF_TYPE STR($11)' -` AR_TKN_U32_MODULE_HW_IF_IDX STR($12)' -` AR_TKN_U32_MODULE_FMT_DATA STR($13)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($13)' +` AR_TKN_U32_MODULE_HW_IF_TYPE STR($9)' +` AR_TKN_U32_MODULE_HW_IF_IDX STR($10)' +` AR_TKN_U32_MODULE_FMT_DATA STR($11)' ` }' `}' `' @@ -74,7 +70,7 @@ define(`AR_MODULE_CODEC_DMA_TX', ` index STR($1)' ` type "aif_out"' ` no_pm "true"' -` stream_name "$14 Capture"' +` stream_name "$12 Capture"' ` subseq "10"' ` data [' ` "NAME_PREFIX.sub_graph$2_data"' diff --git a/audioreach/module_dp.m4 b/audioreach/module_dp.m4 index 360af43..0fef64c 100644 --- a/audioreach/module_dp.m4 +++ b/audioreach/module_dp.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_DISPLAY_PORT_SINK(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_DISPLAY_PORT_SINK(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl hw-if-type, hw-if-idx, fmt, dev-name, dst-iid) define(`AR_MODULE_DISPLAY_PORT_SINK', `' @@ -13,13 +13,11 @@ define(`AR_MODULE_DISPLAY_PORT_SINK', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_DISPLAY_PORT_SINK)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_FMT_DATA STR($13)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($15)' +` AR_TKN_U32_MODULE_FMT_DATA STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($13)' ` }' `}' `' diff --git a/audioreach/module_fir.m4 b/audioreach/module_fir.m4 index b867b9c..a1e09be 100644 --- a/audioreach/module_fir.m4 +++ b/audioreach/module_fir.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_FIR(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port) +dnl AR_MODULE_FIR(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port) define(`AR_MODULE_FIR', `' `SectionVendorTuples."NAME_PREFIX.fir$1_tuples" {' @@ -12,10 +12,8 @@ define(`AR_MODULE_FIR', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_FIR)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` }' `}' `' diff --git a/audioreach/module_i2s.m4 b/audioreach/module_i2s.m4 index df92d2f..f144145 100644 --- a/audioreach/module_i2s.m4 +++ b/audioreach/module_i2s.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_I2S_RX(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_I2S_RX(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl hw-if-type, hw-if-idx, fmt, sd-line-idx, dev-name, dst-iid) define(`AR_MODULE_I2S_RX', `' @@ -13,16 +13,14 @@ define(`AR_MODULE_I2S_RX', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_I2S_SINK)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($16)' -` AR_TKN_U32_MODULE_HW_IF_TYPE STR($11)' -` AR_TKN_U32_MODULE_HW_IF_IDX STR($12)' -` AR_TKN_U32_MODULE_FMT_DATA STR($13)' -` AR_TKN_U32_MODULE_SD_LINE_IDX STR($14)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($14)' +` AR_TKN_U32_MODULE_HW_IF_TYPE STR($9)' +` AR_TKN_U32_MODULE_HW_IF_IDX STR($10)' +` AR_TKN_U32_MODULE_FMT_DATA STR($11)' +` AR_TKN_U32_MODULE_SD_LINE_IDX STR($12)' ` }' `}' `' diff --git a/audioreach/module_log.m4 b/audioreach/module_log.m4 index 65f034c..96140e7 100644 --- a/audioreach/module_log.m4 +++ b/audioreach/module_log.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_LOG(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_LOG(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl log-code, log-tap-point, log-mode, dst-iid) define(`AR_MODULE_LOG', `' @@ -13,15 +13,13 @@ define(`AR_MODULE_LOG', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_LOG)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($14)' -` AR_TKN_U32_MODULE_LOG_CODE STR($11)' -` AR_TKN_U32_MODULE_LOG_TAP_POINT_ID STR($12)' -` AR_TKN_U32_MODULE_LOG_MODE STR($13)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' +` AR_TKN_U32_MODULE_LOG_CODE STR($9)' +` AR_TKN_U32_MODULE_LOG_TAP_POINT_ID STR($10)' +` AR_TKN_U32_MODULE_LOG_MODE STR($11)' ` }' `}' `' diff --git a/audioreach/module_mfc.m4 b/audioreach/module_mfc.m4 index f647065..eb48f58 100644 --- a/audioreach/module_mfc.m4 +++ b/audioreach/module_mfc.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_MFC(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, dst-iid) +dnl AR_MODULE_MFC(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dst-iid) define(`AR_MODULE_MFC', `' `SectionVendorTuples."NAME_PREFIX.mfc$1_tuples" {' @@ -12,12 +12,10 @@ define(`AR_MODULE_MFC', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_MFC)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($9)' ` }' `}' `' diff --git a/audioreach/module_pcmcnv.m4 b/audioreach/module_pcmcnv.m4 index 90d41fc..5941bc4 100644 --- a/audioreach/module_pcmcnv.m4 +++ b/audioreach/module_pcmcnv.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_PCMCNV(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_PCMCNV(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl interleave, dst-iid) define(`AR_MODULE_PCMCNV', `' @@ -13,13 +13,11 @@ define(`AR_MODULE_PCMCNV', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_PCM_CNV)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' -` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($10)' +` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($9)' ` }' `}' `' diff --git a/audioreach/module_pcmdec.m4 b/audioreach/module_pcmdec.m4 index 60aa5a2..2413bdc 100644 --- a/audioreach/module_pcmdec.m4 +++ b/audioreach/module_pcmdec.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_PCMDEC(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_PCMDEC(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl interleav, dst-iid) define(`AR_MODULE_PCMDEC', `' @@ -13,13 +13,11 @@ define(`AR_MODULE_PCMDEC', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_PCM_DEC)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' -` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($10)' +` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($9)' ` }' `}' `' diff --git a/audioreach/module_pcmenc.m4 b/audioreach/module_pcmenc.m4 index 3887984..311b0cc 100644 --- a/audioreach/module_pcmenc.m4 +++ b/audioreach/module_pcmenc.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_PCMENC(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_PCMENC(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl interleav, dst-iid) define(`AR_MODULE_PCMENC', `' @@ -13,13 +13,11 @@ define(`AR_MODULE_PCMENC', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_PCM_ENC)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' -` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($10)' +` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($9)' ` }' `}' `' diff --git a/audioreach/module_placeholder_decoder.m4 b/audioreach/module_placeholder_decoder.m4 index a539e0d..f906d91 100644 --- a/audioreach/module_placeholder_decoder.m4 +++ b/audioreach/module_placeholder_decoder.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_PLACEHOLDER_DECODER(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, +dnl AR_MODULE_PLACEHOLDER_DECODER(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dnl interleav, dst-iid) define(`AR_MODULE_PLACEHOLDER_DECODER', `' @@ -13,13 +13,11 @@ define(`AR_MODULE_PLACEHOLDER_DECODER', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_PLACEHOLDER_DECODER)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' -` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($10)' +` AR_TKN_U32_MODULE_FMT_INTERLEAVE STR($9)' ` }' `}' `' diff --git a/audioreach/module_rdsh.m4 b/audioreach/module_rdsh.m4 index eb65a86..f6a9784 100644 --- a/audioreach/module_rdsh.m4 +++ b/audioreach/module_rdsh.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_RDSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, pcm-idx, dst-iid) +dnl AR_MODULE_RDSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, pcm-idx, dst-iid) define(`AR_MODULE_RDSH', `' `SectionVendorTuples."NAME_PREFIX.rdsh_ep$1_tuples" {' @@ -11,12 +11,10 @@ define(`AR_MODULE_RDSH', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_RD_SHARED_MEM_EP)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($10)' ` }' `}' `' @@ -28,7 +26,7 @@ define(`AR_MODULE_RDSH', ` index STR($1)' ` type "aif_out"' ` no_pm "true"' -` stream_name "`MultiMedia'eval($11 + 1)` Capture'"' +` stream_name "`MultiMedia'eval($9 + 1)` Capture'"' ` subseq "10"' ` data [' ` "NAME_PREFIX.sub_graph$2_data"' diff --git a/audioreach/module_vol_ctrl.m4 b/audioreach/module_vol_ctrl.m4 index 441bb87..b255466 100644 --- a/audioreach/module_vol_ctrl.m4 +++ b/audioreach/module_vol_ctrl.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_VOL_CTRL(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, dist-iid +dnl AR_MODULE_VOL_CTRL(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, dist-iid define(`AR_MODULE_VOL_CTRL', `SectionVendorTuples."NAME_PREFIX.vol_ctrl$1_tuples" {' ` tokens "audioreach_tokens"' @@ -11,12 +11,10 @@ define(`AR_MODULE_VOL_CTRL', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_VOL_CTRL)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($11)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($9)' ` }' `}' `' diff --git a/audioreach/module_wrsh.m4 b/audioreach/module_wrsh.m4 index 6fdabb5..1fbb67a 100644 --- a/audioreach/module_wrsh.m4 +++ b/audioreach/module_wrsh.m4 @@ -1,7 +1,7 @@ # Copyright, Linaro Ltd, 2023 # SPDX-License-Identifier: BSD-3-Clause include(`util/util.m4') dnl -dnl AR_MODULE_WRSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, pcm-index, dst-iid) +dnl AR_MODULE_WRSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-port, dst-port, pcm-index, dst-iid) define(`AR_MODULE_WRSH', `' `SectionVendorTuples."NAME_PREFIX.wrsh_ep$1_tuples" {' @@ -11,12 +11,10 @@ define(`AR_MODULE_WRSH', ` AR_TKN_U32_MODULE_ID STR(MODULE_ID_WR_SHARED_MEM_EP)' ` AR_TKN_U32_MODULE_MAX_IP_PORTS STR($5)' ` AR_TKN_U32_MODULE_MAX_OP_PORTS STR($6)' -` AR_TKN_U32_MODULE_IN_PORTS STR($7)' -` AR_TKN_U32_MODULE_OUT_PORTS STR($8)' -` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($9)' -` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($10)' +` AR_TKN_U32_MODULE_SRC_OP_PORT_ID STR($7)' +` AR_TKN_U32_MODULE_DST_IN_PORT_ID STR($8)' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID STR($4)' -` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($12)' +` AR_TKN_U32_MODULE_DST_INSTANCE_ID STR($10)' ` }' `}' `' @@ -28,7 +26,7 @@ define(`AR_MODULE_WRSH', ` index STR($1)' ` type "aif_in"' ` no_pm "true"' -` stream_name "`MultiMedia'eval($11 + 1)` Playback'"' +` stream_name "`MultiMedia'eval($9 + 1)` Playback'"' ` subseq "10"' ` data [' ` "NAME_PREFIX.sub_graph$2_data"' diff --git a/audioreach/subgraph-compress-stream-vol-playback.m4 b/audioreach/subgraph-compress-stream-vol-playback.m4 index be3ef84..42fa536 100644 --- a/audioreach/subgraph-compress-stream-vol-playback.m4 +++ b/audioreach/subgraph-compress-stream-vol-playback.m4 @@ -65,10 +65,10 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP) -AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 0, 0, 1, 2, PCM_DAI_ID, PHDEC_MODULE_IID) -AR_MODULE_PLACEHOLDER_DECODER(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PHDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID) -AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED,VOLCTRL_MODULE_IID) -AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2,LOG_MODULE_IID) -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019af, 1, 0, NONE_IID) +AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 1, 2, PCM_DAI_ID, PHDEC_MODULE_IID) +AR_MODULE_PLACEHOLDER_DECODER(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PHDEC_MODULE_IID, 1, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID) +AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED,VOLCTRL_MODULE_IID) +AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 1, 2,LOG_MODULE_IID) +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019af, 1, 0, NONE_IID) STREAM_PLAYBACK_MIXER(PCM_DAI_ID, SG_INDEX) STREAM_PLAYBACK_ROUTE(PCM_DAI_ID, MOD_INDEX) diff --git a/audioreach/subgraph-device-codec-dma-capture.m4 b/audioreach/subgraph-device-codec-dma-capture.m4 index 12a6cc7..397f092 100644 --- a/audioreach/subgraph-device-codec-dma-capture.m4 +++ b/audioreach/subgraph-device-codec-dma-capture.m4 @@ -57,8 +57,8 @@ AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRE AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID) -AR_MODULE_CODEC_DMA_TX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 0, 1, 0, 2, 1, 2, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', LOG_MODULE_IID) -AR_MODULE_LOG( MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0, NONE_IID) +AR_MODULE_CODEC_DMA_TX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 0, 1, 1, 2, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', LOG_MODULE_IID) +AR_MODULE_LOG( MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019ab, 1, 0, NONE_IID) dnl kcontrol switch DEVICE_CAPTURE_MIXER(SG_INDEX, `DEVICE_NAME') DEVICE_CAPTURE_ROUTE(MOD_INDEX, `DEVICE_NAME') diff --git a/audioreach/subgraph-device-codec-dma-playback.m4 b/audioreach/subgraph-device-codec-dma-playback.m4 index 2badec2..4554a32 100644 --- a/audioreach/subgraph-device-codec-dma-playback.m4 +++ b/audioreach/subgraph-device-codec-dma-playback.m4 @@ -65,8 +65,8 @@ define(`DEVICE_PLAYBACK_ROUTE', AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRECTION, CONT_SENARIO_ID) AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID) -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0, MFC_MODULE_IID) -AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 2, 1, 1, 2, CDC_DMA_MODULE_IID) -AR_MODULE_CODEC_DMA_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', NONE_IID) +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019ab, 1, 0, MFC_MODULE_IID) +AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 1, 2, CDC_DMA_MODULE_IID) +AR_MODULE_CODEC_DMA_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 1, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', NONE_IID) DEVICE_PLAYBACK_ROUTE(MOD_INDEX, `DEVICE_NAME') diff --git a/audioreach/subgraph-device-display-port-playback.m4 b/audioreach/subgraph-device-display-port-playback.m4 index 60372a8..ef3730e 100644 --- a/audioreach/subgraph-device-display-port-playback.m4 +++ b/audioreach/subgraph-device-display-port-playback.m4 @@ -59,7 +59,7 @@ define(`DEVICE_PLAYBACK_ROUTE', AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRECTION, CONT_SENARIO_ID) AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID) -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0, DISPLAY_PORT_SINK_MODULE_IID) -AR_MODULE_DISPLAY_PORT_SINK(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, DISPLAY_PORT_SINK_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', NONE_IID) +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019ab, 1, 0, DISPLAY_PORT_SINK_MODULE_IID) +AR_MODULE_DISPLAY_PORT_SINK(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, DISPLAY_PORT_SINK_MODULE_IID, 1, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', NONE_IID) DEVICE_PLAYBACK_ROUTE(MOD_INDEX, `DEVICE_NAME', `MIXER_PREFIX') diff --git a/audioreach/subgraph-device-i2s-playback.m4 b/audioreach/subgraph-device-i2s-playback.m4 index f217c05..8a08304 100644 --- a/audioreach/subgraph-device-i2s-playback.m4 +++ b/audioreach/subgraph-device-i2s-playback.m4 @@ -60,7 +60,7 @@ define(`DEVICE_PLAYBACK_ROUTE', AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRECTION, CONT_SENARIO_ID) AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID) -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0,I2S_MODULE_IID ) -AR_MODULE_I2S_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, I2S_MODULE_IID, 1, 0, 2, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, DEVICE_SD_LINE_IDX, `DEVICE_NAME', NONE_IID) +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019ab, 1, 0,I2S_MODULE_IID ) +AR_MODULE_I2S_RX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, I2S_MODULE_IID, 1, 0, 1, 0, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, DEVICE_SD_LINE_IDX, `DEVICE_NAME', NONE_IID) DEVICE_PLAYBACK_ROUTE(MOD_INDEX, `DEVICE_NAME', `MIXER_PREFIX') diff --git a/audioreach/subgraph-stream-capture.m4 b/audioreach/subgraph-stream-capture.m4 index 6722fbc..49f0f7f 100644 --- a/audioreach/subgraph-stream-capture.m4 +++ b/audioreach/subgraph-stream-capture.m4 @@ -64,11 +64,11 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, PCM_DOMAIN_ID) -dnl AR_MODULE_LOG(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-mod, src-port, dst-mod, dst-port, -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019af, 1, 0,MFC_MODULE_IID) -AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCMCNV_MODULE_IID) -AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, PCMENC_MODULE_IID) -AR_MODULE_PCMENC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMENC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, RDSH_MODULE_IID) -AR_MODULE_RDSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, RDSH_MODULE_IID, 1, 0, 2, 0, 1, 0, PCM_DAI_ID, NONE_IID) +dnl AR_MODULE_LOG(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, src-mod, src-port, dst-mod, dst-port, +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019af, 1, 0,MFC_MODULE_IID) +AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 1, 2, PCMCNV_MODULE_IID) +AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 1, 2, PCM_INTERLEAVED, PCMENC_MODULE_IID) +AR_MODULE_PCMENC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMENC_MODULE_IID, 1, 1, 1, 2, PCM_INTERLEAVED, RDSH_MODULE_IID) +AR_MODULE_RDSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, RDSH_MODULE_IID, 1, 0, 1, 0, PCM_DAI_ID, NONE_IID) STREAM_CAPTURE_ROUTE(MOD_INDEX, PCM_DAI_ID) diff --git a/audioreach/subgraph-stream-playback.m4 b/audioreach/subgraph-stream-playback.m4 index 8538b53..9e7277f 100644 --- a/audioreach/subgraph-stream-playback.m4 +++ b/audioreach/subgraph-stream-playback.m4 @@ -61,9 +61,9 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP) -AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 0, 0, 0, 2, PCM_DAI_ID,PCMDEC_MODULE_IID) -AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, PCMCNV_MODULE_IID) -AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED, LOG_MODULE_IID) -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019af, 1, 0, NONE_IID) +AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 0, 2, PCM_DAI_ID,PCMDEC_MODULE_IID) +AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMDEC_MODULE_IID, 1, 1, 1, 2, PCM_INTERLEAVED, PCMCNV_MODULE_IID) +AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED, LOG_MODULE_IID) +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019af, 1, 0, NONE_IID) STREAM_PLAYBACK_MIXER(PCM_DAI_ID, SG_INDEX) STREAM_PLAYBACK_ROUTE(MOD_INDEX) diff --git a/audioreach/subgraph-stream-vol-playback.m4 b/audioreach/subgraph-stream-vol-playback.m4 index fdc8f3a..78b4b4a 100644 --- a/audioreach/subgraph-stream-vol-playback.m4 +++ b/audioreach/subgraph-stream-vol-playback.m4 @@ -67,11 +67,11 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP) -AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 0, 0, 1, 2, PCM_DAI_ID, PCMDEC_MODULE_IID) -AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID) -AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED,VOLCTRL_MODULE_IID) -AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2,MFC_MODULE_IID) -AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 2, 1, 1, 2, LOG_MODULE_IID) -AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019af, 1, 0, NONE_IID) +AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 1, 2, PCM_DAI_ID, PCMDEC_MODULE_IID) +AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMDEC_MODULE_IID, 1, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID) +AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED,VOLCTRL_MODULE_IID) +AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 1, 2,MFC_MODULE_IID) +AR_MODULE_MFC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, MFC_MODULE_IID, 1, 1, 1, 2, LOG_MODULE_IID) +AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019af, 1, 0, NONE_IID) STREAM_PLAYBACK_MIXER(PCM_DAI_ID, SG_INDEX) STREAM_PLAYBACK_ROUTE(PCM_DAI_ID, MOD_INDEX) diff --git a/audioreach/tokens.m4 b/audioreach/tokens.m4 index 7706af5..7dd4636 100644 --- a/audioreach/tokens.m4 +++ b/audioreach/tokens.m4 @@ -15,8 +15,6 @@ ` AR_TKN_U32_MODULE_INSTANCE_ID "201"' ` AR_TKN_U32_MODULE_MAX_IP_PORTS "202"' ` AR_TKN_U32_MODULE_MAX_OP_PORTS "203"' -` AR_TKN_U32_MODULE_IN_PORTS "204"' -` AR_TKN_U32_MODULE_OUT_PORTS "205"' ` AR_TKN_U32_MODULE_SRC_OP_PORT_ID "206"' ` AR_TKN_U32_MODULE_DST_IN_PORT_ID "207"' ` AR_TKN_U32_MODULE_SRC_INSTANCE_ID "208"'