From cd3713372e6adff73a95894ca4e742cc3157b764 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Wed, 24 Apr 2019 14:48:11 +0800 Subject: [PATCH 1/2] abi: ipc: topology: remove unused structures For selector and kpb, we have switched to use byte kcontrols, so no ipc structures needed to align b/w FW and driver, here remove them to align with driver side. The sof_ipc_process_type enum is not needed, remove it also. Signed-off-by: Keyon Jie --- src/include/uapi/ipc/topology.h | 35 --------------------------------- 1 file changed, 35 deletions(-) diff --git a/src/include/uapi/ipc/topology.h b/src/include/uapi/ipc/topology.h index c9d91c0bc41d..bf554b8491b3 100644 --- a/src/include/uapi/ipc/topology.h +++ b/src/include/uapi/ipc/topology.h @@ -165,21 +165,6 @@ struct sof_ipc_comp_volume { uint32_t initial_ramp; /**< ramp space in ms */ } __attribute__((packed)); -/* generic selector component */ -struct sof_ipc_comp_selector { - struct sof_ipc_comp comp; - struct sof_ipc_comp_config config; - - /* selector supports 1 input and 1 output */ - uint32_t input_channels_count; /**< accepted values 2 or 4 */ - uint32_t output_channels_count; /**< accepted values 1 or 2 or 4 */ - - /* note: if 2 or 4 output channels selected, the component works - * in a bypass mode - */ - uint32_t selected_channel; /**< 0..3 */ -} __attribute__((packed)); - /* generic SRC component */ struct sof_ipc_comp_src { struct sof_ipc_comp comp; @@ -211,14 +196,6 @@ struct sof_ipc_comp_tone { int32_t ramp_step; } __attribute__((packed)); -/** \brief Types of processing components */ -enum sof_ipc_process_type { - SOF_PROCESS_NONE = 0, /**< None */ - SOF_PROCESS_EQFIR, /**< Intel FIR */ - SOF_PROCESS_EQIIR, /**< Intel IIR */ - SOF_PROCESS_KEYWORD_DETECT, /**< Keyword Detection */ -}; - /* generic "effect", "codec" or proprietary processing component */ struct sof_ipc_comp_process { struct sof_ipc_comp comp; @@ -289,16 +266,4 @@ struct sof_ipc_pipe_comp_connect { uint32_t sink_id; } __attribute__((packed)); -/* create new component kpb - SOF_IPC_TPLG_KPB_NEW */ -struct sof_ipc_comp_kpb { - struct sof_ipc_comp comp; - struct sof_ipc_comp_config config; - uint32_t size; /**< kpb size in bytes */ - uint32_t caps; /**< SOF_MEM_CAPS_ */ - uint8_t no_channels; /**< no of channels */ - uint32_t history_depth; /**< time of buffering in milliseconds */ - uint32_t sampling_freq; /**< frequency in hertz */ - uint8_t sampling_width; /**< number of bits */ -} __attribute__((packed)); - #endif From dfa11ea0b5d4094b03d5307fe02daf0743694665 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Wed, 24 Apr 2019 14:38:27 +0800 Subject: [PATCH 2/2] abi: ipc: topology: align header definition with driver No abi bump is needed, as driver already run with this header for weeks, here it is only to fix the gap b/w FW and driver. Signed-off-by: Keyon Jie --- src/include/uapi/ipc/topology.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/include/uapi/ipc/topology.h b/src/include/uapi/ipc/topology.h index bf554b8491b3..6322f16018fa 100644 --- a/src/include/uapi/ipc/topology.h +++ b/src/include/uapi/ipc/topology.h @@ -62,11 +62,12 @@ enum sof_comp_type { SOF_COMP_BUFFER, SOF_COMP_EQ_IIR, SOF_COMP_EQ_FIR, - SOF_COMP_FILEREAD, /**< host test based file IO */ - SOF_COMP_FILEWRITE, /**< host test based file IO */ - SOF_COMP_KPB, /* A key phrase buffer component */ - SOF_COMP_SELECTOR, SOF_COMP_KEYWORD_DETECT, + SOF_COMP_KPB, /* A key phrase buffer component */ + SOF_COMP_SELECTOR, /**< channel selector component */ + /* keep FILEREAD/FILEWRITE as the last ones */ + SOF_COMP_FILEREAD = 10000, /**< host test based file IO */ + SOF_COMP_FILEWRITE = 10001, /**< host test based file IO */ }; /* XRUN action for component */