audio: crossover: move header file to module folder

This is a clean up, purpose is declutter 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>
thesofproject · Dec 14, 2023 · 612a400 · 612a400
1 parent c12fa81
commit 612a400
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c
@@ -11,8 +11,6 @@
 #include <sof/audio/format.h>
 #include <sof/audio/pipeline.h>
 #include <sof/audio/ipc-config.h>
-#include <sof/audio/crossover/crossover.h>
-#include <sof/audio/crossover/crossover_algorithm.h>
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <sof/ipc/msg.h>
@@ -30,13 +28,16 @@
 #include <ipc/stream.h>
 #include <ipc/topology.h>
 #include <user/trace.h>
-#include <user/crossover.h>
 #include <user/eq.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <limits.h>
 
+#include "crossover_algorithm.h"
+#include "crossover_user.h"
+#include "crossover.h"
+
 LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
 
 /* 948c9ad1-806a-4131-ad6c-b2bda9e35a9f */

diff --git a/src/include/sof/audio/crossover/crossover.h → src/audio/crossover/crossover.h b/src/include/sof/audio/crossover/crossover.h → src/audio/crossover/crossover.h
@@ -10,9 +10,10 @@
 #include <sof/audio/module_adapter/module/module_interface.h>
 #include <sof/math/iir_df2t.h>
 #include <sof/platform.h>
-#include <user/crossover.h>
 #include <stdint.h>
 
+#include "crossover_user.h"
+
 struct comp_buffer;
 struct comp_dev;
 

diff --git a/...sof/audio/crossover/crossover_algorithm.h → src/audio/crossover/crossover_algorithm.h b/...sof/audio/crossover/crossover_algorithm.h → src/audio/crossover/crossover_algorithm.h
@@ -8,10 +8,11 @@
 #define __SOF_AUDIO_CROSSOVER_CROSSOVER_ALGORITHM_H__
 
 #include <stdint.h>
-#include <sof/audio/crossover/crossover.h>
 #include <sof/platform.h>
 #include <sof/math/iir_df2t.h>
-#include <user/crossover.h>
+
+#include "crossover_user.h"
+#include "crossover.h"
 
 /* crossover reset function */
 void crossover_reset_state_ch(struct crossover_state *ch_state);

diff --git a/src/audio/crossover/crossover_generic.c b/src/audio/crossover/crossover_generic.c
@@ -7,11 +7,12 @@
 #include <ipc/stream.h>
 #include <sof/audio/module_adapter/module/module_interface.h>
 #include <sof/audio/component.h>
-#include <sof/audio/crossover/crossover.h>
 #include <sof/audio/format.h>
 #include <sof/math/iir_df2t.h>
 #include <stdint.h>
 
+#include "crossover.h"
+
 /*
  * \brief Splits x into two based on the coefficients set in the lp
  *        and hp filters. The output of the lp is in y1, the output of

diff --git a/src/include/user/crossover.h → src/audio/crossover/crossover_user.h b/src/include/user/crossover.h → src/audio/crossover/crossover_user.h
diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c
@@ -5,7 +5,6 @@
 // Author: Pin-chih Lin <johnylin@google.com>
 
 #include <sof/audio/module_adapter/module/generic.h>
-#include <sof/audio/crossover/crossover_algorithm.h>
 #include <sof/audio/drc/drc_algorithm.h>
 #include <sof/audio/buffer.h>
 #include <sof/audio/format.h>
@@ -34,6 +33,8 @@
 #include <stdint.h>
 #include "multiband_drc.h"
 
+#include "../crossover/crossover_algorithm.h"
+
 LOG_MODULE_REGISTER(multiband_drc, CONFIG_SOF_LOG_LEVEL);
 
 /* 0d9f2256-8e4f-47b3-8448-239a334f1191 */

diff --git a/src/audio/multiband_drc/multiband_drc.h b/src/audio/multiband_drc/multiband_drc.h
@@ -8,7 +8,6 @@
 #define __SOF_AUDIO_MULTIBAND_DRC_MULTIBAND_DRC_H__
 
 #include <sof/audio/module_adapter/module/generic.h>
-#include <sof/audio/crossover/crossover.h>
 #include <sof/audio/drc/drc.h>
 #include <sof/math/iir_df2t.h>
 #include <sof/audio/component.h>
@@ -17,6 +16,7 @@
 #include <stdint.h>
 
 #include "multiband_drc_user.h"
+#include "../crossover/crossover.h"
 
 /**
  * Stores the state of the sub-components in Multiband DRC

diff --git a/src/audio/multiband_drc/multiband_drc_user.h b/src/audio/multiband_drc/multiband_drc_user.h
@@ -9,10 +9,11 @@
 #define __USER_MULTIBAND_DRC_H__
 
 #include <stdint.h>
-#include <user/crossover.h>
 #include <user/drc.h>
 #include <user/eq.h>
 
+#include "../crossover/crossover_user.h"
+
 /* Maximum number of frequency band for Multiband DRC */
 #define SOF_MULTIBAND_DRC_MAX_BANDS SOF_CROSSOVER_MAX_STREAMS
 
@@ -54,7 +55,7 @@
   *         2 biquad filters.
   *     struct sof_eq_iir_biquad crossover_coef[6]
   *         The coefficient data for Crossover LR4 filters. Please refer
-  *         src/include/user/crossover.h for details. Zeros will be filled if
+  *         src/audio/crossover/user/crossover.h for details. Zeros will be filled if
   *         the entries are useless. For example, when 2-way crossover is used:
   *     struct sof_drc_params drc_coef[num_bands]
   *         The parameter data for DRC per band, the number entries of this may