From a1a631d0e8c2fe861d07dfc72210056a52caf38d Mon Sep 17 00:00:00 2001
From: wen_tengye <wen_tengye@hoperun.com>
Date: Fri, 26 Jan 2024 11:41:04 +0800
Subject: [PATCH] audio config

---
 adapter/khdf/linux/model/audio/Kconfig      | 8 ++++++++
 adapter/khdf/linux/model/audio/Makefile     | 3 +++
 adapter/uhdf2/hdi/BUILD.gn                  | 5 +++--
 adapter/uhdf2/hdi/src/hdf_load_hdi.c        | 2 +-
 adapter/uhdf2/hdi/src/hdi_support.cpp       | 2 +-
 adapter/uhdf2/host/BUILD.gn                 | 5 +++--
 adapter/uhdf2/host/src/driver_loader_full.c | 2 +-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/adapter/khdf/linux/model/audio/Kconfig b/adapter/khdf/linux/model/audio/Kconfig
index b2695b704..50b2769af 100644
--- a/adapter/khdf/linux/model/audio/Kconfig
+++ b/adapter/khdf/linux/model/audio/Kconfig
@@ -11,6 +11,14 @@ config DRIVERS_HDF_AUDIO_HI3516CODEC
     help
         Answer Y to choice HDF Audio Codec driver.
 
+config DRIVERS_HDF_AUDIO_THEAD
+    bool "Enable HDF Thead Audio Codec driver"
+    select SND_SOC_GENERIC_DMAENGINE_PCM
+    default n
+    depends on DRIVERS_HDF_AUDIO
+    help
+        Answer Y to choice HDF Audio Codec driver.
+
 config DRIVERS_HDF_AUDIO_RK3568
     bool "Enable HDF Audio Codec driver"
     default n
diff --git a/adapter/khdf/linux/model/audio/Makefile b/adapter/khdf/linux/model/audio/Makefile
index 1317797a0..239f5c587 100644
--- a/adapter/khdf/linux/model/audio/Makefile
+++ b/adapter/khdf/linux/model/audio/Makefile
@@ -40,6 +40,9 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \
 obj-$(CONFIG_DRIVERS_HDF_AUDIO_RK3568) += \
           $(KHDF_AUDIO_BASE_ROOT_DIR)/device/board/hihope/rk3568/audio_drivers/
 
+obj-$(CONFIG_DRIVERS_HDF_AUDIO_THEAD) += \
+          $(KHDF_AUDIO_BASE_ROOT_DIR)/device/board/hihope/dayu800/audio_driver/
+
 obj-$(CONFIG_DRIVERS_HDF_AUDIO_A311D) += \
           $(KHDF_AUDIO_A311D_DIR)/codec/soc_codec/a311d_codec_adapter.o \
           $(KHDF_AUDIO_A311D_DIR)/codec/soc_codec/a311d_codec_ops.o \
diff --git a/adapter/uhdf2/hdi/BUILD.gn b/adapter/uhdf2/hdi/BUILD.gn
index b94970f51..a9816acf2 100644
--- a/adapter/uhdf2/hdi/BUILD.gn
+++ b/adapter/uhdf2/hdi/BUILD.gn
@@ -41,9 +41,10 @@ if (defined(ohos_lite)) {
   }
 } else {
   ohos_shared_library("libhdi") {
-    if (target_cpu == "arm64" || target_cpu == "x86_64" ||
-        target_cpu == "riscv64") {
+    if (target_cpu == "arm64" || target_cpu == "x86_64") {
       defines = [ "__ARM64__" ]
+    } else if (target_cpu == "riscv64") {
+      defines = [ "__RISCV64__" ]
     }
 
     include_dirs = [
diff --git a/adapter/uhdf2/hdi/src/hdf_load_hdi.c b/adapter/uhdf2/hdi/src/hdf_load_hdi.c
index c010bd45b..c1786b11b 100644
--- a/adapter/uhdf2/hdi/src/hdf_load_hdi.c
+++ b/adapter/uhdf2/hdi/src/hdf_load_hdi.c
@@ -23,7 +23,7 @@
 
 #define HDF_LOG_TAG dev_load_hdi
 
-#ifdef __ARM64__
+#if defined(__ARM64__) || defined(__RISCV64__)
 #define HDI_SO_PATH HDF_LIBRARY_DIR"64"
 #else
 #define HDI_SO_PATH HDF_LIBRARY_DIR
diff --git a/adapter/uhdf2/hdi/src/hdi_support.cpp b/adapter/uhdf2/hdi/src/hdi_support.cpp
index b01743be3..2dfc1cec4 100644
--- a/adapter/uhdf2/hdi/src/hdi_support.cpp
+++ b/adapter/uhdf2/hdi/src/hdi_support.cpp
@@ -27,7 +27,7 @@
 
 #define HDF_LOG_TAG load_hdi
 
-#ifdef __ARM64__
+#if defined(__ARM64__) || defined(__RISCV64__)
 #define HDI_SO_PATH HDF_LIBRARY_DIR "64"
 #else
 #define HDI_SO_PATH HDF_LIBRARY_DIR
diff --git a/adapter/uhdf2/host/BUILD.gn b/adapter/uhdf2/host/BUILD.gn
index 3bc96a7de..8a31a29a3 100644
--- a/adapter/uhdf2/host/BUILD.gn
+++ b/adapter/uhdf2/host/BUILD.gn
@@ -33,9 +33,10 @@ if (defined(ohos_lite)) {
   }
 } else {
   ohos_shared_library("libhdf_host") {
-    if (target_cpu == "arm64" || target_cpu == "x86_64" ||
-        target_cpu == "riscv64") {
+    if (target_cpu == "arm64" || target_cpu == "x86_64") {
       defines = [ "__ARM64__" ]
+    } else if (target_cpu == "riscv64") {
+      defines = [ "__RISCV64__" ]
     }
 
     all_dependent_configs = [ ":libhdf_host_all_dependent_config" ]
diff --git a/adapter/uhdf2/host/src/driver_loader_full.c b/adapter/uhdf2/host/src/driver_loader_full.c
index da57b2dd7..22310442c 100644
--- a/adapter/uhdf2/host/src/driver_loader_full.c
+++ b/adapter/uhdf2/host/src/driver_loader_full.c
@@ -27,7 +27,7 @@
 
 #define DRIVER_DESC "driverDesc"
 #define HDF_LOG_TAG driver_loader_full
-#ifdef __ARM64__
+#if defined(__ARM64__) || defined(__RISCV64__)
 #define DRIVER_PATH HDF_LIBRARY_DIR"64/"
 #else
 #define DRIVER_PATH HDF_LIBRARY_DIR"/"
-- 
Gitee