diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c index b897b6a514f5..46a36d61fad0 100644 --- a/src/audio/copier/copier.c +++ b/src/audio/copier/copier.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include "copier.h" #include "host_copier.h" #include "dai_copier.h" #include "ipcgtw_copier.h" diff --git a/src/include/ipc4/copier.h b/src/audio/copier/copier.h similarity index 100% rename from src/include/ipc4/copier.h rename to src/audio/copier/copier.h diff --git a/src/audio/copier/copier_dai.c b/src/audio/copier/copier_dai.c index bfeeecde661c..4b8f2bd861c1 100644 --- a/src/audio/copier/copier_dai.c +++ b/src/audio/copier/copier_dai.c @@ -6,9 +6,9 @@ #include #include -#include #include #include +#include "copier.h" #include "dai_copier.h" LOG_MODULE_DECLARE(copier, CONFIG_SOF_LOG_LEVEL); diff --git a/src/audio/copier/copier_generic.c b/src/audio/copier/copier_generic.c index e8ac1e111510..c4991363eb7f 100644 --- a/src/audio/copier/copier_generic.c +++ b/src/audio/copier/copier_generic.c @@ -5,8 +5,8 @@ // Author: Andrula Song #include -#include #include +#include "copier.h" LOG_MODULE_DECLARE(copier, CONFIG_SOF_LOG_LEVEL); diff --git a/src/audio/copier/copier_hifi.c b/src/audio/copier/copier_hifi.c index a419a4aee431..8d05fe924f51 100644 --- a/src/audio/copier/copier_hifi.c +++ b/src/audio/copier/copier_hifi.c @@ -3,7 +3,7 @@ // Copyright(c) 2022 Intel Corporation. All rights reserved. // // Author: Andrula Song -#include +#include "copier.h" #if __XCC__ && (XCHAL_HAVE_HIFI3 || XCHAL_HAVE_HIFI4) diff --git a/src/audio/copier/copier_host.c b/src/audio/copier/copier_host.c index 28dd4ba2dc34..abce0f0557ed 100644 --- a/src/audio/copier/copier_host.c +++ b/src/audio/copier/copier_host.c @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include "copier.h" #include "host_copier.h" LOG_MODULE_DECLARE(copier, CONFIG_SOF_LOG_LEVEL); diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c index 578cff695ca2..95f36b49963c 100644 --- a/src/audio/copier/copier_ipcgtw.c +++ b/src/audio/copier/copier_ipcgtw.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include "copier.h" #include "ipcgtw_copier.h" LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL); diff --git a/src/audio/copier/host_copier.h b/src/audio/copier/host_copier.h index c7ac454bf800..08cbba43be27 100644 --- a/src/audio/copier/host_copier.h +++ b/src/audio/copier/host_copier.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include "copier.h" typedef void (*copy_callback_t)(struct comp_dev *dev, size_t bytes); diff --git a/src/audio/copier/ipcgtw_copier.h b/src/audio/copier/ipcgtw_copier.h index 6a52e25e61e8..114d9dde6228 100644 --- a/src/audio/copier/ipcgtw_copier.h +++ b/src/audio/copier/ipcgtw_copier.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include "copier.h" /* Host communicates with IPC gateways via global IPC messages. To address a particular * IPC gateway, its node_id is sent in message payload. Hence we need to keep a list of existing diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index 5d8d8615944b..559677f92946 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -30,11 +30,12 @@ #include #include #include -#include #include #include #include #include + +#include "copier/copier.h" #include "copier/dai_copier.h" #include diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c index 3a92aa1c773c..998dca300b76 100644 --- a/src/audio/host-zephyr.c +++ b/src/audio/host-zephyr.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,8 @@ #include #include #include + +#include "copier/copier.h" #include "copier/host_copier.h" static const struct comp_driver comp_host; diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c index 547b3198f311..b39c2c031970 100644 --- a/src/audio/pipeline/pipeline-stream.c +++ b/src/audio/pipeline/pipeline-stream.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include <../audio/copier/copier.h> #include #include diff --git a/src/ipc/ipc4/dai.c b/src/ipc/ipc4/dai.c index 517fb7ba700f..617c1bc63878 100644 --- a/src/ipc/ipc4/dai.c +++ b/src/ipc/ipc4/dai.c @@ -20,13 +20,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include <../audio/copier/copier.h> #include <../audio/copier/dai_copier.h> LOG_MODULE_DECLARE(ipc, CONFIG_SOF_LOG_LEVEL); diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c index 29ef61dfb5c9..a9c657e21fdb 100644 --- a/src/ipc/ipc4/helper.c +++ b/src/ipc/ipc4/helper.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/tools/tplg_parser/buffer.c b/tools/tplg_parser/buffer.c index 45b44a6697fa..2d1a50886c9a 100644 --- a/tools/tplg_parser/buffer.c +++ b/tools/tplg_parser/buffer.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/tplg_parser/include/tplg_parser/topology.h b/tools/tplg_parser/include/tplg_parser/topology.h index 806af047e6f2..42072aedd768 100644 --- a/tools/tplg_parser/include/tplg_parser/topology.h +++ b/tools/tplg_parser/include/tplg_parser/topology.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include