openharmony/drivers_adapter_khdf_linux
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_adapter_khdf_linux.git synced 2026-07-01 22:33:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: delete audio accessory and unified audio codec structure

Browse Source 
Signed-off-by: zenglifeng <zenglifeng2@huawei.com>
This commit is contained in:
zenglifeng
2022-04-28 16:30:44 +08:00
parent 514fe5c72f
commit c4e049ea83
3 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/audio/Makefile
+9 -10
View File
@@ -15,8 +15,8 @@ KHDF_AUDIO_BASE_ROOT_DIR = ../../../../../..
KHDF_AUDIO_KHDF_ROOT_DIR = drivers/hdf/khdf
KHDF_FRAMEWORK_ROOT_DIR = drivers/hdf/framework
KHDF_AUDIO_ROOT_DIR = ../../../../../framework/model/audio
KHDF_AUDIO_HI3516DV300_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/drivers/peripheral/audio/chipsets/hi3516dv300
KHDF_AUDIO_HI3516DV300_INC_DIR = drivers/hdf/framework/../peripheral/audio/chipsets/hi3516dv300
KHDF_AUDIO_HI3516DV300_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/device/board/hisilicon/hispark_taurus/audio_drivers
KHDF_AUDIO_HI3516DV300_INC_DIR = drivers/hdf/framework/../../device/board/hisilicon/hispark_taurus/audio_drivers
KHDF_AUDIO_RK3568_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/device/board/hihope/$(DEVICE_NAME)/audio_drivers
KHDF_AUDIO_RK3568_INC_DIR = drivers/hdf/framework/../../device/board/hihope/$(DEVICE_NAME)/audio_drivers
@@ -24,7 +24,6 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO) += \
$(KHDF_AUDIO_ROOT_DIR)/core/src/audio_core.o \
$(KHDF_AUDIO_ROOT_DIR)/core/src/audio_host.o \
$(KHDF_AUDIO_ROOT_DIR)/core/src/audio_parse.o \
$(KHDF_AUDIO_ROOT_DIR)/common/src/audio_accessory_base.o \
$(KHDF_AUDIO_ROOT_DIR)/common/src/audio_codec_base.o \
$(KHDF_AUDIO_ROOT_DIR)/common/src/audio_dsp_base.o \
$(KHDF_AUDIO_ROOT_DIR)/common/src/audio_dai_base.o \
@@ -35,11 +34,11 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO) += \
$(KHDF_AUDIO_ROOT_DIR)/dispatch/src/audio_control_dispatch.o
obj-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \
$(KHDF_AUDIO_HI3516DV300_DIR)/../tfa9879/accessory/src/tfa9879_accessory_adapter.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/../tfa9879/accessory/src/tfa9879_accessory_impl.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/src/hi3516_codec_adapter.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/src/hi3516_codec_impl.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/src/hi3516_codec_ops.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/tfa9879/src/tfa9879_codec_adapter.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/tfa9879/src/tfa9879_codec_ops.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/hi3516/src/hi3516_codec_adapter.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/hi3516/src/hi3516_codec_impl.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/codec/hi3516/src/hi3516_codec_ops.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/dsp/src/dsp_adapter.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/dsp/src/dsp_ops.o \
$(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dai_adapter.o \
@@ -84,10 +83,10 @@ ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Werror\
-I$(srctree)/bounds_checking_function/include
ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \
-I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/include \
-I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/hi3516/include \
-I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/soc/include \
-I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/dsp/include \
-I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/../tfa9879/accessory/include
-I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/tfa9879/include
ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_RK3568) += \
-I$(srctree)/$(KHDF_AUDIO_RK3568_INC_DIR)/soc/include \
test/Makefile
+8 -35
View File
@@ -10,8 +10,6 @@
# GNU General Public License for more details.
include drivers/hdf/khdf/test/test_khdf.mk
HDF_FRAMWORK_TEST_ROOT = ../../../../framework/test/unittest
HDF_FRAMEWOEK_AUDIO_ADM_PATH = drivers/hdf/framework/model/audio
HDF_CODEC_DRIVER_TEST_ROOT = ../../../../peripheral/audio/chipsets/unittest
obj-y += $(HDF_FRAMWORK_TEST_ROOT)/common/hdf_main_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/osal/osal_test_entry.o \
@@ -91,19 +89,18 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_TEST) += $(HDF_FRAMWORK_TEST_ROOT)/model/audio/sr
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_core_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_parse_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_sapm_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_accessory_base_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_codec_base_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_dai_base_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_dma_base_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_dsp_base_test.o \
$(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_platform_base_test.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hdf_audio_driver_test.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_common_func.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_dai_ops_test.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_dma_ops_test.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_codec_ops_test.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_codec_impl_test.o \
$(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_aiao_impl_test.o
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hdf_audio_driver_test.o \
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hi3516_common_func.o \
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hi3516_dai_ops_test.o \
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hi3516_dma_ops_test.o \
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hi3516_codec_ops_test.o \
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hi3516_codec_impl_test.o \
$(HDF_AUDIO_DRIVER_TEST_ROOT)/src/hi3516_aiao_impl_test.o
ccflags-y += -I$(srctree)/drivers/hdf/framework/include \
-I$(srctree)/drivers/hdf/framework/include/osal \
@@ -122,28 +119,4 @@ ccflags-y += -I$(srctree)/drivers/hdf/framework/include \
-I$(srctree)/drivers/hdf/framework/test/unittest/utils/hcs_parser/unittest \
-I$(srctree)/drivers/hdf/framework/include/config \
-I$(srctree)/drivers/hdf/framework/test/unittest/osal \
-I$(srctree)/drivers/hdf/khdf/osal/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/sapm/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/dispatch/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/core/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/device/codec/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/device/soc/include \
-I$(srctree)/$(HDF_FRAMEWOEK_AUDIO_ADM_PATH)/device/accessory/include \
-I$(srctree)/drivers/hdf/framework/model/audio/include \
-I$(srctree)/drivers/hdf/framework/model/audio/sapm/include \
-I$(srctree)/drivers/hdf/framework/model/audio/dispatch/include \
-I$(srctree)/drivers/hdf/framework/test/unittest/model/audio/include \
-I$(srctree)/drivers/hdf/framework/../peripheral/audio/interfaces/include \
-I$(srctree)/drivers/hdf/framework/model/audio/dispatch/include \
-I$(srctree)/drivers/hdf/framework/model/audio/device/codec/include \
-I$(srctree)/drivers/hdf/framework/model/audio/device/soc/include \
-I$(srctree)/drivers/hdf/framework/model/audio/device/accessory/include \
-I$(srctree)/drivers/hdf/framework/../peripheral/audio/chipsets/unittest/model/hi3516dv300/include \
-I$(srctree)/drivers/hdf/framework/model/audio/common/include \
-I$(srctree)/drivers/hdf/framework/include/audio \
-I$(srctree)/drivers/hdf/framework/model/audio/core/include \
-I$(srctree)/drivers/hdf/framework/model/audio/sapm/include \
-I$(srctree)/drivers/hdf/framework/../peripheral/audio/chipsets/hi3516dv300/codec/include \
-I$(srctree)/drivers/hdf/framework/../peripheral/audio/chipsets/hi3516dv300/soc/include \
-I$(srctree)/drivers/hdf/framework/../peripheral/audio/chipsets/hi3516dv300/include
-I$(srctree)/drivers/hdf/khdf/osal/include
test/test_khdf.mk
+14 -1
View File
@@ -13,6 +13,9 @@
HDF_FRAMEWORK_TEST_ROOT = drivers/hdf/framework/test/unittest
HDF_FRAMEWORK_ROOT = drivers/hdf/framework
HDF_AUDIO_ADM_TEST_INC_DIR = drivers/hdf/framework/model/audio
HDF_AUDIO_DRIVER_TEST_ROOT = ../../../../../device/board/hisilicon/hispark_taurus/audio_drivers/unittest
HDF_AUDIO_DRIVER_TEST_INC_DIR = drivers/hdf/framework/../../device/board/hisilicon/hispark_taurus/audio_drivers/unittest
#$(error HDF_FRAMEWORK_ROOT is $(HDF_FRAMEWORK_ROOT))
ccflags-$(CONFIG_DRIVERS_HDF_TEST) += -I$(srctree)/drivers/hdf/framework/include/platform \
@@ -68,4 +71,14 @@ ccflags-$(CONFIG_DRIVERS_HDF_TEST) += -I$(srctree)/drivers/hdf/framework/include
-I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/message \
-I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/sensor \
-I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/include \
-I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/common/include
-I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/common/include \
-I$(srctree)/$(HDF_AUDIO_ADM_TEST_INC_DIR)/sapm/include \
-I$(srctree)/$(HDF_AUDIO_ADM_TEST_INC_DIR)/dispatch/include \
-I$(srctree)/$(HDF_AUDIO_ADM_TEST_INC_DIR)/core/include \
-I$(srctree)/$(HDF_AUDIO_ADM_TEST_INC_DIR)/common/include \
-I$(srctree)/$(HDF_AUDIO_ADM_TEST_INC_DIR)/../../include/audio \
-I$(srctree)/$(HDF_AUDIO_ADM_TEST_INC_DIR)/../../test/unittest/model/audio/include \
-I$(srctree)/$(HDF_AUDIO_DRIVER_TEST_INC_DIR)/model/hi3516dv300/include \
-I$(srctree)/$(HDF_AUDIO_DRIVER_TEST_INC_DIR)/../codec/hi3516/include \
-I$(srctree)/$(HDF_AUDIO_DRIVER_TEST_INC_DIR)/../soc/include \
-I$(srctree)/$(HDF_AUDIO_DRIVER_TEST_INC_DIR)/../include