From d2fccbdf332b68164a52ed5953859733bbe92dfc Mon Sep 17 00:00:00 2001
From: Baofeng Tian <baofeng.tian@intel.com>
Date: Tue, 24 Oct 2023 15:57:32 +0800
Subject: [PATCH] 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 <baofeng.tian@intel.com>
---
 src/audio/copier/copier.c                        | 2 +-
 src/{include/ipc4 => audio/copier}/copier.h      | 0
 src/audio/copier/copier_dai.c                    | 2 +-
 src/audio/copier/copier_generic.c                | 2 +-
 src/audio/copier/copier_hifi.c                   | 2 +-
 src/audio/copier/copier_host.c                   | 2 +-
 src/audio/copier/copier_ipcgtw.c                 | 2 +-
 src/audio/copier/host_copier.h                   | 2 +-
 src/audio/copier/ipcgtw_copier.h                 | 2 +-
 src/audio/dai-zephyr.c                           | 3 ++-
 src/audio/host-zephyr.c                          | 3 ++-
 src/audio/pipeline/pipeline-stream.c             | 3 ++-
 src/ipc/ipc4/dai.c                               | 3 ++-
 src/ipc/ipc4/helper.c                            | 1 -
 tools/tplg_parser/buffer.c                       | 3 ++-
 tools/tplg_parser/include/tplg_parser/topology.h | 3 ++-
 16 files changed, 20 insertions(+), 15 deletions(-)
 rename src/{include/ipc4 => audio/copier}/copier.h (100%)

diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
index b897b6a51..46a36d61f 100644
--- 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 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 bfeeecde6..4b8f2bd86 100644
--- 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
index e8ac1e111..c4991363e 100644
--- a/src/audio/copier/copier_generic.c
+++ b/src/audio/copier/copier_generic.c
@@ -5,8 +5,8 @@
 // Author: Andrula Song <xiaoyuan.song@intel.com>
 
 #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
index a419a4aee..8d05fe924 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 <xiaoyuan.song@intel.com>
-#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
index 28dd4ba2d..abce0f055 100644
--- 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
index 578cff695..95f36b499 100644
--- 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/host_copier.h b/src/audio/copier/host_copier.h
index c7ac454bf..08cbba43b 100644
--- 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
index 6a52e25e6..114d9dde6 100644
--- 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/dai-zephyr.c b/src/audio/dai-zephyr.c
index 34a98b361..d983b8699 100644
--- a/src/audio/dai-zephyr.c
+++ b/src/audio/dai-zephyr.c
@@ -30,11 +30,12 @@
 #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/copier.h"
 #include "copier/dai_copier.h"
 
 #include <zephyr/device.h>
diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
index 3a92aa1c7..998dca300 100644
--- a/src/audio/host-zephyr.c
+++ b/src/audio/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,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+
+#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 547b3198f..d4e24d364 100644
--- a/src/audio/pipeline/pipeline-stream.c
+++ b/src/audio/pipeline/pipeline-stream.c
@@ -15,7 +15,6 @@
 #include <rtos/string.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
-#include <ipc4/copier.h>
 #include <ipc4/module.h>
 #include <rtos/kernel.h>
 
@@ -25,6 +24,8 @@
 #include <stdint.h>
 #include <sof/audio/module_adapter/module/generic.h>
 
+#include "../audio/copier/copier.h"
+
 LOG_MODULE_DECLARE(pipe, CONFIG_SOF_LOG_LEVEL);
 
 /*
diff --git a/src/ipc/ipc4/dai.c b/src/ipc/ipc4/dai.c
index 02ac1c498..69a4bdf05 100644
--- a/src/ipc/ipc4/dai.c
+++ b/src/ipc/ipc4/dai.c
@@ -20,13 +20,14 @@
 #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
index 29ef61dfb..a9c657e21 100644
--- 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>
diff --git a/tools/tplg_parser/buffer.c b/tools/tplg_parser/buffer.c
index 45b44a669..7440c3f6c 100644
--- a/tools/tplg_parser/buffer.c
+++ b/tools/tplg_parser/buffer.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <ipc/topology.h>
 #include <ipc/stream.h>
-#include <ipc4/copier.h>
 #include <ipc4/gateway.h>
 #include <sof/common.h>
 #include <sof/lib/uuid.h>
@@ -23,6 +22,8 @@
 #include <tplg_parser/topology.h>
 #include <tplg_parser/tokens.h>
 
+#include "copier/copier.h"
+
 /* Buffers */
 static const struct sof_topology_token buffer_tokens[] = {
 	{SOF_TKN_BUF_SIZE, SND_SOC_TPLG_TUPLE_TYPE_WORD, tplg_token_get_uint32_t,
diff --git a/tools/tplg_parser/include/tplg_parser/topology.h b/tools/tplg_parser/include/tplg_parser/topology.h
index 806af047e..3e95e5c3b 100644
--- a/tools/tplg_parser/include/tplg_parser/topology.h
+++ b/tools/tplg_parser/include/tplg_parser/topology.h
@@ -16,12 +16,13 @@
 #include <ipc/dai.h>
 #include <ipc/topology.h>
 #include <ipc/stream.h>
-#include <ipc4/copier.h>
 #include <ipc4/module.h>
 #include <kernel/tokens.h>
 #include <sof/list.h>
 #include <volume/peak_volume.h>
 
+#include "copier/copier.h"
+
 #ifdef TPLG_DEBUG
 #define DEBUG_MAX_LENGTH 256
 static inline void tplg_debug(char *fmt, ...)