Skip to content

Commit fe0aea9

Browse files
author
Jyri Sarha
committed
ipc4: module: Rename ipc4_module_init_ext_obj_dp_data to *mem_data
Rename struct ipc4_module_init_ext_obj_dp_data to struct ipc4_module_init_ext_obj_mem_data and make corresponding change to all related items. The data is not to be used exclusively for Data Processing components, but also for regular Low Latency modules. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
1 parent efbc7c4 commit fe0aea9

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/audio/module_adapter/module_adapter_ipc4.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@ module_ext_init_decode(struct comp_dev *dev, struct module_config *dst,
6060
return NULL;
6161
}
6262
switch (obj->object_id) {
63-
case IPC4_MOD_INIT_DATA_ID_DP_DATA:
63+
case IPC4_MOD_INIT_DATA_ID_MEM_DATA:
6464
{
65-
/* Get dp_data struct that follows the obj struct */
66-
const struct ipc4_module_init_ext_obj_dp_data *dp_data =
67-
(const struct ipc4_module_init_ext_obj_dp_data *)(obj + 1);
65+
/* Get mem_data struct that follows the obj struct */
66+
const struct ipc4_module_init_ext_obj_mem_data *mem_data =
67+
(const struct ipc4_module_init_ext_obj_mem_data *)(obj + 1);
6868

69-
if (obj->object_words * sizeof(uint32_t) < sizeof(*dp_data)) {
70-
comp_err(dev, "dp_data object too small %u < %u",
71-
obj->object_words * sizeof(uint32_t), sizeof(*dp_data));
69+
if (obj->object_words * sizeof(uint32_t) < sizeof(*mem_data)) {
70+
comp_err(dev, "mem_data object too small %u < %u",
71+
obj->object_words * sizeof(uint32_t), sizeof(*mem_data));
7272
return NULL;
7373
}
74-
dst->domain_id = dp_data->domain_id;
75-
dst->stack_bytes = dp_data->stack_bytes;
76-
dst->heap_bytes = dp_data->heap_bytes;
77-
comp_info(dev, "init_ext_obj_dp_data domain %u stack %u heap %u",
78-
dp_data->domain_id, dp_data->stack_bytes, dp_data->heap_bytes);
74+
dst->domain_id = mem_data->domain_id;
75+
dst->stack_bytes = mem_data->stack_bytes;
76+
dst->heap_bytes = mem_data->heap_bytes;
77+
comp_info(dev, "init_ext_obj_mem_data domain %u stack %u heap %u",
78+
mem_data->domain_id, mem_data->stack_bytes, mem_data->heap_bytes);
7979
break;
8080
}
8181
default:

src/include/ipc4/module.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ struct ipc4_vendor_error {
7676
/* IDs for all global object types in struct ipc4_module_init_ext_object */
7777
enum ipc4_mod_init_data_glb_id {
7878
IPC4_MOD_INIT_DATA_ID_INVALID = 0,
79-
IPC4_MOD_INIT_DATA_ID_DP_DATA = 1,
80-
IPC4_MOD_INIT_DATA_ID_MAX = IPC4_MOD_INIT_DATA_ID_DP_DATA,
79+
IPC4_MOD_INIT_DATA_ID_MEM_DATA = 1,
80+
IPC4_MOD_INIT_DATA_ID_MAX = IPC4_MOD_INIT_DATA_ID_MEM_DATA,
8181
};
8282

8383
/* data object for vendor bespoke data with ABI growth and backwards compat */
@@ -88,8 +88,8 @@ struct ipc4_module_init_ext_object {
8888
} __attribute__((packed, aligned(4)));
8989
/* the object data will be placed in memory here and will have size "object_words" */
9090

91-
/* Ext init array data object for Data Processing module memory requirements */
92-
struct ipc4_module_init_ext_obj_dp_data {
91+
/* Ext init array data object for module instance's memory requirements */
92+
struct ipc4_module_init_ext_obj_mem_data {
9393
uint32_t domain_id; /* userspace domain ID */
9494
uint32_t stack_bytes; /* required stack size in bytes, 0 means default size */
9595
uint32_t heap_bytes; /* required heap size in bytes, 0 means default size */

0 commit comments

Comments
 (0)