Skip to content

Commit e9ea4fe

Browse files
committed
dp: application: use proper source and sink pointer arrays
Now that we use a fixed size array for source and sink pointers, we can also split it into two to simplify calculations and remove type casts. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent bf26fc1 commit e9ea4fe

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/schedule/zephyr_dp_schedule_application.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ struct ipc4_flat {
4747
enum ipc4_pipeline_state state;
4848
int n_sources;
4949
int n_sinks;
50-
void *source_sink[2 * CONFIG_MODULE_MAX_CONNECTIONS];
50+
struct sof_source *source[CONFIG_MODULE_MAX_CONNECTIONS];
51+
struct sof_sink *sink[CONFIG_MODULE_MAX_CONNECTIONS];
5152
} pipeline_state;
5253
};
5354
};
@@ -82,13 +83,12 @@ static int ipc_thread_flatten(unsigned int cmd, const union scheduler_dp_thread_
8283
flat->pipeline_state.n_sources = param->pipeline_state.n_sources;
8384
flat->pipeline_state.n_sinks = param->pipeline_state.n_sinks;
8485
/* Up to 2 * CONFIG_MODULE_MAX_CONNECTIONS */
85-
memcpy(flat->pipeline_state.source_sink, param->pipeline_state.sources,
86+
memcpy(flat->pipeline_state.source, param->pipeline_state.sources,
8687
flat->pipeline_state.n_sources *
87-
sizeof(flat->pipeline_state.source_sink[0]));
88-
memcpy(flat->pipeline_state.source_sink + flat->pipeline_state.n_sources,
89-
param->pipeline_state.sinks,
88+
sizeof(flat->pipeline_state.source[0]));
89+
memcpy(flat->pipeline_state.sink, param->pipeline_state.sinks,
9090
flat->pipeline_state.n_sinks *
91-
sizeof(flat->pipeline_state.source_sink[0]));
91+
sizeof(flat->pipeline_state.sink[0]));
9292
}
9393
}
9494

@@ -138,11 +138,10 @@ static void ipc_thread_unflatten_run(struct processing_module *pmod, struct ipc4
138138
break;
139139
case COMP_TRIGGER_PREPARE:
140140
flat->ret = ops->prepare(pmod,
141-
(struct sof_source **)flat->pipeline_state.source_sink,
142-
flat->pipeline_state.n_sources,
143-
(struct sof_sink **)(flat->pipeline_state.source_sink +
144-
flat->pipeline_state.n_sources),
145-
flat->pipeline_state.n_sinks);
141+
flat->pipeline_state.source,
142+
flat->pipeline_state.n_sources,
143+
flat->pipeline_state.sink,
144+
flat->pipeline_state.n_sinks);
146145
}
147146
}
148147
}

0 commit comments

Comments
 (0)