diff --git a/src/include/ipc4/module.h b/src/include/ipc4/module.h index b399e771dd84..cf5f60b453bc 100644 --- a/src/include/ipc4/module.h +++ b/src/include/ipc4/module.h @@ -407,10 +407,10 @@ struct ipc4_module_load_library { } data; } __packed __aligned(4); -#define IPC4_COMP_ID(x, y) ((x) << 16 | (y)) -#define IPC4_MOD_ID(x) ((x) >> 16) -#define IPC4_INST_ID(x) ((x) & 0xffff) -#define IPC4_SRC_QUEUE_ID(x) (((x) >> 16) & 0xffff) -#define IPC4_SINK_QUEUE_ID(x) ((x) & 0xffff) +#define IPC4_COMP_ID(x, y) ((y) << 16 | (x)) +#define IPC4_MOD_ID(x) ((x) & 0xffff) +#define IPC4_INST_ID(x) ((x) >> 16) +#define IPC4_SRC_QUEUE_ID(x) ((x) & 0xffff) +#define IPC4_SINK_QUEUE_ID(x) (((x) >> 16) & 0xffff) #endif diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c index 8c896a3ae498..46a4ff1e3f1b 100644 --- a/src/ipc/ipc4/helper.c +++ b/src/ipc/ipc4/helper.c @@ -50,8 +50,6 @@ LOG_MODULE_DECLARE(ipc, CONFIG_SOF_LOG_LEVEL); -#define IPC4_MOD_ID(x) ((x) >> 16) - extern struct tr_ctx comp_tr; void ipc_build_stream_posn(struct sof_ipc_stream_posn *posn, uint32_t type,