OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipc: rename ipc_get_comp function 

Renames ipc_get_comp function to ipc_get_comp_by_id.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
This commit is contained in:
Tomasz Lauda 2019-10-17 10:14:05 +02:00 committed by Tomasz Lauda
parent 089de0f6ab
commit 99c16a69e3
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/intel/cavs/idc.c
View File

@ -176,7 +176,7 @@ static int idc_pipeline_trigger(uint32_t cmd)
dcache_invalidate_region(data, sizeof(*data));
/* check whether component exists */
pcm_dev = ipc_get_comp(ipc, data->comp_id);
pcm_dev = ipc_get_comp_by_id(ipc, data->comp_id);
if (!pcm_dev)
return -ENODEV;
@ -246,7 +246,7 @@ static int idc_component_command(uint32_t cmd)
data->rhdr.hdr.size - sizeof(*data));
/* check whether component exists */
comp_dev = ipc_get_comp(ipc, data->comp_id);
comp_dev = ipc_get_comp_by_id(ipc, data->comp_id);
if (!comp_dev)
return -ENODEV;

2
src/include/sof/drivers/ipc.h
View File

@ -224,7 +224,7 @@ int ipc_comp_connect(struct ipc *ipc,
/*
* Get component by ID.
*/
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id);
struct ipc_comp_dev *ipc_get_comp_by_id(struct ipc *ipc, uint32_t id);
/*
* Configure all DAI components attached to DAI.

10
src/ipc/handler.c
View File

@ -224,7 +224,7 @@ static int ipc_stream_pcm_params(uint32_t stream)
trace_ipc("ipc: comp %d -> params", pcm_params.comp_id);
/* get the pcm_dev */
pcm_dev = ipc_get_comp(_ipc, pcm_params.comp_id);
pcm_dev = ipc_get_comp_by_id(_ipc, pcm_params.comp_id);
if (pcm_dev == NULL) {
trace_ipc_error("ipc: comp %d not found", pcm_params.comp_id);
return -ENODEV;
@ -344,7 +344,7 @@ static int ipc_stream_pcm_free(uint32_t header)
trace_ipc("ipc: comp %d -> free", free_req.comp_id);
/* get the pcm_dev */
pcm_dev = ipc_get_comp(_ipc, free_req.comp_id);
pcm_dev = ipc_get_comp_by_id(_ipc, free_req.comp_id);
if (pcm_dev == NULL) {
trace_ipc_error("ipc: comp %d not found", free_req.comp_id);
return -ENODEV;
@ -376,7 +376,7 @@ static int ipc_stream_position(uint32_t header)
memset(&posn, 0, sizeof(posn));
/* get the pcm_dev */
pcm_dev = ipc_get_comp(_ipc, stream.comp_id);
pcm_dev = ipc_get_comp_by_id(_ipc, stream.comp_id);
if (pcm_dev == NULL) {
trace_ipc_error("ipc: comp %d not found", stream.comp_id);
return -ENODEV;
@ -455,7 +455,7 @@ static int ipc_stream_trigger(uint32_t header)
trace_ipc("ipc: comp %d -> trigger cmd 0x%x", stream.comp_id, ipc_cmd);
/* get the pcm_dev */
pcm_dev = ipc_get_comp(_ipc, stream.comp_id);
pcm_dev = ipc_get_comp_by_id(_ipc, stream.comp_id);
if (pcm_dev == NULL) {
trace_ipc_error("ipc: comp %d not found", stream.comp_id);
return -ENODEV;
@ -842,7 +842,7 @@ static int ipc_comp_value(uint32_t header, uint32_t cmd)
trace_ipc("ipc: comp %d -> cmd %d", data.comp_id, data.cmd);
/* get the component */
comp_dev = ipc_get_comp(_ipc, data.comp_id);
comp_dev = ipc_get_comp_by_id(_ipc, data.comp_id);
if (!comp_dev) {
trace_ipc_error("ipc: comp %d not found", data.comp_id);
return -ENODEV;

22
src/ipc/ipc.c
View File

@ -38,7 +38,7 @@
* more than 1 list may need to be searched for the corresponding component.
*/
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id)
struct ipc_comp_dev *ipc_get_comp_by_id(struct ipc *ipc, uint32_t id)
{
struct ipc_comp_dev *icd;
struct list_item *clist;
@ -129,7 +129,7 @@ int ipc_comp_new(struct ipc *ipc, struct sof_ipc_comp *comp)
int ret = 0;
/* check whether component already exists */
icd = ipc_get_comp(ipc, comp->id);
icd = ipc_get_comp_by_id(ipc, comp->id);
if (icd != NULL) {
trace_ipc_error("ipc_comp_new() error: comp->id = %u",
comp->id);
@ -164,7 +164,7 @@ int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
struct ipc_comp_dev *icd;
/* check whether component exists */
icd = ipc_get_comp(ipc, comp_id);
icd = ipc_get_comp_by_id(ipc, comp_id);
if (icd == NULL)
return -ENODEV;
@ -196,7 +196,7 @@ int ipc_buffer_new(struct ipc *ipc, struct sof_ipc_buffer *desc)
int ret = 0;
/* check whether buffer already exists */
ibd = ipc_get_comp(ipc, desc->comp.id);
ibd = ipc_get_comp_by_id(ipc, desc->comp.id);
if (ibd != NULL) {
trace_ipc_error("ipc_buffer_new() error: "
"buffer already exists, desc->comp.id = %u",
@ -231,7 +231,7 @@ int ipc_buffer_free(struct ipc *ipc, uint32_t buffer_id)
struct ipc_comp_dev *ibd;
/* check whether buffer exists */
ibd = ipc_get_comp(ipc, buffer_id);
ibd = ipc_get_comp_by_id(ipc, buffer_id);
if (ibd == NULL)
return -ENODEV;
@ -250,7 +250,7 @@ int ipc_comp_connect(struct ipc *ipc,
struct ipc_comp_dev *icd_sink;
/* check whether the components already exist */
icd_source = ipc_get_comp(ipc, connect->source_id);
icd_source = ipc_get_comp_by_id(ipc, connect->source_id);
if (icd_source == NULL) {
trace_ipc_error("ipc_comp_connect() error: components already"
" exist, connect->source_id = %u",
@ -258,7 +258,7 @@ int ipc_comp_connect(struct ipc *ipc,
return -EINVAL;
}
icd_sink = ipc_get_comp(ipc, connect->sink_id);
icd_sink = ipc_get_comp_by_id(ipc, connect->sink_id);
if (icd_sink == NULL) {
trace_ipc_error("ipc_comp_connect() error: components already"
" exist, connect->sink_id = %u",
@ -293,7 +293,7 @@ int ipc_pipeline_new(struct ipc *ipc,
struct ipc_comp_dev *icd;
/* check whether the pipeline already exists */
ipc_pipe = ipc_get_comp(ipc, pipe_desc->comp_id);
ipc_pipe = ipc_get_comp_by_id(ipc, pipe_desc->comp_id);
if (ipc_pipe != NULL) {
trace_ipc_error("ipc_pipeline_new() error: pipeline already"
" exists, pipe_desc->comp_id = %u",
@ -302,7 +302,7 @@ int ipc_pipeline_new(struct ipc *ipc,
}
/* find the scheduling component */
icd = ipc_get_comp(ipc, pipe_desc->sched_id);
icd = ipc_get_comp_by_id(ipc, pipe_desc->sched_id);
if (icd == NULL) {
trace_ipc_error("ipc_pipeline_new() error: cannot find the "
"scheduling component, pipe_desc->sched_id"
@ -345,7 +345,7 @@ int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id)
int ret;
/* check whether pipeline exists */
ipc_pipe = ipc_get_comp(ipc, comp_id);
ipc_pipe = ipc_get_comp_by_id(ipc, comp_id);
if (ipc_pipe == NULL)
return -ENODEV;
@ -371,7 +371,7 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id)
struct ipc_comp_dev *ipc_ppl_sink;
/* check whether pipeline exists */
ipc_pipe = ipc_get_comp(ipc, comp_id);
ipc_pipe = ipc_get_comp_by_id(ipc, comp_id);
if (!ipc_pipe)
return -EINVAL;

2
test/cmocka/src/audio/pipeline/pipeline_mocks.c
View File

@ -65,7 +65,7 @@ void cpu_power_down_core(void) { }
void notifier_notify(void) { }
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id)
struct ipc_comp_dev *ipc_get_comp_by_id(struct ipc *ipc, uint32_t id)
{
(void)ipc;
(void)id;

2
test/cmocka/src/audio/pipeline/pipeline_mocks.h
View File

@ -23,7 +23,7 @@ int arch_cpu_is_core_enabled(int id);
void cpu_power_down_core(void);
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id);
struct ipc_comp_dev *ipc_get_comp_by_id(struct ipc *ipc, uint32_t id);
void notifier_notify(void);

4
tools/testbench/common_test.c
View File

@ -64,7 +64,7 @@ int tb_pipeline_start(struct ipc *ipc, int nch,
}
/* Get IPC component device for pipeline */
pcm_dev = ipc_get_comp(ipc, ipc_pipe->sched_id);
pcm_dev = ipc_get_comp_by_id(ipc, ipc_pipe->sched_id);
if (!pcm_dev) {
fprintf(stderr, "error: ipc get comp\n");
return -EINVAL;
@ -136,7 +136,7 @@ int tb_pipeline_params(struct ipc *ipc, int nch,
}
/* get scheduling component device for pipeline*/
pcm_dev = ipc_get_comp(ipc, ipc_pipe->sched_id);
pcm_dev = ipc_get_comp_by_id(ipc, ipc_pipe->sched_id);
if (!pcm_dev) {
fprintf(stderr, "error: ipc get comp\n");
return -EINVAL;

6
tools/testbench/testbench.c
View File

@ -217,13 +217,13 @@ int main(int argc, char **argv)
}
/* Get pointers to fileread and filewrite */
pcm_dev = ipc_get_comp(sof.ipc, fw_id);
pcm_dev = ipc_get_comp_by_id(sof.ipc, fw_id);
fwcd = comp_get_drvdata(pcm_dev->cd);
pcm_dev = ipc_get_comp(sof.ipc, fr_id);
pcm_dev = ipc_get_comp_by_id(sof.ipc, fr_id);
frcd = comp_get_drvdata(pcm_dev->cd);
/* Run pipeline until EOF from fileread */
pcm_dev = ipc_get_comp(sof.ipc, sched_id);
pcm_dev = ipc_get_comp_by_id(sof.ipc, sched_id);
p = pcm_dev->cd->pipeline;
ipc_pipe = &p->ipc_pipe;