From 81824ea76b9aee5a6cfac79f432e47f3031e0f4f Mon Sep 17 00:00:00 2001
From: Baofeng Tian <baofeng.tian@intel.com>
Date: Wed, 8 Nov 2023 15:17:41 +0800
Subject: [PATCH] audio: tdfb: move tdfb header file to tdfb module folder

Move it from include path to tdfb module folder.

Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
---
 src/audio/tdfb/tdfb.c                        | 4 ++--
 src/{include/user => audio/tdfb}/tdfb.h      | 0
 src/{include/sof => }/audio/tdfb/tdfb_comp.h | 3 ++-
 src/audio/tdfb/tdfb_direction.c              | 3 ++-
 src/audio/tdfb/tdfb_generic.c                | 4 ++--
 src/audio/tdfb/tdfb_hifi3.c                  | 5 ++---
 src/audio/tdfb/tdfb_hifiep.c                 | 5 ++---
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{include/user => audio/tdfb}/tdfb.h (100%)
 rename src/{include/sof => }/audio/tdfb/tdfb_comp.h (99%)

diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
index 38ff7ee24..606214488 100644
--- a/src/audio/tdfb/tdfb.c
+++ b/src/audio/tdfb/tdfb.c
@@ -15,7 +15,6 @@
 #include <sof/audio/ipc-config.h>
 #include <sof/audio/module_adapter/module/generic.h>
 #include <sof/audio/pipeline.h>
-#include <sof/audio/tdfb/tdfb_comp.h>
 #include <sof/ipc/msg.h>
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
@@ -34,12 +33,13 @@
 #include <sof/common.h>
 #include <sof/list.h>
 #include <sof/ut.h>
-#include <user/tdfb.h>
 #include <user/trace.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include "tdfb_comp.h"
+
 #if CONFIG_IPC_MAJOR_4
 #include <ipc4/header.h>
 #include <ipc4/module.h>
diff --git a/src/include/user/tdfb.h b/src/audio/tdfb/tdfb.h
similarity index 100%
rename from src/include/user/tdfb.h
rename to src/audio/tdfb/tdfb.h
diff --git a/src/include/sof/audio/tdfb/tdfb_comp.h b/src/audio/tdfb/tdfb_comp.h
similarity index 99%
rename from src/include/sof/audio/tdfb/tdfb_comp.h
rename to src/audio/tdfb/tdfb_comp.h
index bd229c80f..4a929fb24 100644
--- a/src/include/sof/audio/tdfb/tdfb_comp.h
+++ b/src/audio/tdfb/tdfb_comp.h
@@ -15,7 +15,8 @@
 #include <sof/math/fir_hifi3.h>
 #include <sof/math/iir_df1.h>
 #include <sof/platform.h>
-#include <user/tdfb.h>
+
+#include "tdfb.h"
 
 #if CONFIG_IPC_MAJOR_4
 #include <ipc4/header.h>
diff --git a/src/audio/tdfb/tdfb_direction.c b/src/audio/tdfb/tdfb_direction.c
index 2a893df03..38c990ceb 100644
--- a/src/audio/tdfb/tdfb_direction.c
+++ b/src/audio/tdfb/tdfb_direction.c
@@ -4,8 +4,9 @@
 //
 // Author: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
 
+#include "tdfb_comp.h"
+
 #include <ipc/topology.h>
-#include <sof/audio/tdfb/tdfb_comp.h>
 #include <rtos/alloc.h>
 #include <sof/math/iir_df1.h>
 #include <sof/math/trig.h>
diff --git a/src/audio/tdfb/tdfb_generic.c b/src/audio/tdfb/tdfb_generic.c
index 22f74702a..55b5f8ea8 100644
--- a/src/audio/tdfb/tdfb_generic.c
+++ b/src/audio/tdfb/tdfb_generic.c
@@ -6,9 +6,9 @@
 
 #include <sof/common.h>
 #include <sof/audio/audio_stream.h>
-#include <sof/audio/tdfb/tdfb_comp.h>
 #include <user/fir.h>
-#include <user/tdfb.h>
+
+#include "tdfb_comp.h"
 
 #if TDFB_GENERIC
 
diff --git a/src/audio/tdfb/tdfb_hifi3.c b/src/audio/tdfb/tdfb_hifi3.c
index 421784db9..e7b96a462 100644
--- a/src/audio/tdfb/tdfb_hifi3.c
+++ b/src/audio/tdfb/tdfb_hifi3.c
@@ -5,11 +5,10 @@
 // Author: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
 
 #include <sof/common.h>
-#include <user/tdfb.h>
 #include <sof/audio/audio_stream.h>
-#include <sof/audio/tdfb/tdfb_comp.h>
 #include <user/fir.h>
-#include <user/tdfb.h>
+
+#include "tdfb_comp.h"
 
 #if TDFB_HIFI3
 
diff --git a/src/audio/tdfb/tdfb_hifiep.c b/src/audio/tdfb/tdfb_hifiep.c
index 1f5b71dbe..e42527e39 100644
--- a/src/audio/tdfb/tdfb_hifiep.c
+++ b/src/audio/tdfb/tdfb_hifiep.c
@@ -5,11 +5,10 @@
 // Author: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
 
 #include <sof/common.h>
-#include <user/tdfb.h>
 #include <sof/audio/audio_stream.h>
-#include <sof/audio/tdfb/tdfb_comp.h>
 #include <user/fir.h>
-#include <user/tdfb.h>
+
+#include "tdfb_comp.h"
 
 #if TDFB_HIFIEP