diff --git a/model/audio/Kconfig b/model/audio/Kconfig
index 6874338911c68b436f8fedff14acdbd9a744334c..efb17c9560c5358e235e70470eed92f567ccbc86 100755
--- a/model/audio/Kconfig
+++ b/model/audio/Kconfig
@@ -4,7 +4,7 @@ config DRIVERS_HDF_AUDIO
     depends on DRIVERS_HDF
     help
         Answer Y to choice HDF Audio driver.
-config DRIVERS_HDF_AUDIO_CODEC
+config DRIVERS_HDF_AUDIO_HI3516CODEC
     bool "Enable HDF Audio Codec driver"
     default n
     depends on DRIVERS_HDF_AUDIO
diff --git a/model/audio/Makefile b/model/audio/Makefile
index bdc0eefb9b46384d9d1cc168e722e9555ff94597..dd0d3c2d41c1a911e8d07b2b2e0c64f8165b0e14 100755
--- a/model/audio/Makefile
+++ b/model/audio/Makefile
@@ -33,13 +33,14 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO) += \
           $(KHDF_AUDIO_ROOT_DIR)/dispatch/src/audio_stream_dispatch.o \
           $(KHDF_AUDIO_ROOT_DIR)/dispatch/src/audio_control_dispatch.o
 
-obj-$(CONFIG_DRIVERS_HDF_AUDIO_CODEC) += \
+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)/dsp/src/dsp_adapter.o \
+          $(KHDF_AUDIO_HI3516DV300_DIR)/dsp/src/dsp_ops.o \
           $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dai_adapter.o \
           $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dai_ops.o \
           $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_aiao_impl.o \
@@ -62,8 +63,8 @@ ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Werror \
              -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/common/include \
              -I$(srctree)/bounds_checking_function/include
 
-ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_CODEC) += \
+ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \
              -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/include \
              -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/soc/include \
-             -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/include \
+             -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/dsp/include \
              -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/../tfa9879/accessory/include
diff --git a/test/Makefile b/test/Makefile
index f17035e42b5c3effc8c1ff76929daff3ab3abde3..2294e0e58b854eb57fff9b178aceb26779288fba 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,6 +10,8 @@
 # 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 \
@@ -61,32 +63,59 @@ 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_stream_dispatch_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
 
-ccflags-y +=-I$(srctree)/drivers/hdf/framework/include \
-            -I$(srctree)/drivers/hdf/framework/include/osal \
-            -I$(srctree)/drivers/hdf/framework/include/utils \
-            -I$(srctree)/drivers/hdf/framework/include \
-            -I$(srctree)/drivers/hdf/framework/utils/include \
-            -I$(srctree)/drivers/hdf/framework/include/core \
-            -I$(srctree)/drivers/hdf/framework/core/host/include \
-            -I$(srctree)/drivers/hdf/framework/core/manager/include \
-            -I$(srctree)/drivers/hdf/framework/core/shared/include \
-            -I$(srctree)/drivers/hdf/framework/core/common/include/host \
-            -I$(srctree)/drivers/hdf/framework/core/common/include/manager \
-            -I$(srctree)/drivers/hdf/framework/core/adapter/vnode/include \
-            -I$(srctree)/bounds_checking_function/include \
-            -I$(srctree)/drivers/hdf/framework/test/unittest/config \
-            -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)/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
+ccflags-y += -I$(srctree)/drivers/hdf/framework/include \
+             -I$(srctree)/drivers/hdf/framework/include/osal \
+             -I$(srctree)/drivers/hdf/framework/include/utils \
+             -I$(srctree)/drivers/hdf/framework/include \
+             -I$(srctree)/drivers/hdf/framework/utils/include \
+             -I$(srctree)/drivers/hdf/framework/include/core \
+             -I$(srctree)/drivers/hdf/framework/core/host/include \
+             -I$(srctree)/drivers/hdf/framework/core/manager/include \
+             -I$(srctree)/drivers/hdf/framework/core/shared/include \
+             -I$(srctree)/drivers/hdf/framework/core/common/include/host \
+             -I$(srctree)/drivers/hdf/framework/core/common/include/manager \
+             -I$(srctree)/drivers/hdf/framework/core/adapter/vnode/include \
+             -I$(srctree)/bounds_checking_function/include \
+             -I$(srctree)/drivers/hdf/framework/test/unittest/config \
+             -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