From cbecd4860dd235a5b768cdb44641ed0132f35a42 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Thu, 16 Dec 2021 16:37:57 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9Amodify=20audio=20driver=20codex?= =?UTF-8?q?=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: vb6174 --- model/audio/common/src/audio_accessory_base.c | 2 +- model/audio/common/src/audio_codec_base.c | 4 ++-- model/audio/common/src/audio_dai_base.c | 2 +- model/audio/common/src/audio_platform_base.c | 4 ++-- model/audio/core/src/audio_core.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/model/audio/common/src/audio_accessory_base.c b/model/audio/common/src/audio_accessory_base.c index 2448d5ee..7e79e56f 100755 --- a/model/audio/common/src/audio_accessory_base.c +++ b/model/audio/common/src/audio_accessory_base.c @@ -331,7 +331,7 @@ int32_t AccessoryDeviceCfgGet(struct AccessoryData *accessoryData, g_audioControls[index].name = g_audioControlsList[ctlcfgItem[index].arrayIndex]; g_audioControls[index].Info = AudioInfoCtrlOps; g_audioControls[index].privateValue = - (unsigned long)&g_audioRegCfgGroupNode[AUDIO_CTRL_PATAM_GROUP]->regCfgItem[index]; + (unsigned long)(uintptr_t)(void*)(&g_audioRegCfgGroupNode[AUDIO_CTRL_PATAM_GROUP]->regCfgItem[index]); g_audioControls[index].Get = AudioAccessoryGetCtrlOps; g_audioControls[index].Set = AudioAccessorySetCtrlOps; } diff --git a/model/audio/common/src/audio_codec_base.c b/model/audio/common/src/audio_codec_base.c index 600fbdb7..ee753581 100755 --- a/model/audio/common/src/audio_codec_base.c +++ b/model/audio/common/src/audio_codec_base.c @@ -148,7 +148,7 @@ static int32_t CodecSetSapmConfigInfo(struct CodecData *codeData, struct AudioRe for (index = 0; index < regCfgGroup[AUDIO_SAPM_CFG_GROUP]->itemNum; index++) { audioSapmControls[index].iface = sapmCtrlItem[index].iface; audioSapmControls[index].name = g_audioSapmCfgNameList[sapmCtrlItem[index].arrayIndex]; - audioSapmControls[index].privateValue = (unsigned long)&ctlSapmRegCfgItem[index]; + audioSapmControls[index].privateValue = (unsigned long)(uintptr_t)(void*)(&ctlSapmRegCfgItem[index]); audioSapmControls[index].Info = AudioInfoCtrlOps; audioSapmControls[index].Get = AudioCodecSapmGetCtrlOps; audioSapmControls[index].Set = AudioCodecSapmSetCtrlOps; @@ -215,7 +215,7 @@ int32_t CodecSetConfigInfo(struct CodecData *codeData, struct DaiData *daiData) codeData->controls[index].iface = compItem[index].iface; codeData->controls[index].name = g_audioControlsList[compItem[index].arrayIndex]; codeData->controls[index].Info = AudioInfoCtrlOps; - codeData->controls[index].privateValue = (unsigned long)&ctlRegCfgItem[index]; + codeData->controls[index].privateValue = (unsigned long)(uintptr_t)(void*)(&ctlRegCfgItem[index]); if (compItem[index].enable) { codeData->controls[index].Get = AudioCodecGetCtrlOps; codeData->controls[index].Set = AudioCodecSetCtrlOps; diff --git a/model/audio/common/src/audio_dai_base.c b/model/audio/common/src/audio_dai_base.c index 3f470cfa..0b9822ac 100644 --- a/model/audio/common/src/audio_dai_base.c +++ b/model/audio/common/src/audio_dai_base.c @@ -104,7 +104,7 @@ int32_t DaiSetConfigInfo(struct DaiData *data) } data->controls[index].name = g_audioControlsList[item[index].arrayIndex]; data->controls[index].Info = AudioInfoCtrlOps; - data->controls[index].privateValue = (unsigned long)&patRegCfgItemTmp[index]; + data->controls[index].privateValue = (unsigned long)(uintptr_t)(void*)(&patRegCfgItemTmp[index]); data->controls[index].Get = AudioCpuDaiGetCtrlOps; data->controls[index].Set = AudioCpuDaiSetCtrlOps; } diff --git a/model/audio/common/src/audio_platform_base.c b/model/audio/common/src/audio_platform_base.c index 952e60bd..f64fe045 100755 --- a/model/audio/common/src/audio_platform_base.c +++ b/model/audio/common/src/audio_platform_base.c @@ -25,12 +25,12 @@ const int SLEEP_TIME = 5; unsigned int SysReadl(unsigned long addr) { - return *(volatile unsigned int *)(addr); + return *(volatile unsigned int *)(uintptr_t)(addr); } void SysWritel(unsigned long addr, unsigned int value) { - *(volatile unsigned int *)(addr) = value; + *(volatile unsigned int *)(uintptr_t)(addr) = value; } struct PlatformData *PlatformDataFromCard(const struct AudioCard *card) diff --git a/model/audio/core/src/audio_core.c b/model/audio/core/src/audio_core.c index b533100b..8115d868 100755 --- a/model/audio/core/src/audio_core.c +++ b/model/audio/core/src/audio_core.c @@ -147,7 +147,7 @@ int32_t AudioRegisterCodec(struct HdfDeviceObject *device, struct CodecData *cod ret = AudioSocRegisterDai(device, daiData); if (ret != HDF_SUCCESS) { - OsalIoUnmap((void *)((uintptr_t)(void*)&(codec->devData->virtualAddress))); + OsalIoUnmap((void *)((uintptr_t)(codec->devData->virtualAddress))); OsalMemFree(codec); ADM_LOG_ERR("Register dai device fail ret=%d", ret); return HDF_ERR_IO;