Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

audio: comp_ext: workaround XCC compatibility with zephyr logging #5574

Merged
merged 1 commit into from
Apr 8, 2022
+18 −0
Merged

audio: comp_ext: workaround XCC compatibility with zephyr logging #5574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions src/include/sof/audio/component_ext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,14 @@ static inline int comp_params(struct comp_dev *dev,
} else {
/* not defined, run the default handler */
ret = comp_verify_params(dev, 0, params);

/* BugLink: https://github.com/zephyrproject-rtos/zephyr/issues/43786
* TODO: Remove this once the bug gets fixed.
*/
#ifndef __ZEPHYR__
aiChaoSONG marked this conversation as resolved.
Show resolved Hide resolved
cujomalainey marked this conversation as resolved.
Show resolved Hide resolved
if (ret < 0)
comp_err(dev, "pcm params verification failed");
#endif
}
aiChaoSONG marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down Expand Up @@ -172,9 +178,21 @@ static inline int comp_copy(struct comp_dev *dev)

/* copy only if we are the owner of the component */
if (cpu_is_me(dev->ipc_config.core)) {
/* BugLink: https://github.com/zephyrproject-rtos/zephyr/issues/43786
* TODO: Remove this once the bug gets fixed.
*/
#ifndef __ZEPHYR__
aiChaoSONG marked this conversation as resolved.
Show resolved Hide resolved
perf_cnt_init(&dev->pcd);
#endif

ret = dev->drv->ops.copy(dev);

/* BugLink: https://github.com/zephyrproject-rtos/zephyr/issues/43786
* TODO: Remove this once the bug gets fixed.
*/
#ifndef __ZEPHYR__
aiChaoSONG marked this conversation as resolved.
Show resolved Hide resolved
perf_cnt_stamp(&dev->pcd, comp_perf_info, dev);
aiChaoSONG marked this conversation as resolved.
Show resolved Hide resolved
#endif
}

return ret;
Expand Down