From b7dc3ba467f8cb04862aa7958dedc4d4afe029f2 Mon Sep 17 00:00:00 2001
From: Baofeng Tian <baofeng.tian@intel.com>
Date: Thu, 30 Nov 2023 14:59:44 +0800
Subject: [PATCH] Audio: up_down_mixer: move up_down_mixer header files to
 module folder

This is a clean up, purpose is de-cluster headers, toml files,
Readme.md etc per module basis, since today everything is scattered
in current code base.

Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
---
 src/audio/up_down_mixer/up_down_mixer.c                      | 5 +++--
 src/{include/sof => }/audio/up_down_mixer/up_down_mixer.h    | 3 ++-
 .../up_down_mixer/up_down_mixer_coef.h}                      | 2 +-
 src/audio/up_down_mixer/up_down_mixer_hifi3.c                | 2 +-
 .../up_down_mixer/up_down_mixer_ipc4.h}                      | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename src/{include/sof => }/audio/up_down_mixer/up_down_mixer.h (99%)
 rename src/{include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h => audio/up_down_mixer/up_down_mixer_coef.h} (99%)
 rename src/{include/ipc4/up_down_mixer.h => audio/up_down_mixer/up_down_mixer_ipc4.h} (98%)

diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c
index c027c899f31c..ef8699e635e5 100644
--- a/src/audio/up_down_mixer/up_down_mixer.c
+++ b/src/audio/up_down_mixer/up_down_mixer.c
@@ -5,8 +5,6 @@
 // Author: Bartosz Kokoszko <bartoszx.kokoszko@intel.com>
 // Author: Adrian Bonislawski <adrian.bonislawski@intel.com>
 
-#include <sof/audio/coefficients/up_down_mixer/up_down_mixer.h>
-#include <sof/audio/up_down_mixer/up_down_mixer.h>
 #include <sof/audio/buffer.h>
 #include <sof/audio/format.h>
 #include <sof/audio/module_adapter/module/generic.h>
@@ -28,6 +26,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "up_down_mixer_coef.h"
+#include "up_down_mixer.h"
+
 LOG_MODULE_REGISTER(up_down_mixer, CONFIG_SOF_LOG_LEVEL);
 
 /* these ids aligns windows driver requirement to support windows driver */
diff --git a/src/include/sof/audio/up_down_mixer/up_down_mixer.h b/src/audio/up_down_mixer/up_down_mixer.h
similarity index 99%
rename from src/include/sof/audio/up_down_mixer/up_down_mixer.h
rename to src/audio/up_down_mixer/up_down_mixer.h
index 3542b6d1acf5..52a5f1e34daa 100644
--- a/src/include/sof/audio/up_down_mixer/up_down_mixer.h
+++ b/src/audio/up_down_mixer/up_down_mixer.h
@@ -12,12 +12,13 @@
 #include <sof/audio/ipc-config.h>
 #include <sof/common.h>
 #include <ipc/stream.h>
-#include <ipc4/up_down_mixer.h>
 #include <ipc4/module.h>
 #include <ipc4/base-config.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include "up_down_mixer_ipc4.h"
+
 /** This type is introduced for better readability. */
 typedef const int32_t *downmix_coefficients;
 
diff --git a/src/include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h b/src/audio/up_down_mixer/up_down_mixer_coef.h
similarity index 99%
rename from src/include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h
rename to src/audio/up_down_mixer/up_down_mixer_coef.h
index ed6730502a79..2085b8e33720 100644
--- a/src/include/sof/audio/coefficients/up_down_mixer/up_down_mixer.h
+++ b/src/audio/up_down_mixer/up_down_mixer_coef.h
@@ -5,7 +5,7 @@
 // Author: Bartosz Kokoszko <bartoszx.kokoszko@intel.com>
 // Author: Adrian Bonislawski <adrian.bonislawski@intel.com>
 
-#include <ipc4/up_down_mixer.h>
+#include "up_down_mixer_ipc4.h"
 #include <stdint.h>
 
 #if CONFIG_COMP_UP_DOWN_MIXER
diff --git a/src/audio/up_down_mixer/up_down_mixer_hifi3.c b/src/audio/up_down_mixer/up_down_mixer_hifi3.c
index db40a71ab5c1..259cf5128b9f 100644
--- a/src/audio/up_down_mixer/up_down_mixer_hifi3.c
+++ b/src/audio/up_down_mixer/up_down_mixer_hifi3.c
@@ -4,7 +4,7 @@
 //
 // Author: Bartosz Kokoszko <bartoszx.kokoszko@intel.com>
 
-#include <sof/audio/up_down_mixer/up_down_mixer.h>
+#include "up_down_mixer.h"
 
 #if defined(__XCC__) && XCHAL_HAVE_HIFI3
 
diff --git a/src/include/ipc4/up_down_mixer.h b/src/audio/up_down_mixer/up_down_mixer_ipc4.h
similarity index 98%
rename from src/include/ipc4/up_down_mixer.h
rename to src/audio/up_down_mixer/up_down_mixer_ipc4.h
index afd913b6c0d6..5300f5cb71d4 100644
--- a/src/include/ipc4/up_down_mixer.h
+++ b/src/audio/up_down_mixer/up_down_mixer_ipc4.h
@@ -7,7 +7,7 @@
 #ifndef __SOF_IPC4_UP_DOWN_MIXER_H__
 #define __SOF_IPC4_UP_DOWN_MIXER_H__
 
-#include "base-config.h"
+#include <ipc4/base-config.h>
 
 /**
  *  \brief bits field map which helps to describe each channel location a the data stream buffer