Audio: aria: move aria header to aria module folder

There are two headers for aria, below action is taken: 1. move header file from include path to module path. 2. combine two headers to one header file. Signed-off-by: Baofeng Tian <[email protected]>
thesofproject · Oct 25, 2023 · 0ef4dfe · 0ef4dfe
1 parent 59a5bc7
commit 0ef4dfe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 40 deletions.
diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
@@ -4,7 +4,6 @@
 //
 // Author: Adrian Bonislawski <[email protected]>
 
-#include <sof/audio/aria/aria.h>
 #include <sof/audio/buffer.h>
 #include <sof/audio/format.h>
 #include <sof/audio/pipeline.h>
@@ -20,13 +19,13 @@
 #include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
-#include <ipc4/aria.h>
 #include <ipc4/fw_reg.h>
 #include <ipc/dai.h>
 #include <user/trace.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
+#include "aria.h"
 
 #define ARIA_SET_ATTENUATION 1
 

diff --git a/src/include/sof/audio/aria/aria.h → src/audio/aria/aria.h b/src/include/sof/audio/aria/aria.h → src/audio/aria/aria.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * \file audio/aria/aria.h
+ * \file aria.h
  * \brief Aria component header file
  * \authors Adrian Bonislawski <[email protected]>
  */
@@ -16,6 +16,7 @@
 
 #include <sof/audio/component_ext.h>
 #include <sof/audio/ipc-config.h>
+#include <sof/compiler_attributes.h>
 #include <rtos/bit.h>
 #include <sof/common.h>
 #include <sof/trace/trace.h>
@@ -92,4 +93,9 @@ struct aria_data {
 
 extern const uint8_t INDEX_TAB[];
 
+struct ipc4_aria_module_cfg {
+	struct ipc4_base_module_cfg base_cfg;
+	uint32_t attenuation;
+} __packed __aligned(8);
+
 #endif /* __SOF_AUDIO_ARIA_H__ */
diff --git a/src/audio/aria/aria_generic.c b/src/audio/aria/aria_generic.c
@@ -2,8 +2,7 @@
 //
 // Copyright(c) 2023 Intel Corporation. All rights reserved.
 
-#include <sof/audio/aria/aria.h>
-#include <ipc4/aria.h>
+#include "aria.h"
 
 #ifdef ARIA_GENERIC
 

diff --git a/src/audio/aria/aria_hifi3.c b/src/audio/aria/aria_hifi3.c
@@ -2,7 +2,7 @@
 //
 // Copyright(c) 2021 Intel Corporation. All rights reserved.
 
-#include <sof/audio/aria/aria.h>
+#include "aria.h"
 
 #ifdef ARIA_HIFI3
 #include <xtensa/config/defs.h>

diff --git a/src/include/ipc4/aria.h b/src/include/ipc4/aria.h