Catcrafts/audioreach-topology
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #21 from krzk/cleanup

Browse source 
Cleanup
This commit is contained in:
Srini 2025-06-18 12:14:26 +01:00 • committed by GitHub
commit bfb067ce40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
audioreach/subgraph-device-codec-dma-capture.m4
View file

@ -10,7 +10,7 @@ include(`util/mixer.m4') dnl
dnl dnl
# #
# SubGraph for Device Backend # SubGraph for Device Backend
# #
# ___________________________ # ___________________________
# | Sub Graph | # | Sub Graph |
# [KControl]->| [DEVICE-TX] <- [LOGGER] | # [KControl]->| [DEVICE-TX] <- [LOGGER] |
@ -48,7 +48,7 @@ define(`DEVICE_CAPTURE_ROUTE',
`SectionGraph."NAME_PREFIX.$1 $2 Graph" {' `SectionGraph."NAME_PREFIX.$1 $2 Graph" {'
` index STR($1)' ` index STR($1)'
` lines [' ` lines ['
` "NAME_PREFIX.codec_dma_tx$1, , $2 Capture"' ` "NAME_PREFIX.codec_dma_tx$1, , $2 Capture"'
` "NAME_PREFIX.logger$1, , NAME_PREFIX.codec_dma_tx$1"' ` "NAME_PREFIX.logger$1, , NAME_PREFIX.codec_dma_tx$1"'
` ]' ` ]'
`}') `}')
@ -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_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, 1, 2, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME', LOG_MODULE_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) AR_MODULE_LOG( MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019ab, 1, 0, NONE_IID)
dnl kcontrol switch dnl kcontrol switch
DEVICE_CAPTURE_MIXER(SG_INDEX, `DEVICE_NAME') DEVICE_CAPTURE_MIXER(SG_INDEX, `DEVICE_NAME')
DEVICE_CAPTURE_ROUTE(MOD_INDEX, `DEVICE_NAME') DEVICE_CAPTURE_ROUTE(MOD_INDEX, `DEVICE_NAME')

7
audioreach/subgraph-stream-capture.m4
View file

@ -12,7 +12,7 @@ include(`audioreach/module_log.m4') dnl
include(`util/mixer.m4') dnl include(`util/mixer.m4') dnl
dnl dnl
# SubGraph for PCM Capture # SubGraph for PCM Capture
# #
# ______________________________________________ # ______________________________________________
# | Sub Graph 1 | # | Sub Graph 1 |
# | [RD_SH]<-- [PCM ENC] <--[PCM CONV] <--[LOG] |-[DAPM - MIXER] # | [RD_SH]<-- [PCM ENC] <--[PCM CONV] <--[LOG] |-[DAPM - MIXER]
@ -64,11 +64,12 @@ 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) 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, src-mod, src-port, dst-mod, 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)
AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 1, 2, 0x000019af, 1, 0,MFC_MODULE_IID) 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_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_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_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) 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) STREAM_CAPTURE_ROUTE(MOD_INDEX, PCM_DAI_ID)