audio: copier: move copier generic header file to copier folder

This header file is referred by external modules, add relative path for external module usage. Signed-off-by: Baofeng Tian <[email protected]>
thesofproject · Oct 24, 2023 · 34b26a0 · 34b26a0
1 parent 54c3991
commit 34b26a0
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 13 deletions.
diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
@@ -26,7 +26,6 @@
 #include <sof/trace/trace.h>
 #include <ipc4/alh.h>
 #include <ipc4/base-config.h>
-#include <ipc4/copier.h>
 #include <ipc4/module.h>
 #include <ipc4/error_status.h>
 #include <ipc4/gateway.h>
@@ -37,6 +36,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sof/audio/module_adapter/module/generic.h>
+#include "copier.h"
 #include "host_copier.h"
 #include "dai_copier.h"
 #include "ipcgtw_copier.h"

diff --git a/src/include/ipc4/copier.h → src/audio/copier/copier.h b/src/include/ipc4/copier.h → src/audio/copier/copier.h
diff --git a/src/audio/copier/copier_dai.c b/src/audio/copier/copier_dai.c
@@ -6,9 +6,9 @@
 
 #include <sof/trace/trace.h>
 #include <sof/audio/component_ext.h>
-#include <ipc4/copier.h>
 #include <ipc/dai.h>
 #include <sof/audio/module_adapter/module/generic.h>
+#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
@@ -5,8 +5,8 @@
 // Author: Andrula Song <[email protected]>
 
 #include <ipc4/base-config.h>
-#include <ipc4/copier.h>
 #include <sof/audio/component_ext.h>
+#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
@@ -3,7 +3,7 @@
 // Copyright(c) 2022 Intel Corporation. All rights reserved.
 //
 // Author: Andrula Song <[email protected]>
-#include <ipc4/copier.h>
+#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
@@ -7,8 +7,8 @@
 #include <sof/audio/component_ext.h>
 #include <sof/tlv.h>
 #include <sof/trace/trace.h>
-#include <ipc4/copier.h>
 #include <sof/audio/module_adapter/module/generic.h>
+#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
@@ -8,7 +8,7 @@
 #include <sof/lib/memory.h>
 #include <sof/ut.h>
 #include <rtos/init.h>
-#include <ipc4/copier.h>
+#include "copier.h"
 #include "ipcgtw_copier.h"
 
 LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL);

diff --git a/src/audio/copier/dai-zephyr.c b/src/audio/copier/dai-zephyr.c
@@ -30,11 +30,11 @@
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
-#include <ipc4/copier.h>
 #include <user/trace.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
+#include "copier.h"
 #include "dai_copier.h"
 
 #include <zephyr/device.h>

diff --git a/src/audio/copier/host-zephyr.c b/src/audio/copier/host-zephyr.c
@@ -10,7 +10,6 @@
 #include <sof/audio/pcm_converter.h>
 #include <sof/audio/pipeline.h>
 #include <sof/audio/ipc-config.h>
-#include <ipc4/copier.h>
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <sof/ipc/msg.h>
@@ -32,6 +31,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include "copier.h"
 #include "host_copier.h"
 
 static const struct comp_driver comp_host;

diff --git a/src/audio/copier/host_copier.h b/src/audio/copier/host_copier.h
@@ -20,7 +20,7 @@
 #include <sof/audio/ipc-config.h>
 #include <ipc/stream.h>
 #include <sof/lib/notifier.h>
-#include <ipc4/copier.h>
+#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
@@ -18,7 +18,7 @@
 #include <ipc4/gateway.h>
 #include <sof/list.h>
 #include <ipc/stream.h>
-#include <ipc4/copier.h>
+#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/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c
@@ -15,7 +15,7 @@
 #include <rtos/string.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
-#include <ipc4/copier.h>
+#include <../audio/copier/copier.h>
 #include <ipc4/module.h>
 #include <rtos/kernel.h>
 

diff --git a/src/ipc/ipc4/dai.c b/src/ipc/ipc4/dai.c
@@ -20,13 +20,13 @@
 #include <ipc/header.h>
 #include <ipc4/alh.h>
 #include <ipc4/ssp.h>
-#include <ipc4/copier.h>
 #include <ipc4/fw_reg.h>
 #include <ipc/dai.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#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
@@ -35,7 +35,6 @@
 #include <rimage/cavs/cavs_ext_manifest.h>
 #include <rimage/sof/user/manifest.h>
 #include <ipc4/base-config.h>
-#include <ipc4/copier.h>
 #include <ipc/header.h>
 #include <ipc4/notification.h>
 #include <ipc4/pipeline.h>