From 0ef4dfe15a383de5bf106bce27a16d4b0711dfdc Mon Sep 17 00:00:00 2001
From: Baofeng Tian <baofeng.tian@intel.com>
Date: Mon, 23 Oct 2023 15:48:26 +0800
Subject: [PATCH] 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 <baofeng.tian@intel.com>
---
 src/audio/aria/aria.c                   |  3 +--
 src/{include/sof => }/audio/aria/aria.h |  8 +++++-
 src/audio/aria/aria_generic.c           |  3 +--
 src/audio/aria/aria_hifi3.c             |  2 +-
 src/include/ipc4/aria.h                 | 34 -------------------------
 5 files changed, 10 insertions(+), 40 deletions(-)
 rename src/{include/sof => }/audio/aria/aria.h (92%)
 delete mode 100644 src/include/ipc4/aria.h

diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
index 70c93cb4595b..d338ae22743e 100644
--- a/src/audio/aria/aria.c
+++ b/src/audio/aria/aria.c
@@ -4,7 +4,6 @@
 //
 // Author: Adrian Bonislawski <adrian.bonislawski@intel.com>
 
-#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 b/src/audio/aria/aria.h
similarity index 92%
rename from src/include/sof/audio/aria/aria.h
rename to src/audio/aria/aria.h
index 6718f84a72da..98cba48f93c0 100644
--- a/src/include/sof/audio/aria/aria.h
+++ b/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 <adrian.bonislawski@intel.com>
  */
@@ -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
index 09daee86c5d9..0fca86f44548 100644
--- 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
index 363ba583b0d3..e296db7ff863 100644
--- 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
deleted file mode 100644
index 6f7adcd2d2f7..000000000000
--- a/src/include/ipc4/aria.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright(c) 2022 Intel Corporation. All rights reserved.
- */
-
-/*
- * This file contains structures that are exact copies of an existing ABI used
- * by IOT middleware. They are Intel specific and will be used by one middleware.
- *
- * Some of the structures may contain programming implementations that makes them
- * unsuitable for generic use and general usage.
- *
- * This code is mostly copied "as-is" from existing C++ interface files hence the use of
- * different style in places. The intention is to keep the interface as close as possible to
- * original so it's easier to track changes with IPC host code.
- */
-
-/*
- * \file include/ipc4/aria.h
- * \brief aria definitions.
- * NOTE: This ABI uses bit fields and is non portable.
- */
-
-#ifndef __SOF_IPC4_ARIA_H__
-#define __SOF_IPC4_ARIA_H__
-
-#include <sof/compiler_attributes.h>
-#include "base-config.h"
-
-struct ipc4_aria_module_cfg {
-	struct ipc4_base_module_cfg base_cfg;
-	uint32_t attenuation;
-} __packed __aligned(8);
-#endif