Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 5 additions & 39 deletions src/include/uapi/ipc/topology.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -165,21 +166,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;
Expand Down Expand Up @@ -211,14 +197,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;
Expand Down Expand Up @@ -289,16 +267,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 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general it's OK for me. I only think sof_ipc_process_type shall be removed as we don't use it at all.

After a talk with validation team I think we should keep components structures here in src/include/uapi/ipc/topology.h and remove them from components header files. Validation team is referenced as code-owner of this file and any change in common structures is automaticly visible by them so they can quickly provide a feedback and/or apply changes in the slim driver.
So in case of KPB for example we should move struct sof_kpb_config here. Same thing for detector, selector etc.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrajwa as what we aligned, let's move sof_kpb_config to src/include/uapi/user/kpb.h, that should belong to another PR.

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