From 394daebcf891d4e4a937843333f279c78aa5b8c2 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Mon, 13 Sep 2021 11:46:18 +0000 Subject: [PATCH] codex fix Signed-off-by: vb6174 --- model/audio/common/src/audio_codec_base.c | 8 ++++---- model/audio/core/src/audio_core.c | 24 +++++++++++------------ model/audio/sapm/src/audio_sapm.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/model/audio/common/src/audio_codec_base.c b/model/audio/common/src/audio_codec_base.c index 6d7d0a46d..0bef4037f 100755 --- a/model/audio/common/src/audio_codec_base.c +++ b/model/audio/common/src/audio_codec_base.c @@ -26,7 +26,7 @@ int32_t CodecDeviceReadReg(const struct CodecDevice *codec, uint32_t reg, uint32 return HDF_ERR_INVALID_OBJECT; } acodecVir = virtualAdd->acodecVir; - *val = OSAL_READL((void *)(acodecVir + reg)); + *val = OSAL_READL((void *)(volatile uintptr_t)(acodecVir + reg)); AUDIO_DRIVER_LOG_DEBUG("success"); return HDF_SUCCESS; @@ -50,7 +50,7 @@ int32_t CodecDeviceWriteReg(const struct CodecDevice *codec, uint32_t reg, uint3 } acodecVir = virtualAdd->acodecVir; - OSAL_WRITEL(value, (void *)(acodecVir + reg)); + OSAL_WRITEL(value, (void *)(volatile uintptr_t)(acodecVir + reg)); AUDIO_DRIVER_LOG_DEBUG("success"); return HDF_SUCCESS; @@ -74,7 +74,7 @@ int32_t CodecAiaoDeviceReadReg(const struct CodecDevice *codec, uint32_t reg, ui } aiaoVir = virtualAdd->aiaoVir; - *val = OSAL_READL((void *)(aiaoVir + reg)); + *val = OSAL_READL((void *)(volatile uintptr_t)(aiaoVir + reg)); AUDIO_DRIVER_LOG_DEBUG("success"); return HDF_SUCCESS; @@ -97,7 +97,7 @@ int32_t CodecAiaoDeviceWriteReg(const struct CodecDevice *codec, uint32_t reg, u } aiaoVir = virtualAdd->aiaoVir; - OSAL_WRITEL(value, (void *)(aiaoVir + reg)); + OSAL_WRITEL(value, (void *)(volatile uintptr_t)(aiaoVir + reg)); AUDIO_DRIVER_LOG_DEBUG("success"); return HDF_SUCCESS; diff --git a/model/audio/core/src/audio_core.c b/model/audio/core/src/audio_core.c index a3a546d9b..0c12213d1 100755 --- a/model/audio/core/src/audio_core.c +++ b/model/audio/core/src/audio_core.c @@ -388,7 +388,7 @@ int32_t AudioUpdateCodecRegBits(struct CodecDevice *codec, const struct AudioMixerControl *mixerControl, uint32_t value) { int32_t ret; - uint32_t curValue; + uint32_t curValue = 0; uint32_t mixerControlMask; if (codec == NULL || mixerControl == NULL) { ADM_LOG_ERR("Invalid accessory param."); @@ -423,7 +423,7 @@ int32_t AudioUpdateAccessoryRegBits(struct AccessoryDevice *accessory, const struct AudioMixerControl *mixerControl, uint32_t value) { int32_t ret; - uint32_t curValue; + uint32_t curValue = 0; uint32_t mixerControlMask; if (accessory == NULL || mixerControl == NULL) { ADM_LOG_ERR("Invalid accessory param."); @@ -457,7 +457,7 @@ int32_t AudioUpdateCodecAiaoRegBits(struct CodecDevice *codec, const struct AudioMixerControl *mixerControl, uint32_t value) { int32_t ret; - uint32_t curValue; + uint32_t curValue = 0; uint32_t mixerControlMask; ADM_LOG_DEBUG("Entry to update AIAO codec reg bits."); @@ -493,7 +493,7 @@ int32_t AudioUpdateAccessoryAiaoRegBits(struct AccessoryDevice *accessory, const struct AudioMixerControl *mixerControl, uint32_t value) { int32_t ret; - uint32_t curValue; + uint32_t curValue = 0; uint32_t mixerControlMask; ADM_LOG_DEBUG("Entry to update AIAO accessory reg bits."); @@ -800,8 +800,8 @@ static int32_t AudioGetCtrlOpsReg(struct AudioCtrlElemValue *elemValue, int32_t AudioCodecGetCtrlOps(const struct AudioKcontrol *kcontrol, struct AudioCtrlElemValue *elemValue) { - uint32_t curValue; - uint32_t rcurValue; + uint32_t curValue = 0; + uint32_t rcurValue = 0; struct AudioMixerControl *mixerCtrl = NULL; struct CodecDevice *codec = NULL; if (kcontrol == NULL || kcontrol->privateValue <= 0 || elemValue == NULL) { @@ -830,8 +830,8 @@ int32_t AudioCodecGetCtrlOps(const struct AudioKcontrol *kcontrol, struct AudioC int32_t AudioAccessoryGetCtrlOps(const struct AudioKcontrol *kcontrol, struct AudioCtrlElemValue *elemValue) { - uint32_t curValue; - uint32_t rcurValue; + uint32_t curValue = 0; + uint32_t rcurValue = 0; struct AudioMixerControl *mixerCtrl = NULL; struct AccessoryDevice *accessory = NULL; if (kcontrol == NULL || kcontrol->privateValue <= 0 || elemValue == NULL) { @@ -861,8 +861,8 @@ int32_t AudioAccessoryGetCtrlOps(const struct AudioKcontrol *kcontrol, struct Au int32_t AudioCodecAiaoGetCtrlOps(const struct AudioKcontrol *kcontrol, struct AudioCtrlElemValue *elemValue) { - uint32_t curValue; - uint32_t rcurValue; + uint32_t curValue = 0; + uint32_t rcurValue = 0; struct CodecDevice *codec = NULL; struct AudioMixerControl *mixerCtrl = NULL; if (kcontrol == NULL || kcontrol->privateValue <= 0 || elemValue == NULL) { @@ -893,8 +893,8 @@ int32_t AudioCodecAiaoGetCtrlOps(const struct AudioKcontrol *kcontrol, struct Au int32_t AudioAccessoryAiaoGetCtrlOps(const struct AudioKcontrol *kcontrol, struct AudioCtrlElemValue *elemValue) { - uint32_t curValue; - uint32_t rcurValue; + uint32_t curValue = 0; + uint32_t rcurValue = 0; struct AccessoryDevice *accessory = NULL; struct AudioMixerControl *mixerCtrl = NULL; if (kcontrol == NULL || kcontrol->privateValue <= 0 || elemValue == NULL) { diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index e5791e71d..9f570b967 100755 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -409,7 +409,7 @@ static void MixerSetPathStatus(const struct AudioSapmComponent *sapmComponent, s uint32_t mask; uint32_t shift; uint32_t invert; - uint32_t curValue; + uint32_t curValue = 0; if ((sapmComponent == NULL || sapmComponent->codec == NULL) || (path == NULL) || (mixerCtrl == NULL)) { ADM_LOG_ERR("input params check error: sapmComponent=%p, path=%p, mixerCtrl=%p.", -- Gitee