From f80db14ea800f86cb45faab86eab9a2a0cf622e2 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Tue, 19 Oct 2021 11:27:40 +0000 Subject: [PATCH] update audio code Signed-off-by: vb6174 --- model/audio/common/src/audio_accessory_base.c | 14 +- model/audio/common/src/audio_platform_base.c | 1 - model/audio/core/src/audio_host.c | 9 +- .../test/unittest/common/audio_core_test.cpp | 64 +-- .../test/unittest/common/audio_host_test.cpp | 4 +- .../test/unittest/common/audio_parse_test.cpp | 2 +- .../dispatch/src/audio_stream_dispatch.c | 6 +- .../common/audio_stream_dispatch_test.cpp | 5 +- model/audio/sapm/src/audio_sapm.c | 20 +- .../test/unittest/common/audio_sapm_test.cpp | 13 +- test/unittest/common/hdf_main_test.c | 1 + test/unittest/common/hdf_main_test.h | 1 + .../model/audio/include/audio_core_test.h | 41 +- .../model/audio/include/audio_host_test.h | 1 - .../model/audio/include/hdf_audio_test.h | 43 +- .../model/audio/src/audio_core_test.c | 512 ++++++++++++++---- .../model/audio/src/audio_host_test.c | 27 +- .../model/audio/src/audio_parse_test.c | 18 +- .../audio/src/audio_stream_dispatch_test.c | 11 - .../unittest/model/audio/src/hdf_audio_test.c | 45 +- 20 files changed, 580 insertions(+), 258 deletions(-) diff --git a/model/audio/common/src/audio_accessory_base.c b/model/audio/common/src/audio_accessory_base.c index 715440022..aa0773774 100755 --- a/model/audio/common/src/audio_accessory_base.c +++ b/model/audio/common/src/audio_accessory_base.c @@ -7,12 +7,16 @@ */ #include "audio_accessory_base.h" -#include "audio_device_log.h" +#include "audio_core.h" #define HDF_LOG_TAG audio_accessory_base int32_t FormatToBitWidth(enum AudioFormat format, uint16_t *bitWidth) { + if (bitWidth == NULL) { + AUDIO_DRIVER_LOG_ERR("input param is NULL"); + return HDF_FAILURE; + } // current set default format(standard) for 16/24 bit switch (format) { case AUDIO_FORMAT_PCM_16_BIT: @@ -22,7 +26,7 @@ int32_t FormatToBitWidth(enum AudioFormat format, uint16_t *bitWidth) *bitWidth = I2S_SAMPLE_FORMAT_REG_VAL_24; break; default: - AUDIO_DEVICE_LOG_ERR("format: %d is not support.", format); + AUDIO_DRIVER_LOG_ERR("format: %d is not support.", format); return HDF_ERR_NOT_SUPPORT; } return HDF_SUCCESS; @@ -30,6 +34,10 @@ int32_t FormatToBitWidth(enum AudioFormat format, uint16_t *bitWidth) int32_t RateToFrequency(uint32_t rate, uint16_t *freq) { + if (freq == NULL) { + AUDIO_DRIVER_LOG_ERR("input param is NULL"); + return HDF_FAILURE; + } switch (rate) { case I2S_SAMPLE_FREQUENCY_8000: *freq = I2S_SAMPLE_FREQUENCY_REG_VAL_8000; @@ -68,7 +76,7 @@ int32_t RateToFrequency(uint32_t rate, uint16_t *freq) *freq = I2S_SAMPLE_FREQUENCY_REG_VAL_96000; break; default: - AUDIO_DEVICE_LOG_ERR("rate: %d is not support.", rate); + AUDIO_DRIVER_LOG_ERR("rate: %d is not support.", rate); return HDF_ERR_NOT_SUPPORT; } return HDF_SUCCESS; diff --git a/model/audio/common/src/audio_platform_base.c b/model/audio/common/src/audio_platform_base.c index 3f6747519..6163fdf72 100755 --- a/model/audio/common/src/audio_platform_base.c +++ b/model/audio/common/src/audio_platform_base.c @@ -74,6 +74,5 @@ int32_t AudioDataBigEndianChange(char *srcData, uint32_t audioLen, enum DataBitW } break; } - AUDIO_DRIVER_LOG_DEBUG("audioLen = %d\n", audioLen); return HDF_SUCCESS; } diff --git a/model/audio/core/src/audio_host.c b/model/audio/core/src/audio_host.c index 5ef6da851..574cbdf1e 100755 --- a/model/audio/core/src/audio_host.c +++ b/model/audio/core/src/audio_host.c @@ -41,6 +41,7 @@ struct AudioCard *GetCardInstance(const char *serviceName) return audioCard; } } + ADM_LOG_ERR("serviceName is %s.", serviceName); return NULL; } @@ -387,8 +388,12 @@ static int32_t AudioDriverInit(struct HdfDeviceObject *device) } /* Bind specific codec、platform and dai device */ - AudioBindDaiLink(audioCard, &(audioCard->configData)); - if (!audioCard->rtd->complete) { + ret = AudioBindDaiLink(audioCard, &(audioCard->configData)); + if (ret != HDF_SUCCESS) { + ADM_LOG_ERR("AudioBindDaiLink fail ret=%d", ret); + return HDF_FAILURE; + } + if (audioCard->rtd == NULL || (!audioCard->rtd->complete)) { ADM_LOG_ERR("AudioBindDaiLink fail!"); return HDF_ERR_IO; } diff --git a/model/audio/core/test/unittest/common/audio_core_test.cpp b/model/audio/core/test/unittest/common/audio_core_test.cpp index 91f8f7900..854107077 100755 --- a/model/audio/core/test/unittest/common/audio_core_test.cpp +++ b/model/audio/core/test/unittest/common/audio_core_test.cpp @@ -38,193 +38,193 @@ void AudioCoreTest::TearDown() { } -HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterPlatform, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterPlatform, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTREGISTERPLATFORM, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterDai, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterDai, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTREGISTERDAI, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterAccessory, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterAccessory, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTREGISTERACCESSORY, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterCodec, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_RegisterCodec, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTREGISTERCODEC, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_SocRegisterDsp, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_SocRegisterDsp, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTREGISTERDSP, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_SocDeviceRegister, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_SocDeviceRegister, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTSOCDEVICEREGISTER, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_BindDaiLink, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_BindDaiLink, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTBINDDAILINK, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateCodecRegBits, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateCodecRegBits, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTUPDATECODECREGBITS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateAccessoryRegBits, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateAccessoryRegBits, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTUPDATEACCESSORYREGBITS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateCodecAiaoRegBits, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateCodecAiaoRegBits, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTUPDATECODECAIAOREGBITS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateAccessoryAiaoRegBits, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_UpdateAccessoryAiaoRegBits, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTUPDATEACCESSORYAIAOREGBITS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_KcontrolGetCodec, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_KcontrolGetCodec, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTKCONTROLGETCODEC, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_KcontrolGetAccessory, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_KcontrolGetAccessory, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTKCONTROLGETACCESSORY, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AddControl, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AddControl, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTADDCONTROL, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AddControls, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AddControls, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTADDCONTROLS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecReadReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecReadReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECREADREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryReadReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryReadReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYREADREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoReadReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoReadReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECAIAOREADREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoReadReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoReadReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYAIAOREADREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecWriteReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecWriteReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECWRITEREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryWriteReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryWriteReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYWRITEREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoWriteReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoWriteReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECAIAOWRITEREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoWriteReg, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoWriteReg, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYAIAOWRITEREG, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_InfoCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_InfoCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTINFOCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecGetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecGetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECGETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryGetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryGetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYGETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoGetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoGetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECAIAOGETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoGetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoGetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYAIAOGETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecSetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecSetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECSETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessorySetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessorySetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYSETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoSetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_CodecAiaoSetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTCODECAIAOSETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoSetCtrlOps, TestSize.Level0) +HWTEST_F(AudioCoreTest, AudioCoreTest_AccessoryAiaoSetCtrlOps, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTACCESSORYAIAOSETCTRLOPS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); diff --git a/model/audio/core/test/unittest/common/audio_host_test.cpp b/model/audio/core/test/unittest/common/audio_host_test.cpp index 6632edb9a..119ab6d6c 100755 --- a/model/audio/core/test/unittest/common/audio_host_test.cpp +++ b/model/audio/core/test/unittest/common/audio_host_test.cpp @@ -39,13 +39,13 @@ void AudioHostTest::TearDown() { } -HWTEST_F(AudioHostTest, AudioHostTest_GetCodec, TestSize.Level0) +HWTEST_F(AudioHostTest, AudioHostTest_GetCodec, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTGETCODEC, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioHostTest, AudioHostTest_GetAudioServiceName, TestSize.Level0) +HWTEST_F(AudioHostTest, AudioHostTest_GetAudioServiceName, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTGETCARDINSTANCE, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); diff --git a/model/audio/core/test/unittest/common/audio_parse_test.cpp b/model/audio/core/test/unittest/common/audio_parse_test.cpp index 6b612d03a..dd0e5bf7a 100755 --- a/model/audio/core/test/unittest/common/audio_parse_test.cpp +++ b/model/audio/core/test/unittest/common/audio_parse_test.cpp @@ -39,7 +39,7 @@ void AudioParseTest::TearDown() { } -HWTEST_F(AudioParseTest, AudioParseTest_GetConfigData, TestSize.Level0) +HWTEST_F(AudioParseTest, AudioParseTest_GetConfigData, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTGETCCNFIGDATA, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); diff --git a/model/audio/dispatch/src/audio_stream_dispatch.c b/model/audio/dispatch/src/audio_stream_dispatch.c index 0bb697ed6..ecbf5af3d 100755 --- a/model/audio/dispatch/src/audio_stream_dispatch.c +++ b/model/audio/dispatch/src/audio_stream_dispatch.c @@ -397,7 +397,7 @@ static int32_t StreamTransferWrite(const struct AudioCard *audioCard, struct Aud return HDF_SUCCESS; } -static int32_t StreamTransferMmapWrite(const struct AudioCard *audioCard, struct AudioTxMmapData *txMmapData) +static int32_t StreamTransferMmapWrite(const struct AudioCard *audioCard, const struct AudioTxMmapData *txMmapData) { struct PlatformDevice *platform = NULL; int32_t ret = HDF_SUCCESS; @@ -425,7 +425,7 @@ static int32_t StreamTransferMmapWrite(const struct AudioCard *audioCard, struct return HDF_SUCCESS; } -static int32_t StreamTransferMmapRead(const struct AudioCard *audioCard, struct AudioRxMmapData *rxMmapData) +static int32_t StreamTransferMmapRead(const struct AudioCard *audioCard, const struct AudioRxMmapData *rxMmapData) { struct PlatformDevice *platform = NULL; int32_t ret = HDF_SUCCESS; @@ -465,7 +465,7 @@ int32_t StreamHostWrite(const struct HdfDeviceIoClient *client, struct HdfSBuf * ADM_LOG_ERR("input param is NULL."); return HDF_FAILURE; } - + (void)memset_s(&transfer, sizeof(struct AudioTxData), 0, sizeof(struct AudioTxData)); if (!HdfSbufReadUint32(data, (uint32_t *)&(transfer.frames))) { ADM_LOG_ERR("read request frames failed!"); return HDF_FAILURE; diff --git a/model/audio/dispatch/test/unittest/common/audio_stream_dispatch_test.cpp b/model/audio/dispatch/test/unittest/common/audio_stream_dispatch_test.cpp index 50bd21dcb..68b415642 100755 --- a/model/audio/dispatch/test/unittest/common/audio_stream_dispatch_test.cpp +++ b/model/audio/dispatch/test/unittest/common/audio_stream_dispatch_test.cpp @@ -11,7 +11,7 @@ #include "hdf_uhdf_test.h" using namespace testing::ext; - +namespace { class AudioStreamDispatchTest : public testing::Test { public: static void SetUpTestCase(); @@ -38,8 +38,9 @@ void AudioStreamDispatchTest::TearDown() { } -HWTEST_F(AudioStreamDispatchTest, AudioStreamDispatchTest001, TestSize.Level0) +HWTEST_F(AudioStreamDispatchTest, AudioStreamDispatchTest001, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTSTREAMDISPATCH, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } +} diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index af5815025..496d087a4 100755 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -675,7 +675,7 @@ int32_t AudioSapmNewMixerControls(struct AudioSapmComponent *sapmComponent, stru struct AudioSapmpath *path = NULL; int32_t i; - if (sapmComponent == NULL || audioCard == NULL) { + if (sapmComponent == NULL || sapmComponent->kcontrols == NULL || audioCard == NULL) { ADM_LOG_ERR("input params check error: sapmComponent=%p, audioCard=%p.", sapmComponent, audioCard); return HDF_FAILURE; } @@ -722,6 +722,11 @@ int AudioSapmNewMuxControls(struct AudioSapmComponent *sapmComponent, struct Aud ADM_LOG_ERR("add control fail!"); return HDF_FAILURE; } + + if (sapmComponent->kcontrols == NULL) { + ADM_LOG_ERR("sapmComponent->kcontrols is NULL!"); + return HDF_FAILURE; + } sapmComponent->kcontrols[0] = kctrl; DListInsertHead(&sapmComponent->kcontrols[0]->list, &audioCard->controls); @@ -1126,14 +1131,13 @@ int32_t AudioCodecSapmSetCtrlOps(const struct AudioKcontrol *kcontrol, const str ADM_LOG_ERR("Device read register is failure!"); return HDF_FAILURE; } - if (MixerUpdatePowerStatus(kcontrol, pathStatus) != HDF_SUCCESS) { - ADM_LOG_ERR("update power status is failure!"); - return HDF_FAILURE; - } - curValue &= mixerCtrl->mask << mixerCtrl->shift; value = (value & mixerCtrl->mask) << mixerCtrl->shift; - if (curValue != value) { + if (curValue != value || g_audioSapmIsSleep == true) { + if (MixerUpdatePowerStatus(kcontrol, pathStatus) != HDF_SUCCESS) { + ADM_LOG_ERR("update power status is failure!"); + return HDF_FAILURE; + } if (AudioUpdateCodecRegBits(codec, mixerCtrl, elemValue->value[0]) != HDF_SUCCESS) { ADM_LOG_ERR("update reg bits fail!"); return HDF_FAILURE; @@ -1166,7 +1170,7 @@ int32_t AudioAccessorySapmSetCtrlOps(const struct AudioKcontrol *kcontrol, const } curValue &= mixerCtrl->mask << mixerCtrl->shift; value = (value & mixerCtrl->mask) << mixerCtrl->shift; - if (curValue != value) { + if (curValue != value || g_audioSapmIsSleep == true) { if (MixerUpdatePowerStatus(kcontrol, pathStatus) != HDF_SUCCESS) { ADM_LOG_ERR("update power status fail!"); return HDF_FAILURE; diff --git a/model/audio/sapm/test/unittest/common/audio_sapm_test.cpp b/model/audio/sapm/test/unittest/common/audio_sapm_test.cpp index 7d700a9da..d56b40374 100755 --- a/model/audio/sapm/test/unittest/common/audio_sapm_test.cpp +++ b/model/audio/sapm/test/unittest/common/audio_sapm_test.cpp @@ -11,7 +11,7 @@ #include "hdf_uhdf_test.h" using namespace testing::ext; - +namespace { class AudioSapmTest : public testing::Test { public: static void SetUpTestCase(); @@ -38,32 +38,33 @@ void AudioSapmTest::TearDown() { } -HWTEST_F(AudioSapmTest, AudioSapmTest001, TestSize.Level0) +HWTEST_F(AudioSapmTest, AudioSapmTest001, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTNEWCOMPONENT, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioSapmTest, AudioSapmTest002, TestSize.Level0) +HWTEST_F(AudioSapmTest, AudioSapmTest002, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTADDROUTES, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioSapmTest, AudioSapmTest003, TestSize.Level0) +HWTEST_F(AudioSapmTest, AudioSapmTest003, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTNEWCONTROLS, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioSapmTest, AudioSapmTest004, TestSize.Level0) +HWTEST_F(AudioSapmTest, AudioSapmTest004, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTPOWERCOMPONET, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } -HWTEST_F(AudioSapmTest, AudioSapmTest005, TestSize.Level0) +HWTEST_F(AudioSapmTest, AudioSapmTest005, TestSize.Level1) { struct HdfTestMsg msg = {g_testAudioType, TESTREFRESHTIME, -1}; EXPECT_EQ(0, HdfTestSendMsgToService(&msg)); } +} diff --git a/test/unittest/common/hdf_main_test.c b/test/unittest/common/hdf_main_test.c index 205ac2ded..afc95eff1 100644 --- a/test/unittest/common/hdf_main_test.c +++ b/test/unittest/common/hdf_main_test.c @@ -115,6 +115,7 @@ HdfTestFuncList g_hdfTestFuncList[] = { #endif #if defined(LOSCFG_DRIVERS_HDF_AUDIO_TEST) || defined(CONFIG_DRIVERS_HDF_AUDIO_TEST) {TEST_AUDIO_TYPE, HdfAudioEntry}, + {TEST_AUDIO_DRIVER_TYPE, HdfAudioDriverEntry}, #endif #if defined(LOSCFG_DRIVERS_HDF_USB_DDK_DEVICE) || defined(CONFIG_DRIVERS_HDF_USB_DDK_DEVICE) {TEST_USB_DEVICE_TYPE, HdfUsbDeviceEntry}, diff --git a/test/unittest/common/hdf_main_test.h b/test/unittest/common/hdf_main_test.h index c54969825..3af8923c0 100644 --- a/test/unittest/common/hdf_main_test.h +++ b/test/unittest/common/hdf_main_test.h @@ -68,6 +68,7 @@ typedef enum { TEST_WIFI_END = 600, TEST_CONFIG_TYPE = 601, TEST_AUDIO_TYPE = 701, + TEST_AUDIO_DRIVER_TYPE = TEST_AUDIO_TYPE + 1, TEST_HDF_FRAME_END = 800, TEST_USB_DEVICE_TYPE = 900, TEST_USB_HOST_TYPE = 1000, diff --git a/test/unittest/model/audio/include/audio_core_test.h b/test/unittest/model/audio/include/audio_core_test.h index b36a9f99c..fcf6a5d53 100755 --- a/test/unittest/model/audio/include/audio_core_test.h +++ b/test/unittest/model/audio/include/audio_core_test.h @@ -17,25 +17,38 @@ extern "C" { #endif #endif /* __cplusplus */ -int32_t AudioSocTestRegisterDai(void); int32_t AudioSocTestRegisterPlatform(void); +int32_t AudioSocTestRegisterDai(void); +int32_t AudioTestRegisterAccessory(void); int32_t AudioTestRegisterCodec(void); -int32_t AudioTestBindDaiLink(void); +int32_t AudioTestRegisterDsp(void); int32_t AudioTestSocDeviceRegister(void); -int32_t AudioTestSocRegisterDsp(void); -int32_t AudioTestRegisterAccessory(void); -int32_t AudioTestUpdateRegBits(void); -int32_t AudioTestAiaoUpdateRegBits(void); +int32_t AudioTestBindDaiLink(void); +int32_t AudioTestUpdateCodecRegBits(void); +int32_t AudioTestUpdateAccessoryRegBits(void); +int32_t AudioTestUpdateCodecAiaoRegBits(void); +int32_t AudioTestUpdateAccessoryAiaoRegBits(void); int32_t AudioTestKcontrolGetCodec(void); -int32_t AudioTestAddControls(void); +int32_t AudioTestKcontrolGetAccessory(void); int32_t AudioTestAddControl(void); -int32_t AudioTestDeviceReadReg(void); -int32_t AudioTestAiaoDeviceReadReg(void); -int32_t AudioTestInfoCtrlSw(void); -int32_t AudioTestGetCtrlSw(void); -int32_t AudioTestPutCtrlSw(void); -int32_t AiaoTestGetCtrlSw(void); -int32_t AiaoTestPutCtrlSw(void); +int32_t AudioTestAddControls(void); +int32_t AudioTestCodecReadReg(void); +int32_t AudioTestAccessoryReadReg(void); +int32_t AudioTestCodecAiaoReadReg(void); +int32_t AudioTestAccessoryAiaoReadReg(void); +int32_t AudioTestCodecWriteReg(void); +int32_t AudioTestAccessoryWriteReg(void); +int32_t AudioTestCodecAiaoWriteReg(void); +int32_t AudioTestAccessoryAiaoWriteReg(void); +int32_t AudioTestInfoCtrlOps(void); +int32_t AudioTestCodecGetCtrlOps(void); +int32_t AudioTestAccessoryGetCtrlOps(void); +int32_t AudioTestCodecAiaoGetCtrlOps(void); +int32_t AudioTestAccessoryAiaoGetCtrlOps(void); +int32_t AudioTestCodecSetCtrlOps(void); +int32_t AudioTestAccessorySetCtrlOps(void); +int32_t AudioTestCodecAiaoSetCtrlOps(void); +int32_t AudioTestAccessoryAiaoSetCtrlOps(void); #ifdef __cplusplus #if __cplusplus diff --git a/test/unittest/model/audio/include/audio_host_test.h b/test/unittest/model/audio/include/audio_host_test.h index 42160326b..abb05d3ac 100755 --- a/test/unittest/model/audio/include/audio_host_test.h +++ b/test/unittest/model/audio/include/audio_host_test.h @@ -19,7 +19,6 @@ extern "C" { int32_t AudioKcontrolTestGetCodec(void); int32_t GetCardTestInstance(void); -int32_t AudioHostTestDestroy(void); #ifdef __cplusplus #if __cplusplus diff --git a/test/unittest/model/audio/include/hdf_audio_test.h b/test/unittest/model/audio/include/hdf_audio_test.h index 36a3f34de..9da3251a5 100755 --- a/test/unittest/model/audio/include/hdf_audio_test.h +++ b/test/unittest/model/audio/include/hdf_audio_test.h @@ -20,34 +20,45 @@ extern "C" { typedef enum { AUDIO_DRIVER_TESTGETCODEC, AUDIO_DRIVER_TESTGETCARDINSTANCE, - AUDIO_DRIVER_TESTHOSTDESTROY, AUDIO_DRIVER_TESTGETCCNFIGDATA, - AUDIO_DRIVER_TESTREGISTERDAI, AUDIO_DRIVER_TESTREGISTERPLATFORM, + AUDIO_DRIVER_TESTREGISTERDAI, + AUDIO_DRIVER_TESTREGISTERACCESSORY, AUDIO_DRIVER_TESTREGISTERCODEC, - AUDIO_DRIVER_TESTBINDDAILINK, - AUDIO_DRIVER_TESTDEVICEREGISTER, AUDIO_DRIVER_TESTREGISTERDSP, - AUDIO_DRIVER_TESTREGISTERACCESSORY, - AUDIO_DRIVER_TESTUPDATEREGBITS, - AUDIO_DRIVER_TESTAIAOUPDATEREGBITS, + AUDIO_DRIVER_TESTSOCDEVICEREGISTER, + AUDIO_DRIVER_TESTBINDDAILINK, + AUDIO_DRIVER_TESTUPDATECODECREGBITS, + AUDIO_DRIVER_TESTUPDATEACCESSORYREGBITS, + AUDIO_DRIVER_TESTUPDATECODECAIAOREGBITS, + AUDIO_DRIVER_TESTUPDATEACCESSORYAIAOREGBITS, AUDIO_DRIVER_TESTKCONTROLGETCODEC, - AUDIO_DRIVER_TESTADDCONTROLS, + AUDIO_DRIVER_TESTKCONTROLGETACCESSORY, AUDIO_DRIVER_TESTADDCONTROL, - AUDIO_DRIVER_TESTDEVICEREADREG, - AUDIO_DRIVER_TESTAIAODEVICEREADREG, - AUDIO_DRIVER_TESTINFOCTRLSW, - AUDIO_DRIVER_TESTGETCTRLSW, - AUDIO_DRIVER_TESTPUTCTRLSW, - AUDIO_DRIVER_TESTAIAOGETCTRLSW, - AUDIO_DRIVER_TESTAIAOPUTCTRLSW, + AUDIO_DRIVER_TESTADDCONTROLS, + AUDIO_DRIVER_TESTCODECREADREG, + AUDIO_DRIVER_TESTACCESSORYREADREG, + AUDIO_DRIVER_TESTCODECAIAOREADREG, + AUDIO_DRIVER_TESTACCESSORYAIAOREADREG, + AUDIO_DRIVER_TESTCODECWRITEREG, + AUDIO_DRIVER_TESTACCESSORYWRITEREG, + AUDIO_DRIVER_TESTCODECAIAOWRITEREG, + AUDIO_DRIVER_TESTACCESSORYAIAOWRITEREG, + AUDIO_DRIVER_TESTINFOCTRLOPS, + AUDIO_DRIVER_TESTCODECGETCTRLOPS, + AUDIO_DRIVER_TESTACCESSORYGETCTRLOPS, + AUDIO_DRIVER_TESTCODECAIAOGETCTRLOPS, + AUDIO_DRIVER_TESTACCESSORYAIAOGETCTRLOPS, + AUDIO_DRIVER_TESTCODECSETCTRLOPS, + AUDIO_DRIVER_TESTACCESSORYSETCTRLOPS, + AUDIO_DRIVER_TESTCODECAIAOSETCTRLOPS, + AUDIO_DRIVER_TESTACCESSORYAIAOSETCTRLOPS, AUDIO_DRIVER_TESTNEWCOMPONENT, AUDIO_DRIVER_TESTADDROUTES, AUDIO_DRIVER_TESTNEWCONTROLS, AUDIO_DRIVER_TESTPOWERCOMPONET, AUDIO_DRIVER_TESTREFRESHTIME, AUDIO_DRIVER_TESTSTREAMDISPATCH, - AUDIO_DRIVER_TESTSTREAMDESTORY, } HdfAudioTestCaseCmd; int32_t HdfAudioEntry(HdfTestMsg *msg); diff --git a/test/unittest/model/audio/src/audio_core_test.c b/test/unittest/model/audio/src/audio_core_test.c index 1c2c1a47b..9f4fc2daa 100755 --- a/test/unittest/model/audio/src/audio_core_test.c +++ b/test/unittest/model/audio/src/audio_core_test.c @@ -8,68 +8,140 @@ #include "audio_core_test.h" #include "audio_core.h" +#include "audio_parse.h" +#include "devsvc_manager_clnt.h" #define HDF_LOG_TAG audio_core_test +#define AUDIO_CORE_SERVICE_TEST_NAME "hdf_audio_codec_dev0" +#define PLATFORM_TEST_NAME "codec_service_1" +#define PLATFORM_CODEC_TEST_NAME "codec_service_0" +#define ACCESSORY_DAI_TEST_NAME "accessory_dai" +#define DSP_TEST_NAME "dsp_service_0" + +const struct AudioMixerControl g_audioMixerRegParams = { + .reg = 0x2004, /* [0] output volume */ + .rreg = 0x2004, /* register value */ + .shift = 8, /* offset */ + .rshift = 8, /* right offset */ + .min = 0x28, /* min value */ + .max = 0x7F, /* max value */ + .mask = 0x7F, /* mask value */ + .invert = 0, /* invert */ +}; + +int32_t AudioSocTestRegisterPlatform(void) +{ + HDF_LOGI("%s: enter", __func__); + + if (AudioSocRegisterPlatform(NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocRegisterPlatform fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + struct PlatformData data = { + .drvPlatformName = PLATFORM_TEST_NAME, + }; + if (AudioSocRegisterPlatform(device, &data) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocRegisterPlatform fail", __func__); + return HDF_FAILURE; + } + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} int32_t AudioSocTestRegisterDai(void) { - int32_t ret; - struct HdfDeviceObject *device = NULL; - struct DaiData *data = NULL; HDF_LOGI("%s: enter", __func__); - ret = AudioSocRegisterDai(device, data); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioSocRegisterDai fail ret = %d", __func__, ret); + if (AudioSocRegisterDai(NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocRegisterDai fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + struct DaiData data = { + .drvDaiName = ACCESSORY_DAI_TEST_NAME, + }; + if (AudioSocRegisterDai(device, &data) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocRegisterDai fail", __func__, __LINE__); + return HDF_FAILURE; } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioSocTestRegisterPlatform(void) +int32_t AudioTestRegisterAccessory(void) { - int32_t ret; - struct HdfDeviceObject *device = NULL; - struct PlatformData *data = NULL; HDF_LOGI("%s: enter", __func__); - ret = AudioSocRegisterPlatform(device, data); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioSocRegisterPlatform fail ret = %d", __func__, ret); + if (AudioRegisterAccessory(NULL, NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioRegisterAccessory fail", __func__, __LINE__); + return HDF_FAILURE; } + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + struct AccessoryData data = { + .drvAccessoryName = ACCESSORY_DAI_TEST_NAME, + }; + struct DaiData daiData = { + .drvDaiName = ACCESSORY_DAI_TEST_NAME, + }; + + if (AudioRegisterAccessory(device, &data, &daiData) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioRegisterAccessory fail", __func__, __LINE__); + return HDF_FAILURE; + } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } int32_t AudioTestRegisterCodec(void) { - int32_t ret; - struct HdfDeviceObject *device = NULL; - struct CodecData *codecData = NULL; - struct DaiData *daiData = NULL; HDF_LOGI("%s: enter", __func__); - ret = AudioRegisterCodec(device, codecData, daiData); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioRegisterCodec fail ret = %d", __func__, ret); + if (AudioRegisterCodec(NULL, NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioRegisterCodec fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + struct CodecData codecData = { + .drvCodecName = ACCESSORY_DAI_TEST_NAME, + }; + struct DaiData daiData = { + .drvDaiName = ACCESSORY_DAI_TEST_NAME, + }; + if (AudioRegisterCodec(device, &codecData, &daiData) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioRegisterCodec fail", __func__, __LINE__); + return HDF_FAILURE; } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestBindDaiLink(void) +int32_t AudioTestRegisterDsp(void) { - int32_t ret; - struct AudioCard *audioCard = NULL; - struct AudioConfigData *configData = NULL; HDF_LOGI("%s: enter", __func__); - ret = AudioBindDaiLink(audioCard, configData); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioBindDaiLink fail ret = %d", __func__, ret); + if (AudioRegisterDsp(NULL, NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocRegisterDsp fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + struct DaiData daiData = { + .drvDaiName = ACCESSORY_DAI_TEST_NAME, + }; + struct DspData dspData = { + .drvDspName = DSP_TEST_NAME, + }; + + if (AudioRegisterDsp(device, &dspData, &daiData) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocRegisterDsp fail", __func__, __LINE__); + return HDF_FAILURE; } HDF_LOGI("%s: success", __func__); @@ -78,86 +150,147 @@ int32_t AudioTestBindDaiLink(void) int32_t AudioTestSocDeviceRegister(void) { - int32_t ret; - void *data = NULL; - enum AudioDeviceType deviceType; - struct HdfDeviceObject *device = NULL; + struct { + char *name; + } data; + + enum AudioDeviceType deviceType = AUDIO_DAI_DEVICE; HDF_LOGI("%s: enter", __func__); - ret = AudioSocDeviceRegister(device, data, deviceType); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioSocDeviceRegister fail ret = %d", __func__, ret); + if (AudioSocDeviceRegister(NULL, NULL, deviceType) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocDeviceRegister fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + data.name = ACCESSORY_DAI_TEST_NAME; + if (AudioSocDeviceRegister(device, &data, deviceType) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocDeviceRegister fail", __func__, __LINE__); + return HDF_FAILURE; } + deviceType = AUDIO_PLATFORM_DEVICE; + data.name = PLATFORM_TEST_NAME; + if (AudioSocDeviceRegister(device, &data, deviceType) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioSocDeviceRegister fail", __func__, __LINE__); + return HDF_FAILURE; + } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestSocRegisterDsp(void) +int32_t AudioTestBindDaiLink(void) { - int32_t ret; - struct HdfDeviceObject *device = NULL; - struct DaiData *data = NULL; HDF_LOGI("%s: enter", __func__); - ret = AudioSocRegisterDsp(device, data); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioSocRegisterDsp fail ret = %d", __func__, ret); + if (AudioBindDaiLink(NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioBindDaiLink fail", __func__, __LINE__); + return HDF_FAILURE; } + struct AudioCard *card = (struct AudioCard *)OsalMemCalloc(sizeof(struct AudioCard)); + if (card == NULL) { + ADM_LOG_ERR("%s_[%d] Malloc audioCard fail!", __func__, __LINE__); + return HDF_FAILURE; + } + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(AUDIO_CORE_SERVICE_TEST_NAME); + if (AudioFillConfigData(device, &(card->configData)) != HDF_SUCCESS) { + ADM_LOG_ERR("%s_[%d] AudioFillConfigData fail", __func__, __LINE__); + OsalMemFree(card); + card = NULL; + return HDF_FAILURE; + } + + if (AudioBindDaiLink(card, &(card->configData)) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioBindDaiLink fail", __func__, __LINE__); + OsalMemFree(card); + card = NULL; + return HDF_FAILURE; + } + OsalMemFree(card->rtd); + card->rtd = NULL; + OsalMemFree(card); + card = NULL; HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestRegisterAccessory(void) +int32_t ReadCodecReg(const struct CodecDevice *codec, uint32_t reg, uint32_t *val) { - int32_t ret; - struct HdfDeviceObject *device = NULL; - struct AccessoryData *data = NULL; - struct DaiData *daiData = NULL; - HDF_LOGI("%s: enter", __func__); + return HDF_SUCCESS; +} - ret = AudioRegisterAccessory(device, data, daiData); - if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioRegisterAccessory fail ret = %d", __func__, ret); +int32_t WriteCodecReg(const struct CodecDevice *codec, uint32_t reg, uint32_t val) +{ + return HDF_SUCCESS; +} +int32_t AudioTestUpdateCodecRegBits(void) +{ + int32_t value = 0; + if (AudioUpdateCodecRegBits(NULL, NULL, value) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioUpdateCodecRegBits fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct CodecData codecData = { + .Read = ReadCodecReg, + .Write = WriteCodecReg, + }; + struct CodecDevice codec; + codec.devCodecName = PLATFORM_CODEC_TEST_NAME; + OsalMutexInit(&codec.mutex); + codec.devData = &codecData; + value = g_audioMixerRegParams.min + 1; + if (AudioUpdateCodecRegBits(&codec, &g_audioMixerRegParams, value) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioUpdateCodecRegBits fail", __func__, __LINE__); + OsalMutexDestroy(&codec.mutex); + return HDF_FAILURE; } + OsalMutexDestroy(&codec.mutex); HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestUpdateRegBits(void) +int32_t AudioTestUpdateAccessoryRegBits(void) { - int32_t codecRet; - int32_t accessoryRet; - int32_t value; - void *device = NULL; + struct AccessoryDevice *accessory = NULL; struct AudioMixerControl *mixerControl = NULL; - HDF_LOGI("%s: enter", __func__); + int32_t value = 0; - codecRet = AudioUpdateRegBits(AUDIO_CODEC_DEVICE, device, mixerControl, value); - accessoryRet = AudioUpdateRegBits(AUDIO_ACCESSORY_DEVICE, device, mixerControl, value); - if (codecRet != HDF_SUCCESS || accessoryRet != HDF_SUCCESS) { - HDF_LOGE("%s: AudioUpdateRegBits fail codecRet = %d, accessoryRet = %d", __func__, codecRet, accessoryRet); + int32_t ret = AudioUpdateAccessoryRegBits(accessory, mixerControl, value); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioTestUpdateAccessoryRegBits fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestAiaoUpdateRegBits(void) +int32_t AudioTestUpdateCodecAiaoRegBits(void) { - uint32_t reg; - uint32_t mask; - uint32_t shift; - int32_t value; - int32_t ret; struct CodecDevice *codec = NULL; - HDF_LOGI("%s: enter", __func__); + struct AudioMixerControl *control = NULL; + int32_t value = 0; - ret = AudioAiaoUpdateRegBits(codec, reg, mask, shift, value); + int32_t ret = AudioUpdateCodecAiaoRegBits(codec, control, value); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioAiaoUpdateRegBits fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioUpdateCodecAiaoRegBits fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestUpdateAccessoryAiaoRegBits(void) +{ + struct AccessoryDevice *accessory = NULL; + struct AudioMixerControl *mixerControl = NULL; + int32_t value = 0; + + int32_t ret = AudioUpdateAccessoryAiaoRegBits(accessory, mixerControl, value); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioUpdateAccessoryAiaoRegBits fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); @@ -172,7 +305,35 @@ int32_t AudioTestKcontrolGetCodec(void) codecDevice = AudioKcontrolGetCodec(kcontrol); if (codecDevice == NULL) { - HDF_LOGE("%s: AudioKcontrolGetCodec fail!", __func__); + HDF_LOGE("%s_[%d] AudioKcontrolGetCodec fail!", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestKcontrolGetAccessory(void) +{ + struct AudioKcontrol *kcontrol = NULL; + struct AccessoryDevice *accessory = AudioKcontrolGetAccessory(kcontrol); + if (accessory == NULL) { + HDF_LOGE("%s_[%d] AudioKcontrolGetAccessory fail!", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestAddControl(void) +{ + struct AudioCard *audioCard = NULL; + const struct AudioKcontrol *control = NULL; + struct AudioKcontrol *audioKcontrol = NULL; + HDF_LOGI("%s: enter", __func__); + + audioKcontrol = AudioAddControl(audioCard, control); + if (audioKcontrol == NULL) { + HDF_LOGE("%s_[%d] AudioAddControl fail!", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); @@ -183,143 +344,258 @@ int32_t AudioTestAddControls(void) { struct AudioCard *audioCard = NULL; const struct AudioKcontrol *controls = NULL; - int32_t controlMaxNum = 0; + int32_t controlMaxNum = 0x03; int32_t ret; HDF_LOGI("%s: enter", __func__); ret = AudioAddControls(audioCard, controls, controlMaxNum); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioAddControls fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioAddControls fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestAddControl(void) +int32_t AudioTestCodecReadReg(void) { - struct AudioCard *audioCard = NULL; - const struct AudioKcontrol *control = NULL; - struct AudioKcontrol *audioKcontrol = NULL; - HDF_LOGI("%s: enter", __func__); + struct CodecDevice *codec = NULL; + uint32_t reg = 0; + uint32_t val = 0; - audioKcontrol = AudioAddControl(audioCard, control); - if (audioKcontrol == NULL) { - HDF_LOGE("%s: AudioAddControl fail!", __func__); + int32_t ret = AudioCodecReadReg(codec, reg, &val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioCodecReadReg fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestDeviceReadReg(void) +int32_t AudioTestAccessoryReadReg(void) { - int32_t codecRet; - int32_t acccessoryRet; + struct AccessoryDevice *accessory = NULL; uint32_t reg = 0; + uint32_t val = 0; + + int32_t ret = AudioAccessoryReadReg(accessory, reg, &val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioAccessoryReadReg fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestCodecAiaoReadReg(void) +{ struct CodecDevice *codec = NULL; + uint32_t reg = 0; + uint32_t val; + + int32_t ret = AudioCodecAiaoReadReg(codec, reg, &val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioCodecAiaoReadReg fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestAccessoryAiaoReadReg(void) +{ struct AccessoryDevice *accessory = NULL; - HDF_LOGI("%s: enter", __func__); + uint32_t reg = 0; + uint32_t val; - codecRet = AudioCodecDeviceReadReg(codec, reg); - acccessoryRet = AudioAccessoryDeviceReadReg(accessory, reg); - if (codecRet != HDF_SUCCESS || acccessoryRet != HDF_SUCCESS) { - HDF_LOGE("%s: AudioDeviceReadReg fail codecRet = %d, acccessoryRet = %d", __func__, codecRet, acccessoryRet); + int32_t ret = AudioAccessoryAiaoReadReg(accessory, reg, &val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioAccessoryAiaoReadReg fail", __func__, __LINE__); } + HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestAiaoDeviceReadReg(void) +int32_t AudioTestCodecWriteReg(void) { - int32_t ret; + struct CodecDevice *codec = NULL; + uint32_t reg = 0; + uint32_t val = 0; + + int32_t ret = AudioCodecWriteReg(codec, reg, val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioCodecWriteReg fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestAccessoryWriteReg(void) +{ + struct AccessoryDevice *accessory = NULL; uint32_t reg = 0; + uint32_t val = 0; + + int32_t ret = AudioAccessoryWriteReg(accessory, reg, val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioAccessoryWriteReg fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestCodecAiaoWriteReg(void) +{ struct CodecDevice *codec = NULL; - HDF_LOGI("%s: enter", __func__); + uint32_t reg = 0; + uint32_t val = 0; - ret = AudioAiaoDeviceReadReg(codec, reg); + int32_t ret = AudioCodecAiaoWriteReg(codec, reg, val); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioAiaoDeviceReadReg fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioCodecAiaoWriteReg fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestInfoCtrlSw(void) +int32_t AudioTestAccessoryAiaoWriteReg(void) +{ + struct AccessoryDevice *accessory = NULL; + uint32_t reg = 0; + uint32_t val = 0; + + int32_t ret = AudioAccessoryAiaoWriteReg(accessory, reg, val); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioAccessoryAiaoWriteReg fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestInfoCtrlOps(void) { - int32_t ret; struct AudioKcontrol *kcontrol = NULL; struct AudioCtrlElemInfo *elemInfo = NULL; - HDF_LOGI("%s: enter", __func__); - ret = AudioInfoCtrlSw(kcontrol, elemInfo); + int32_t ret = AudioInfoCtrlOps(kcontrol, elemInfo); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioInfoCtrlSw fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioInfoCtrlOps fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestGetCtrlSw(void) +int32_t AudioTestCodecGetCtrlOps(void) { - int32_t ret; struct AudioKcontrol *kcontrol = NULL; struct AudioCtrlElemValue *elemValue = NULL; - HDF_LOGI("%s: enter", __func__); - ret = AudioGetCtrlSw(kcontrol, elemValue); + int32_t ret = AudioCodecGetCtrlOps(kcontrol, elemValue); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioGetCtrlSw fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioCodecGetCtrlOps fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AudioTestPutCtrlSw(void) +int32_t AudioTestAccessoryGetCtrlOps(void) { - int32_t ret; struct AudioKcontrol *kcontrol = NULL; struct AudioCtrlElemValue *elemValue = NULL; - HDF_LOGI("%s: enter", __func__); - ret = AudioPutCtrlSw(kcontrol, elemValue); + int32_t ret = AudioAccessoryGetCtrlOps(kcontrol, elemValue); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AudioPutCtrlSw fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioAccessoryGetCtrlOps fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AiaoTestGetCtrlSw(void) +int32_t AudioTestCodecAiaoGetCtrlOps(void) { - int32_t ret; struct AudioKcontrol *kcontrol = NULL; struct AudioCtrlElemValue *elemValue = NULL; - HDF_LOGI("%s: enter", __func__); - ret = AiaoGetCtrlSw(kcontrol, elemValue); + int32_t ret = AudioCodecAiaoGetCtrlOps(kcontrol, elemValue); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AiaoGetCtrlSw fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioCodecAiaoGetCtrlOps fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } -int32_t AiaoTestPutCtrlSw(void) +int32_t AudioTestAccessoryAiaoGetCtrlOps(void) { - int32_t ret; struct AudioKcontrol *kcontrol = NULL; struct AudioCtrlElemValue *elemValue = NULL; - HDF_LOGI("%s: enter", __func__); - ret = AiaoPutCtrlSw(kcontrol, elemValue); + int32_t ret = AudioAccessoryAiaoGetCtrlOps(kcontrol, elemValue); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioAccessoryAiaoGetCtrlOps fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestCodecSetCtrlOps(void) +{ + struct AudioKcontrol *kcontrol = NULL; + struct AudioCtrlElemValue *elemValue = NULL; + + int32_t ret = AudioCodecSetCtrlOps(kcontrol, elemValue); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioCodecSetCtrlOps fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestAccessorySetCtrlOps(void) +{ + struct AudioKcontrol *kcontrol = NULL; + struct AudioCtrlElemValue *elemValue = NULL; + + int32_t ret = AudioAccessorySetCtrlOps(kcontrol, elemValue); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioAccessorySetCtrlOps fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestCodecAiaoSetCtrlOps(void) +{ + struct AudioKcontrol *kcontrol = NULL; + struct AudioCtrlElemValue *elemValue = NULL; + + int32_t ret = AudioCodecAiaoSetCtrlOps(kcontrol, elemValue); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%s_[%d] AudioCodecAiaoSetCtrlOps fail", __func__, __LINE__); + } + + HDF_LOGI("%s: success", __func__); + return HDF_SUCCESS; +} + +int32_t AudioTestAccessoryAiaoSetCtrlOps(void) +{ + struct AudioKcontrol *kcontrol = NULL; + struct AudioCtrlElemValue *elemValue = NULL; + int32_t ret = AudioAccessoryAiaoSetCtrlOps(kcontrol, elemValue); if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: AiaoPutCtrlSw fail ret = %d", __func__, ret); + HDF_LOGE("%s_[%d] AudioAccessoryAiaoSetCtrlOps fail", __func__, __LINE__); } HDF_LOGI("%s: success", __func__); diff --git a/test/unittest/model/audio/src/audio_host_test.c b/test/unittest/model/audio/src/audio_host_test.c index ef4d81c2a..283c2cf02 100755 --- a/test/unittest/model/audio/src/audio_host_test.c +++ b/test/unittest/model/audio/src/audio_host_test.c @@ -8,21 +8,28 @@ #include "audio_host_test.h" #include "audio_host.h" +#include "devsvc_manager_clnt.h" #define HDF_LOG_TAG audio_host_test +#define KCONTROL_TEST_SERVICE_NAME "dsp_service_0" int32_t AudioKcontrolTestGetCodec(void) { - struct HdfDeviceObject *device = NULL; - struct AudioHost *audioHost = NULL; HDF_LOGI("%s: enter", __func__); - audioHost = AudioHostCreateAndBind(device); - if (audioHost != NULL) { - HDF_LOGE("%s: codecDevice is not NULL", __func__); + if (AudioHostCreateAndBind(NULL) != NULL) { + HDF_LOGE("%s_[%d] codecDevice is not NULL", __func__, __LINE__); return HDF_FAILURE; } + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(KCONTROL_TEST_SERVICE_NAME); + struct AudioHost *audioHost = AudioHostCreateAndBind(device); + if (audioHost == NULL) { + HDF_LOGE("%s_[%d] codecDevice is NULL", __func__, __LINE__); + return HDF_FAILURE; + } + + OsalMemFree(audioHost); HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } @@ -52,13 +59,3 @@ int32_t GetCardTestInstance(void) HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } - -int32_t AudioHostTestDestroy(void) -{ - struct AudioHost *host = NULL; - HDF_LOGI("%s: enter", __func__); - - AudioHostDestroy(host); - HDF_LOGI("%s: success", __func__); - return HDF_SUCCESS; -} diff --git a/test/unittest/model/audio/src/audio_parse_test.c b/test/unittest/model/audio/src/audio_parse_test.c index 74c61c61e..24ab294cb 100755 --- a/test/unittest/model/audio/src/audio_parse_test.c +++ b/test/unittest/model/audio/src/audio_parse_test.c @@ -5,22 +5,26 @@ * the GPL, or the BSD license, at your option. * See the LICENSE file in the root of this repository for complete details. */ - #include "audio_parse_test.h" #include "audio_parse.h" +#include "devsvc_manager_clnt.h" #define HDF_LOG_TAG audio_parse_test +#define TEST_PARSE_SERVICE_NAME "hdf_audio_codec_dev0" int32_t AudioFillTestConfigData(void) { - int32_t ret; - struct HdfDeviceObject *device = NULL; - struct AudioConfigData *configData = NULL; HDF_LOGI("%s: enter", __func__); - ret = AudioFillConfigData(device, configData); - if (ret == HDF_SUCCESS) { - HDF_LOGE("%s: AudioFillConfigData fail! ret = %d", __func__, ret); + if (AudioFillConfigData(NULL, NULL) == HDF_SUCCESS) { + HDF_LOGE("%s_[%d]: AudioFillConfigData fail", __func__, __LINE__); + return HDF_FAILURE; + } + + struct HdfDeviceObject *device = DevSvcManagerClntGetDeviceObject(TEST_PARSE_SERVICE_NAME); + struct AudioConfigData configData; + if (AudioFillConfigData(device, &configData) != HDF_SUCCESS) { + HDF_LOGE("%s_[%d]: AudioFillConfigData fail", __func__, __LINE__); return HDF_FAILURE; } diff --git a/test/unittest/model/audio/src/audio_stream_dispatch_test.c b/test/unittest/model/audio/src/audio_stream_dispatch_test.c index 4d9d138c3..2d0f1c89f 100755 --- a/test/unittest/model/audio/src/audio_stream_dispatch_test.c +++ b/test/unittest/model/audio/src/audio_stream_dispatch_test.c @@ -27,14 +27,3 @@ int32_t AudioControlDispatchTestStreamDispatch(void) HDF_LOGI("%s: success", __func__); return HDF_SUCCESS; } - -int32_t AudioControlDispatchTestStreamHostDestroy(void) -{ - struct StreamHost *host = NULL; - HDF_LOGI("%s: enter", __func__); - - StreamHostDestroy(host); - - HDF_LOGI("%s: success", __func__); - return HDF_SUCCESS; -} diff --git a/test/unittest/model/audio/src/hdf_audio_test.c b/test/unittest/model/audio/src/hdf_audio_test.c index 72114884b..45bbaaabb 100755 --- a/test/unittest/model/audio/src/hdf_audio_test.c +++ b/test/unittest/model/audio/src/hdf_audio_test.c @@ -20,34 +20,47 @@ static HdfTestCaseList g_hdfAudioTestCaseList[] = { {AUDIO_DRIVER_TESTGETCODEC, AudioKcontrolTestGetCodec}, {AUDIO_DRIVER_TESTGETCARDINSTANCE, GetCardTestInstance}, - {AUDIO_DRIVER_TESTHOSTDESTROY, AudioHostTestDestroy}, {AUDIO_DRIVER_TESTGETCCNFIGDATA, AudioFillTestConfigData}, - {AUDIO_DRIVER_TESTREGISTERDAI, AudioSocTestRegisterDai}, + {AUDIO_DRIVER_TESTREGISTERPLATFORM, AudioSocTestRegisterPlatform}, + {AUDIO_DRIVER_TESTREGISTERDAI, AudioSocTestRegisterDai}, + {AUDIO_DRIVER_TESTREGISTERACCESSORY, AudioTestRegisterAccessory}, {AUDIO_DRIVER_TESTREGISTERCODEC, AudioTestRegisterCodec}, + {AUDIO_DRIVER_TESTREGISTERDSP, AudioTestRegisterDsp}, + {AUDIO_DRIVER_TESTSOCDEVICEREGISTER, AudioTestSocDeviceRegister}, {AUDIO_DRIVER_TESTBINDDAILINK, AudioTestBindDaiLink}, - {AUDIO_DRIVER_TESTDEVICEREGISTER, AudioTestSocDeviceRegister}, - {AUDIO_DRIVER_TESTREGISTERDSP, AudioTestSocRegisterDsp}, - {AUDIO_DRIVER_TESTREGISTERACCESSORY, AudioTestRegisterAccessory}, - {AUDIO_DRIVER_TESTUPDATEREGBITS, AudioTestUpdateRegBits}, - {AUDIO_DRIVER_TESTAIAOUPDATEREGBITS, AudioTestAiaoUpdateRegBits}, + {AUDIO_DRIVER_TESTUPDATECODECREGBITS, AudioTestUpdateCodecRegBits}, + {AUDIO_DRIVER_TESTUPDATEACCESSORYREGBITS, AudioTestUpdateAccessoryRegBits}, + {AUDIO_DRIVER_TESTUPDATECODECAIAOREGBITS, AudioTestUpdateCodecAiaoRegBits}, + {AUDIO_DRIVER_TESTUPDATEACCESSORYAIAOREGBITS, AudioTestUpdateAccessoryAiaoRegBits}, {AUDIO_DRIVER_TESTKCONTROLGETCODEC, AudioTestKcontrolGetCodec}, - {AUDIO_DRIVER_TESTADDCONTROLS, AudioTestAddControls}, + {AUDIO_DRIVER_TESTKCONTROLGETACCESSORY, AudioTestKcontrolGetAccessory}, {AUDIO_DRIVER_TESTADDCONTROL, AudioTestAddControl}, - {AUDIO_DRIVER_TESTDEVICEREADREG, AudioTestDeviceReadReg}, - {AUDIO_DRIVER_TESTAIAODEVICEREADREG, AudioTestAiaoDeviceReadReg}, - {AUDIO_DRIVER_TESTINFOCTRLSW, AudioTestInfoCtrlSw}, - {AUDIO_DRIVER_TESTGETCTRLSW, AudioTestGetCtrlSw}, - {AUDIO_DRIVER_TESTPUTCTRLSW, AudioTestPutCtrlSw}, - {AUDIO_DRIVER_TESTAIAOGETCTRLSW, AiaoTestGetCtrlSw}, - {AUDIO_DRIVER_TESTAIAOPUTCTRLSW, AiaoTestPutCtrlSw}, + {AUDIO_DRIVER_TESTADDCONTROLS, AudioTestAddControls}, + {AUDIO_DRIVER_TESTCODECREADREG, AudioTestCodecReadReg}, + {AUDIO_DRIVER_TESTACCESSORYREADREG, AudioTestAccessoryReadReg}, + {AUDIO_DRIVER_TESTCODECAIAOREADREG, AudioTestCodecAiaoReadReg}, + {AUDIO_DRIVER_TESTACCESSORYAIAOREADREG, AudioTestAccessoryAiaoReadReg}, + {AUDIO_DRIVER_TESTCODECWRITEREG, AudioTestCodecWriteReg}, + {AUDIO_DRIVER_TESTACCESSORYWRITEREG, AudioTestAccessoryWriteReg}, + {AUDIO_DRIVER_TESTCODECAIAOWRITEREG, AudioTestCodecAiaoWriteReg}, + {AUDIO_DRIVER_TESTACCESSORYAIAOWRITEREG, AudioTestAccessoryAiaoWriteReg}, + {AUDIO_DRIVER_TESTINFOCTRLOPS, AudioTestInfoCtrlOps}, + {AUDIO_DRIVER_TESTCODECGETCTRLOPS, AudioTestCodecGetCtrlOps}, + {AUDIO_DRIVER_TESTACCESSORYGETCTRLOPS, AudioTestAccessoryGetCtrlOps}, + {AUDIO_DRIVER_TESTCODECAIAOGETCTRLOPS, AudioTestCodecAiaoGetCtrlOps}, + {AUDIO_DRIVER_TESTACCESSORYAIAOGETCTRLOPS, AudioTestAccessoryAiaoGetCtrlOps}, + {AUDIO_DRIVER_TESTCODECSETCTRLOPS, AudioTestCodecSetCtrlOps}, + {AUDIO_DRIVER_TESTACCESSORYSETCTRLOPS, AudioTestAccessorySetCtrlOps}, + {AUDIO_DRIVER_TESTCODECAIAOSETCTRLOPS, AudioTestCodecAiaoSetCtrlOps}, + {AUDIO_DRIVER_TESTACCESSORYAIAOSETCTRLOPS, AudioTestAccessoryAiaoSetCtrlOps}, + {AUDIO_DRIVER_TESTNEWCOMPONENT, AudioSapmTestNewComponents}, {AUDIO_DRIVER_TESTADDROUTES, AudioSapmTestAddRoutes}, {AUDIO_DRIVER_TESTNEWCONTROLS, AudioSapmTestNewControls}, {AUDIO_DRIVER_TESTPOWERCOMPONET, AudioSapmTestPowerComponents}, {AUDIO_DRIVER_TESTREFRESHTIME, AudioSapmTestRefreshTime}, {AUDIO_DRIVER_TESTSTREAMDISPATCH, AudioControlDispatchTestStreamDispatch}, - {AUDIO_DRIVER_TESTSTREAMDESTORY, AudioControlDispatchTestStreamHostDestroy}, }; int32_t HdfAudioEntry(HdfTestMsg *msg) -- Gitee