From 5d70c37c3380e1782b40dd040ab3021cf48861e6 Mon Sep 17 00:00:00 2001 From: mahai Date: Wed, 5 Jul 2023 15:56:40 +0800 Subject: [PATCH] fix:Modify platform driver alarms Signed-off-by: mahai --- framework/model/storage/src/mmc/mmc_core.c | 9 ++-- .../model/storage/src/mmc/mmc_protocol.c | 50 ++++++------------- framework/model/storage/src/mmc/mmc_sdio.c | 6 +-- framework/model/storage/src/mtd/mtd_core.c | 6 +-- .../support/platform/src/can/can_manager.c | 7 +-- .../support/platform/src/dma/dmac_core.c | 13 ++--- .../platform/src/fwk/platform_manager.c | 3 +- .../support/platform/src/fwk/platform_queue.c | 3 +- .../support/platform/src/gpio/gpio_core.c | 6 +-- .../support/platform/src/hdmi/hdmi_core.c | 21 +++----- .../support/platform/src/hdmi/hdmi_edid.c | 22 +++----- .../support/platform/src/hdmi/hdmi_frl.c | 6 +-- .../support/platform/src/hdmi/hdmi_hdcp.c | 10 ++-- .../platform/src/hdmi/hdmi_infoframe.c | 3 +- .../support/platform/src/hdmi/hdmi_scdc.c | 3 +- framework/support/platform/src/i3c/i3c_core.c | 7 +-- framework/support/platform/src/pin/pin_core.c | 3 +- framework/support/platform/src/pwm/pwm_core.c | 8 +-- framework/support/platform/src/rtc/rtc_base.c | 3 +- .../test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp | 6 +-- .../test/fuzztest/i2c_fuzzer/i2c_fuzzer.cpp | 6 +-- .../test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp | 6 +-- .../test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp | 6 +-- .../test/fuzztest/spi_fuzzer/spi_fuzzer.cpp | 6 +-- .../test/fuzztest/uart_fuzzer/uart_fuzzer.cpp | 6 +-- .../test/unittest/platform/common/adc_test.c | 12 ++--- .../test/unittest/platform/common/dac_test.c | 6 +-- .../test/unittest/platform/common/gpio_test.c | 3 +- .../test/unittest/platform/common/i2c_test.c | 6 +-- .../test/unittest/platform/common/i3c_test.c | 3 +- .../platform/common/platform_device_test.c | 3 +- .../platform/common/platform_event_test.c | 3 +- .../platform/common/platform_queue_test.c | 3 +- .../test/unittest/platform/common/spi_test.c | 3 +- .../platform/config/can_test_config.c | 3 +- .../unittest/platform/virtual/i3c_virtual.c | 3 +- .../unittest/platform/virtual/pin_virtual.c | 3 +- .../platform/virtual/regulator_virtual.c | 3 +- .../unittest/platform/virtual/spi_virtual.c | 3 +- 39 files changed, 97 insertions(+), 185 deletions(-) diff --git a/framework/model/storage/src/mmc/mmc_core.c b/framework/model/storage/src/mmc/mmc_core.c index 441cd5f14..b0d140e40 100644 --- a/framework/model/storage/src/mmc/mmc_core.c +++ b/framework/model/storage/src/mmc/mmc_core.c @@ -129,7 +129,6 @@ static int32_t MmcCntlrUnplug(struct MmcCntlr *cntlr) static int32_t MmcCntlrSdioRescanHandle(struct MmcCntlr *cntlr) { uint8_t val; - int32_t error; if (cntlr == NULL) { HDF_LOGE("MmcCntlrSdioRescanHandle: cntlr is null."); @@ -138,7 +137,7 @@ static int32_t MmcCntlrSdioRescanHandle(struct MmcCntlr *cntlr) if (cntlr->curDev != NULL && cntlr->curDev->state.bits.present > 0) { if (cntlr->curDev->type == MMC_DEV_SDIO || cntlr->curDev->type == MMC_DEV_COMBO) { - error = SdioReadCccrIoEnable(cntlr, &val); + int32_t error = SdioReadCccrIoEnable(cntlr, &val); if (error != HDF_SUCCESS) { HDF_LOGD("re-detect sdio."); MmcCntlrPlug(cntlr); @@ -843,7 +842,6 @@ static void SdioHandlePendingIrq(struct MmcCntlr *cntlr, struct SdioDevice *dev) static int32_t SdioIrqThreadWorker(void *data) { - int32_t ret; struct SdioDevice *dev = (struct SdioDevice *)data; struct MmcCntlr *cntlr = NULL; @@ -860,7 +858,7 @@ static int32_t SdioIrqThreadWorker(void *data) while (true) { /* wait envent */ - ret = OsalSemWait(&dev->sem, HDF_WAIT_FOREVER); + int32_t ret = OsalSemWait(&dev->sem, HDF_WAIT_FOREVER); if (ret != HDF_SUCCESS) { continue; } @@ -1307,7 +1305,6 @@ ssize_t MmcDeviceErase(struct MmcDevice *mmc, size_t startSec, size_t nSec) size_t curSec = nSec; size_t curStartSec = startSec; size_t eraseSec; - ssize_t ret; if (mmc == NULL) { HDF_LOGE("MmcDeviceErase: mmc is null!"); @@ -1320,7 +1317,7 @@ ssize_t MmcDeviceErase(struct MmcDevice *mmc, size_t startSec, size_t nSec) } else { eraseSec = curSec; } - ret = MmcSendErase(mmc->cntlr, curStartSec, eraseSec); + ssize_t ret = MmcSendErase(mmc->cntlr, curStartSec, eraseSec); if (ret != HDF_SUCCESS) { HDF_LOGE("MmcDeviceErase: fail!"); return ret; diff --git a/framework/model/storage/src/mmc/mmc_protocol.c b/framework/model/storage/src/mmc/mmc_protocol.c index b890256cc..354fc8926 100644 --- a/framework/model/storage/src/mmc/mmc_protocol.c +++ b/framework/model/storage/src/mmc/mmc_protocol.c @@ -77,7 +77,6 @@ static uint32_t MmcParseBits(const uint32_t *data, uint32_t bitsLen, uint32_t st static int32_t MmcSendCmd(struct MmcCntlr *cntlr, struct MmcCmd *cmd, struct MmcData *data, uint32_t retryTimes) { uint32_t i; - int32_t ret; if (cntlr == NULL || cmd == NULL || retryTimes == 0) { HDF_LOGE("MmcSendCmd: cntlr or cmd or retryTimes is null!"); @@ -90,7 +89,7 @@ static int32_t MmcSendCmd(struct MmcCntlr *cntlr, struct MmcCmd *cmd, struct Mmc cmd->data = data; for (i = 0; i < retryTimes; i++) { - ret = MmcCntlrDoRequest(cntlr, cmd); + int32_t ret = MmcCntlrDoRequest(cntlr, cmd); if (ret != HDF_SUCCESS) { continue; } @@ -772,7 +771,6 @@ static int32_t EmmcDecodeCid(struct MmcCntlr *cntlr) struct MmcCid *cid = NULL; uint32_t *rawCid = NULL; uint8_t specVers; - uint8_t cbx; if (cntlr == NULL || cntlr->curDev == NULL) { HDF_LOGE("EmmcDecodeCid: cntlr or curDev is null!"); @@ -820,7 +818,7 @@ static int32_t EmmcDecodeCid(struct MmcCntlr *cntlr) * Card or BGA(CBX): [113:112] * 00: Card (removable); 01: BGA (Discrete embedded); 10: POP; 11: Reserved. */ - cbx = MmcParseBits(rawCid, CID_BITS, 112, 2); + uint8_t cbx = MmcParseBits(rawCid, CID_BITS, 112, 2); if (cbx == 0) { cntlr->curDev->state.bits.removable = 1; HDF_LOGD("EmmcDecodeCid: Emmc is removable!"); @@ -1311,10 +1309,8 @@ static int32_t EmmcSelectPowerClass(struct MmcCntlr *cntlr, struct EmmcExtCsd *e static int32_t EmmcSelectActivateHighSpeed(struct MmcCntlr *cntlr, struct EmmcDevice *emmcDev, struct EmmcExtCsd *extCsd) { - int32_t error; - if (extCsd->hsMaxDtr > 0) { - error = HDF_SUCCESS; + int32_t error = HDF_SUCCESS; if (MmcCntlrSupportHighSpeed200(cntlr) == true && extCsd->hsMaxDtr > EMMC_EXT_CSD_HIGH_SPEED_52) { error = EmmcSelectHs200(cntlr, emmcDev); @@ -1441,7 +1437,6 @@ static int32_t EmmcSelectSwitchDdrMode(struct MmcCntlr *cntlr, struct EmmcDevice struct EmmcExtCsd *extCsd) { int32_t error; - uint32_t index; uint32_t ddrMode; enum MmcBusWidth width; const enum MmcBusWidth busWidths[] = { BUS_WIDTH8, BUS_WIDTH4, BUS_WIDTH1 }; @@ -1457,7 +1452,7 @@ static int32_t EmmcSelectSwitchDdrMode(struct MmcCntlr *cntlr, struct EmmcDevice emmcDev->mmc.state.bits.hs200 == 0 && cntlr->curDev->reg.csd.specVers >= MMC_CSD_SPEC_VER_4 && (cntlr->caps.bits.cap4Bit | cntlr->caps.bits.cap8Bit) > 0) { - index = 1; + uint32_t index = 1; if (cntlr->caps.bits.cap8Bit > 0) { index = 0; } @@ -1491,10 +1486,8 @@ static int32_t EmmcSelectSwitchDdrMode(struct MmcCntlr *cntlr, struct EmmcDevice static int32_t EmmcActivateHpiMechanism(struct MmcCntlr *cntlr, struct EmmcExtCsd *extCsd) { - int32_t error; - if (extCsd->hpi == true) { - error = MmcSwitch(cntlr, EMMC_EXT_CSD_CMD_SET_NORMAL, EMMC_EXT_CSD_HPI_MGMT, 1); + int32_t error = MmcSwitch(cntlr, EMMC_EXT_CSD_CMD_SET_NORMAL, EMMC_EXT_CSD_HPI_MGMT, 1); if (error == HDF_SUCCESS) { extCsd->hpiEnable = true; } else if (error != HDF_MMC_ERR_SWITCH_FAIL) { @@ -1980,8 +1973,6 @@ static int32_t SdDecodeSSr(struct MmcCntlr *cntlr, uint32_t *rawSsr, uint32_t le struct SdSsr *ssr = NULL; struct SdScr *scr = NULL; struct SdDevice *sdDev = NULL; - uint32_t eraseSize; - uint32_t eraseTimeout; if (cntlr == NULL || cntlr->curDev == NULL || rawSsr == NULL || len == 0) { HDF_LOGE("SdDecodeSSr: cntlr or curDev or rawSsr is null or len is invalid!"); @@ -2002,9 +1993,9 @@ static int32_t SdDecodeSSr(struct MmcCntlr *cntlr, uint32_t *rawSsr, uint32_t le * ERASE_SIZE: [423:408]. If this field is set to 0, the erase timeout calculation is not supported. * ERASE_SIZE = 1, value = 1AU; ERASE_SIZE = 2, value = 2AU... */ - eraseSize = MmcParseBits(rawSsr, SSR_BITS, 408, 16); + uint32_t eraseSize = MmcParseBits(rawSsr, SSR_BITS, 408, 16); /* ERASE_TIMEOUT: [407:402] */ - eraseTimeout = MmcParseBits(rawSsr, SSR_BITS, 402, 6); + uint32_t eraseTimeout = MmcParseBits(rawSsr, SSR_BITS, 402, 6); if (eraseSize > 0) { ssr->eraseTimeout = (eraseTimeout * 1000) / eraseSize; /* ERASE_OFFSET: [401:400] */ @@ -2958,12 +2949,10 @@ static int32_t SdioReadWriteRemainBytes(struct MmcCntlr *cntlr, struct SdioCmdPa uint8_t *data, uint32_t size, uint32_t addr) { uint32_t maxBlkSize; - uint32_t curSize; struct SdioDevice *dev = (struct SdioDevice *)cntlr->curDev; uint32_t remLen = size; uint32_t curAddr = addr; uint8_t *buffer = data; - int32_t err; maxBlkSize = MMC_MIN(cntlr->maxBlkSize, dev->curFunction->maxBlkSize); maxBlkSize = MMC_MIN(maxBlkSize, BYTES_PER_BLOCK); @@ -2973,9 +2962,9 @@ static int32_t SdioReadWriteRemainBytes(struct MmcCntlr *cntlr, struct SdioCmdPa } while (remLen > 0) { - curSize = MMC_MIN(remLen, maxBlkSize); + uint32_t curSize = MMC_MIN(remLen, maxBlkSize); param->regAddr = curAddr; - err = SdioRwExtended(cntlr, param, buffer, 1, curSize); + int32_t err = SdioRwExtended(cntlr, param, buffer, 1, curSize); if (err != HDF_SUCCESS) { HDF_LOGD("SdioReadWriteRemainBytes: bytes mode, err = %d, addr = %d, curSize = %d!", err, addr, curSize); return err; @@ -3004,10 +2993,6 @@ static void SdioFillRwExtendedCmdParam(struct SdioCmdParam *param, int32_t SdioReadWriteBlock(struct MmcCntlr *cntlr, struct SdioRwBlockInfo *info) { - uint32_t maxBlkNum; - uint32_t curblkNum; - uint32_t curSize; - int32_t err; struct SdioCmdParam param = {0}; struct SdioDevice *dev = NULL; @@ -3037,14 +3022,14 @@ int32_t SdioReadWriteBlock(struct MmcCntlr *cntlr, struct SdioRwBlockInfo *info) } /* send block. */ if (dev->sdioReg.cccr.multiBlock > 0 && (remLen > maxBlkSize)) { - maxBlkNum = MMC_MIN((cntlr->maxReqSize / dev->curFunction->curBlkSize), cntlr->maxBlkNum); + uint32_t maxBlkNum = MMC_MIN((cntlr->maxReqSize / dev->curFunction->curBlkSize), cntlr->maxBlkNum); maxBlkNum = MMC_MIN(maxBlkNum, SDIO_BLOCK_TRANSFER_MAX_BLKNUM); while (remLen > dev->curFunction->curBlkSize) { - curblkNum = remLen / dev->curFunction->curBlkSize; + uint32_t curblkNum = remLen / dev->curFunction->curBlkSize; curblkNum = MMC_MIN(curblkNum, maxBlkNum); - curSize = curblkNum * dev->curFunction->curBlkSize; + uint32_t curSize = curblkNum * dev->curFunction->curBlkSize; param.regAddr = curAddr; - err = SdioRwExtended(cntlr, ¶m, buffer, curblkNum, dev->curFunction->curBlkSize); + int32_t err = SdioRwExtended(cntlr, ¶m, buffer, curblkNum, dev->curFunction->curBlkSize); if (err != HDF_SUCCESS) { return err; } @@ -3682,7 +3667,6 @@ static void SdioDecodeCisTplField(struct MmcCntlr *cntlr, struct SdioFunction *f static int32_t SdioFillTplInfo(struct MmcCntlr *cntlr, struct SdioCisTuple *tuple, uint32_t *addr, uint8_t tplCode, uint8_t tplLink) { - int32_t ret; uint32_t i; tuple->tplCode = tplCode; @@ -3690,7 +3674,7 @@ static int32_t SdioFillTplInfo(struct MmcCntlr *cntlr, struct SdioCisTuple *tupl /* read tuple body. */ for (i = 0; i < tplLink; i++) { (*addr)++; - ret = SdioReadCisTplField(cntlr, *addr, &(tuple->tplBody[i])); + int32_t ret = SdioReadCisTplField(cntlr, *addr, &(tuple->tplBody[i])); if (ret != HDF_SUCCESS) { HDF_LOGE("SdioFillTplInfo: read tuple body fail, err = %d.", ret); return ret; @@ -3758,7 +3742,6 @@ static int32_t SdioReadCis(struct MmcCntlr *cntlr, struct SdioFunction *function uint32_t i; uint32_t cisStartAddr; uint8_t data; - int32_t ret; struct SdioCmdParam param = {0}; if (function == NULL) { @@ -3772,7 +3755,7 @@ static int32_t SdioReadCis(struct MmcCntlr *cntlr, struct SdioFunction *function for (i = 0; i < SDIO_CCCR_CIS_START_ADDR_BYTES; i++) { /* read register 0xn09-0xn0B of FBR. */ param.regAddr = SDIO_FBR_BASE_ADDR(funcNum) + SDIO_FBR_POINTER_CIS + i; - ret = SdioRwDirect(cntlr, ¶m, &data); + int32_t ret = SdioRwDirect(cntlr, ¶m, &data); if (ret != HDF_SUCCESS) { HDF_LOGE("SdioReadCis: read CIS pointer fail, err = %d.", ret); return ret; @@ -3902,7 +3885,6 @@ static int32_t SdioAddFunctions(struct MmcCntlr *cntlr, uint32_t funcs) struct SdioDevice *sdioDev = (struct SdioDevice *)cntlr->curDev; struct SdioFunction *function = NULL; uint32_t i; - int32_t ret; sdioDev->functions = 0; for (i = 0; i < funcs; i++) { @@ -3910,7 +3892,7 @@ static int32_t SdioAddFunctions(struct MmcCntlr *cntlr, uint32_t funcs) if (function == NULL) { return HDF_ERR_MALLOC_FAIL; } - ret = SdioReadFbr(cntlr, function); + int32_t ret = SdioReadFbr(cntlr, function); if (ret != HDF_SUCCESS) { SdioDeleteFunction(function); return ret; diff --git a/framework/model/storage/src/mmc/mmc_sdio.c b/framework/model/storage/src/mmc/mmc_sdio.c index 292d936e6..d3ca6a44f 100644 --- a/framework/model/storage/src/mmc/mmc_sdio.c +++ b/framework/model/storage/src/mmc/mmc_sdio.c @@ -157,7 +157,6 @@ static int32_t SdioDeviceDefaultFunc0ReadBytes(struct SdioDevice *dev, struct SdioFunction *func = dev->curFunction; struct MmcCntlr *cntlr = NULL; uint32_t i; - int32_t ret; if (func == NULL) { HDF_LOGE("SdioDeviceDefaultFunc0ReadBytes: fail, func is null!"); @@ -174,7 +173,7 @@ static int32_t SdioDeviceDefaultFunc0ReadBytes(struct SdioDevice *dev, } for (i = 0; i < size; i++) { - ret = SdioReadWriteByte(cntlr, false, 0, (addr + i), &data[i]); + int32_t ret = SdioReadWriteByte(cntlr, false, 0, (addr + i), &data[i]); if (ret != HDF_SUCCESS) { HDF_LOGE("SdioDeviceDefaultFunc0ReadBytes: fail, i = %u!", i); return ret; @@ -188,7 +187,6 @@ static int32_t SdioDeviceDefaultFunc0WriteBytes(struct SdioDevice *dev, { struct SdioFunction *func = dev->curFunction; struct MmcCntlr *cntlr = NULL; - int32_t ret; uint32_t i; if (func == NULL) { @@ -206,7 +204,7 @@ static int32_t SdioDeviceDefaultFunc0WriteBytes(struct SdioDevice *dev, } for (i = 0; i < size; i++) { - ret = SdioReadWriteByte(cntlr, true, 0, (addr + i), &data[i]); + int32_t ret = SdioReadWriteByte(cntlr, true, 0, (addr + i), &data[i]); if (ret != HDF_SUCCESS) { HDF_LOGE("SdioDeviceDefaultFunc0WriteBytes: fail, i = %u!", i); return ret; diff --git a/framework/model/storage/src/mtd/mtd_core.c b/framework/model/storage/src/mtd/mtd_core.c index 68bea3f20..32b2fd36c 100644 --- a/framework/model/storage/src/mtd/mtd_core.c +++ b/framework/model/storage/src/mtd/mtd_core.c @@ -94,11 +94,10 @@ static void MtdDeviceUnlockDefault(struct MtdDevice *mtdDevice) struct PlatformManager *MtdManagerGet(void) { - int32_t ret; static struct PlatformManager *g_mtdManager = NULL; if (g_mtdManager == NULL) { - ret = PlatformManagerCreate("STORAGE_MTD", &g_mtdManager); + int32_t ret = PlatformManagerCreate("STORAGE_MTD", &g_mtdManager); if (ret != HDF_SUCCESS) { HDF_LOGE("MtdManagerGet: create manager fail, ret: %d!", ret); return NULL; @@ -209,14 +208,13 @@ static void MtdDumpBuf(uint8_t *buf, size_t len) size_t i; size_t idx; size_t lidx; - size_t line; #define MTD_DUMP_SIGLE_WIDTH 2 #define MTD_DUMP_LINE_LEN 32 #define MTD_DUMP_BUF_LEN (MTD_DUMP_LINE_LEN * MTD_DUMP_SIGLE_WIDTH + 1) char lineBuf[MTD_DUMP_BUF_LEN]; idx = 0; while (idx < len) { - line = (MTD_DUMP_LINE_LEN <= (len - idx)) ? MTD_DUMP_LINE_LEN : (len - idx); + size_t line = (MTD_DUMP_LINE_LEN <= (len - idx)) ? MTD_DUMP_LINE_LEN : (len - idx); for (i = 0, lidx = 0; i < line; i++, lidx += MTD_DUMP_SIGLE_WIDTH, buf++) { ret = snprintf_s(lineBuf + lidx, MTD_DUMP_SIGLE_WIDTH + 1, MTD_DUMP_SIGLE_WIDTH, "%02x", *buf); if (ret < 0) { diff --git a/framework/support/platform/src/can/can_manager.c b/framework/support/platform/src/can/can_manager.c index d527b8afb..bd4f75b6d 100644 --- a/framework/support/platform/src/can/can_manager.c +++ b/framework/support/platform/src/can/can_manager.c @@ -21,10 +21,8 @@ static struct PlatformManager *g_manager; static struct PlatformManager *CanManagerGet(void) { - int32_t ret; - if (g_manager == NULL) { - ret = PlatformManagerCreate("CAN_BUS_MANAGER", &g_manager); + int32_t ret = PlatformManagerCreate("CAN_BUS_MANAGER", &g_manager); if (ret != HDF_SUCCESS) { HDF_LOGE("CanManagerGet: create can manager fail, ret: %d!", ret); } @@ -42,7 +40,6 @@ static void CanManagerDestroyIfNeed(void) static int32_t CanIrqThreadWorker(void *data) { - int32_t ret; struct CanCntlr *cntlr = (struct CanCntlr *)data; if (cntlr == NULL) { @@ -53,7 +50,7 @@ static int32_t CanIrqThreadWorker(void *data) cntlr->threadStatus |= CAN_THREAD_RUNNING; while ((cntlr->threadStatus & CAN_THREAD_RUNNING) != 0) { /* wait event */ - ret = OsalSemWait(&cntlr->sem, HDF_WAIT_FOREVER); + int32_t ret = OsalSemWait(&cntlr->sem, HDF_WAIT_FOREVER); if (ret != HDF_SUCCESS) { continue; } diff --git a/framework/support/platform/src/dma/dmac_core.c b/framework/support/platform/src/dma/dmac_core.c index ced6c517f..f45e7d845 100644 --- a/framework/support/platform/src/dma/dmac_core.c +++ b/framework/support/platform/src/dma/dmac_core.c @@ -144,14 +144,12 @@ static void DmacFreeLli(struct DmacChanInfo *chanInfo) */ void DmaCntlrDestroy(struct DmaCntlr *cntlr) { - uint16_t i; - if (cntlr == NULL || cntlr->channelNum > DMAC_CHAN_NUM_MAX) { HDF_LOGE("DmaCntlrDestroy: dma cntlr is null or channel is invalid!"); return; } if (cntlr->channelList != NULL) { - for (i = 0; i < cntlr->channelNum; i++) { + for (uint16_t i = 0; i < cntlr->channelNum; i++) { DmacFreeLli(&(cntlr->channelList[i])); } OsalMemFree(cntlr->channelList); @@ -431,9 +429,7 @@ static int32_t DmacPeriphTransfer(struct DmaCntlr *cntlr, struct DmacMsg *msg) static int32_t DmacM2mTransfer(struct DmaCntlr *cntlr, struct DmacMsg *msg) { - int32_t ret; size_t leftSize; - size_t dmaSize; size_t dmaCount = 0; struct DmacChanInfo *chanInfo = NULL; @@ -453,8 +449,8 @@ static int32_t DmacM2mTransfer(struct DmaCntlr *cntlr, struct DmacMsg *msg) cntlr->dmacCacheInv((uintptr_t)msg->destAddr, (uintptr_t)(msg->destAddr + msg->transLen)); leftSize = msg->transLen; while (leftSize > 0) { - dmaSize = (leftSize >= cntlr->maxTransSize) ? cntlr->maxTransSize : leftSize; - ret = cntlr->dmaM2mChanEnable(cntlr, chanInfo, msg->srcAddr + dmaCount * cntlr->maxTransSize, + size_t dmaSize = (leftSize >= cntlr->maxTransSize) ? cntlr->maxTransSize : leftSize; + int32_t ret = cntlr->dmaM2mChanEnable(cntlr, chanInfo, msg->srcAddr + dmaCount * cntlr->maxTransSize, msg->destAddr + dmaCount * cntlr->maxTransSize, dmaSize); if (ret != HDF_SUCCESS) { HDF_LOGE("DmacM2mTransfer: enable channel m2m fail!"); @@ -526,7 +522,6 @@ uintptr_t DmaGetCurrChanDestAddr(struct DmaCntlr *cntlr, uint16_t chan) static uint32_t DmacIsr(uint32_t irq, void *dev) { uint16_t i; - int channelStatus; struct DmaCntlr *cntlr = (struct DmaCntlr *)dev; if (DmacCntlrCheck(cntlr) != HDF_SUCCESS) { @@ -539,7 +534,7 @@ static uint32_t DmacIsr(uint32_t irq, void *dev) return HDF_ERR_INVALID_OBJECT; } for (i = 0; i < cntlr->channelNum; i++) { - channelStatus = cntlr->dmacGetChanStatus(cntlr, i); + int channelStatus = cntlr->dmacGetChanStatus(cntlr, i); if (channelStatus == DMAC_CHN_SUCCESS || channelStatus == DMAC_CHN_ERROR) { cntlr->channelList[i].status = channelStatus; DmacCallbackHandle(&(cntlr->channelList[i])); diff --git a/framework/support/platform/src/fwk/platform_manager.c b/framework/support/platform/src/fwk/platform_manager.c index 32abba8ae..c8a082267 100644 --- a/framework/support/platform/src/fwk/platform_manager.c +++ b/framework/support/platform/src/fwk/platform_manager.c @@ -98,7 +98,6 @@ void PlatformManagerDestroy(struct PlatformManager *manager) struct PlatformManager *PlatformManagerGet(int module) { - int32_t ret; struct PlatformManager *manager = NULL; struct PlatformModuleInfo *info = NULL; @@ -110,7 +109,7 @@ struct PlatformManager *PlatformManagerGet(int module) PlatformGlobalLock(); if (info->priv == NULL) { - ret = PlatformManagerCreate(info->moduleName, &manager); + int32_t ret = PlatformManagerCreate(info->moduleName, &manager); if (ret != HDF_SUCCESS) { PLAT_LOGE("PlatformManagerGet: create manager fail, ret: %d!", ret); } else { diff --git a/framework/support/platform/src/fwk/platform_queue.c b/framework/support/platform/src/fwk/platform_queue.c index 4b17e5830..2a1670a21 100644 --- a/framework/support/platform/src/fwk/platform_queue.c +++ b/framework/support/platform/src/fwk/platform_queue.c @@ -47,13 +47,12 @@ static int32_t PlatformQueueNextMsg(struct PlatformQueue *queue, struct Platform static int32_t PlatformQueueWorker(void *data) { - int32_t ret; struct PlatformQueue *queue = (struct PlatformQueue *)data; struct PlatformMsg *msg = NULL; while (true) { /* wait envent */ - ret = OsalSemWait(&queue->sem, HDF_WAIT_FOREVER); + int32_t ret = OsalSemWait(&queue->sem, HDF_WAIT_FOREVER); if (ret != HDF_SUCCESS) { continue; } diff --git a/framework/support/platform/src/gpio/gpio_core.c b/framework/support/platform/src/gpio/gpio_core.c index c287c2af4..ed16f1689 100644 --- a/framework/support/platform/src/gpio/gpio_core.c +++ b/framework/support/platform/src/gpio/gpio_core.c @@ -142,7 +142,6 @@ void GpioCntlrIrqCallback(struct GpioCntlr *cntlr, uint16_t local) static int32_t GpioCntlrIrqThreadHandler(void *data) { - int32_t ret; uint32_t irqSave; struct GpioIrqRecord *irqRecord = (struct GpioIrqRecord *)data; @@ -151,7 +150,7 @@ static int32_t GpioCntlrIrqThreadHandler(void *data) return HDF_FAILURE; } while (true) { - ret = OsalSemWait(&irqRecord->sem, HDF_WAIT_FOREVER); + int32_t ret = OsalSemWait(&irqRecord->sem, HDF_WAIT_FOREVER); if (irqRecord->removed) { break; } @@ -205,7 +204,6 @@ static int32_t GpioCntlrSetIrqInner(struct GpioInfo *ginfo, struct GpioIrqRecord static int32_t GpioIrqRecordCreate(struct GpioInfo *ginfo, uint16_t mode, GpioIrqFunc func, void *arg, struct GpioIrqRecord **new) { - int32_t ret; struct GpioIrqRecord *irqRecord = NULL; struct OsalThreadParam cfg; @@ -221,7 +219,7 @@ static int32_t GpioIrqRecordCreate(struct GpioInfo *ginfo, uint16_t mode, GpioIr irqRecord->irqData = arg; irqRecord->global = GpioInfoToGlobal(ginfo); if (irqRecord->btmFunc != NULL) { - ret = OsalThreadCreate(&irqRecord->thread, GpioCntlrIrqThreadHandler, irqRecord); + int32_t ret = OsalThreadCreate(&irqRecord->thread, GpioCntlrIrqThreadHandler, irqRecord); if (ret != HDF_SUCCESS) { OsalMemFree(irqRecord); HDF_LOGE("GpioIrqRecordCreate: fail to create irq thread, ret: %d!", ret); diff --git a/framework/support/platform/src/hdmi/hdmi_core.c b/framework/support/platform/src/hdmi/hdmi_core.c index 995ad55b3..05bcabc95 100644 --- a/framework/support/platform/src/hdmi/hdmi_core.c +++ b/framework/support/platform/src/hdmi/hdmi_core.c @@ -142,8 +142,6 @@ static void HdmiFrlDeinit(struct HdmiCntlr *cntlr) static void HdmiHdcpInit(struct HdmiCntlr *cntlr) { - int32_t ret; - if (cntlr == NULL) { return; } @@ -158,7 +156,7 @@ static void HdmiHdcpInit(struct HdmiCntlr *cntlr) HDF_LOGE("hdcp malloc fail"); return; } - ret = OsalMutexInit(&(cntlr->hdcp->hdcpMutex)); + int32_t ret = OsalMutexInit(&(cntlr->hdcp->hdcpMutex)); if (ret != HDF_SUCCESS) { HDF_LOGE("HdmiHdcpInit: mutex init fail!"); return; @@ -321,13 +319,11 @@ static void HdmiCntlrUninit(struct HdmiCntlr *cntlr) int32_t HdmiCntlrAdd(struct HdmiCntlr *cntlr) { - int32_t ret; - if (cntlr == NULL) { return HDF_ERR_INVALID_OBJECT; } - ret = HdmiCntlrInit(cntlr); + int32_t ret = HdmiCntlrInit(cntlr); if (ret != HDF_SUCCESS) { return ret; } @@ -683,8 +679,6 @@ static void HdmiAttrInit(struct HdmiCntlr *cntlr) int32_t HdmiCntlrOpen(struct HdmiCntlr *cntlr) { - int32_t ret; - if (cntlr == NULL) { return HDF_ERR_INVALID_OBJECT; } @@ -699,7 +693,7 @@ int32_t HdmiCntlrOpen(struct HdmiCntlr *cntlr) HdmiCntlrHardWareInit(cntlr); /* HDCP on. */ if ((cntlr->cap.baseCap.data & HDMI_CAP_HDCP_MARK) > 0) { - ret = HdmiHdcpOpen(cntlr->hdcp); + int32_t ret = HdmiHdcpOpen(cntlr->hdcp); if (ret != HDF_SUCCESS) { HdmiHdcpClose(cntlr->hdcp); } @@ -1079,8 +1073,6 @@ static void HdmiFillVideoAttrFromHardwareStatus( struct HdmiVideoAttr *videoAttr, const struct HdmiHardwareStatus *hwStatus, struct HdmiCommonAttr *commAttr) { bool rgb; - bool aspectIs256; - uint8_t vic; enum HdmiVsVideoFormat format; enum Hdmi4kVic vic4k; @@ -1102,7 +1094,7 @@ static void HdmiFillVideoAttrFromHardwareStatus( * ... */ if (hwStatus->infoFrameStatus.aviEnable) { - vic = hwStatus->infoFrameStatus.avi[7]; + uint8_t vic = hwStatus->infoFrameStatus.avi[7]; /* * when the timing is 4096*2160, the aspect ratio in AVI infoFrame is 0 * (but the real aspect ratio is 256:135<0x04>, the video_code is 0) @@ -1114,7 +1106,7 @@ static void HdmiFillVideoAttrFromHardwareStatus( * vsif[7]: BIT[7]: reserved for future, BIT[6:5]: HDMI_Video_Format, BIT[4:0]: reserved. * vsif[8]: HDMI_VIC, 0x04: 4K*2K @24Hz(SMPTE). */ - aspectIs256 = (((vic == 0) && (hwStatus->infoFrameStatus.vsif[8] == 0x04)) || + bool aspectIs256 = (((vic == 0) && (hwStatus->infoFrameStatus.vsif[8] == 0x04)) || ((vic >= HDMI_VIC_4096X2160P25_256_135) && (vic <= HDMI_VIC_4096X2160P60_256_135))); videoAttr->aspect = (aspectIs256 == true) ? HDMI_PICTURE_ASPECT_256_135 : ((hwStatus->infoFrameStatus.avi[5] >> 4) & 0x3); /* 4'b, BIT[2:1] */ @@ -1219,7 +1211,6 @@ static int32_t HdmiVedioAttrHandle(struct HdmiCntlr *cntlr, struct HdmiHardwareS struct HdmiVideoAttr *videoAttr = &(cntlr->attr.videoAttr); struct HdmiCommonAttr curCommAttr = {0}; struct HdmiVideoAttr curVideoAttr = {0}; - int32_t ret; /* support HDR. */ if (cntlr->cap.baseCap.bits.hdr > 0) { @@ -1228,7 +1219,7 @@ static int32_t HdmiVedioAttrHandle(struct HdmiCntlr *cntlr, struct HdmiHardwareS /* support FRL. */ if (cntlr->cap.baseCap.bits.frl > 0) { - ret = HdmiFrlModeSelect(cntlr->frl); + int32_t ret = HdmiFrlModeSelect(cntlr->frl); if (ret != HDF_SUCCESS) { return ret; } diff --git a/framework/support/platform/src/hdmi/hdmi_edid.c b/framework/support/platform/src/hdmi/hdmi_edid.c index e3d56d3e7..821a9bf94 100644 --- a/framework/support/platform/src/hdmi/hdmi_edid.c +++ b/framework/support/platform/src/hdmi/hdmi_edid.c @@ -84,7 +84,6 @@ static int32_t HdmiEdidVendorInfoPhase(struct HdmiEdid *edid) { uint16_t data; uint16_t i; - uint16_t tmpData; struct HdmiSinkDeviceCapability *sinkCap = &(edid->sinkCap); struct HdmiEdidFirstBlockInfo *block = (struct HdmiEdidFirstBlockInfo *)edid->raw; @@ -93,7 +92,8 @@ static int32_t HdmiEdidVendorInfoPhase(struct HdmiEdid *edid) HDMI_EDID_MANUFACRURER_NAME_SHIFT) | (block->vendorName[UINT8_ARRAY_TELEMENT_1]); for (i = 0; i < HDMI_EDID_MANUFACRURER_NAME_MAX_LEN - 1; i++) { - tmpData = (data & (HDMI_EDID_MANUFACRURER_NAME_CHAR_MARK << (HDMI_EDID_MANUFACRURER_NAME_CHAR_SHIFT * i))); + uint16_t tmpData = (data & (HDMI_EDID_MANUFACRURER_NAME_CHAR_MARK << + (HDMI_EDID_MANUFACRURER_NAME_CHAR_SHIFT * i))); tmpData = (tmpData >> (HDMI_EDID_MANUFACRURER_NAME_CHAR_SHIFT * i)); if (tmpData > HDMI_EDID_MANUFACRURER_NAME_LOW_INVALID && tmpData < HDMI_EDID_MANUFACRURER_NAME_HIGH_INVALID) { @@ -510,7 +510,6 @@ static void HdmiEdidExtAdbDepthAndMaxRatePhase(struct HdmiEdidAudioInfo *audio, static int32_t HdmiEdidExtAudioDataBlockPhase(struct HdmiSinkDeviceCapability *sinkCap, uint8_t *data, uint8_t len) { uint8_t i; - uint8_t formatCode; /* * Each Short Audio Descriptor is 3-bytes long. There can be up to 31 bytes following any tag, @@ -528,7 +527,7 @@ static int32_t HdmiEdidExtAudioDataBlockPhase(struct HdmiSinkDeviceCapability *s } data += (i * HDMI_EDID_EXTENSION_SHORT_AUDIO_DESCRIPTOR_LEN); /* byte0: bit[6:3] Audio Format Code; bit[2:0] Max Number of channels - 1 */ - formatCode = (data[UINT8_ARRAY_TELEMENT_0] & HDMI_EDID_EXTENSION_AUDIO_FORMAT_CODE_MARK) >> + uint8_t formatCode = (data[UINT8_ARRAY_TELEMENT_0] & HDMI_EDID_EXTENSION_AUDIO_FORMAT_CODE_MARK) >> HDMI_EDID_EXTENSION_AUDIO_FORMAT_CODE_SHIFT; sinkCap->audioInfo[sinkCap->audioInfoCnt].formatCode = (enum HdmiAudioCodingType)formatCode; sinkCap->audioInfo[sinkCap->audioInfoCnt].channels = @@ -550,8 +549,6 @@ static int32_t HdmiEdidExtVideoDataBlockPhase(struct HdmiSinkDeviceCapability *s uint8_t len) { uint8_t i; - uint32_t vicAll; - uint32_t vicLower; uint32_t implicitNative = 0; for (i = 0; i < len; i++) { @@ -559,8 +556,8 @@ static int32_t HdmiEdidExtVideoDataBlockPhase(struct HdmiSinkDeviceCapability *s HDF_LOGD("VDB: vicNum reach the maximum"); break; } - vicAll = data[i]; - vicLower = (vicAll & HDMI_EDID_EXTENSION_VIC_LOWER7_MARK); + uint32_t vicAll = data[i]; + uint32_t vicLower = (vicAll & HDMI_EDID_EXTENSION_VIC_LOWER7_MARK); if (vicAll == 0) { continue; } @@ -952,14 +949,13 @@ static void HdmiEdidExtUseExtDataBlockY420VdbPhase(struct HdmiSinkDeviceCapabili const uint8_t *data, uint8_t len) { uint8_t i; - uint32_t vic; for (i = 1; i < len; i++) { if (sinkCap->y420Cap.onlySupportY420VicNum >= HDMI_EDID_EXTENSION_MAX_VIC_COUNT) { HDF_LOGD("Y420Vdb: vic num reach to max."); break; } - vic = data[i]; + uint32_t vic = data[i]; if (vic == 0 || (vic >= HDMI_EDID_EXTENSION_VIC_INVALID_LOW && vic <= HDMI_EDID_EXTENSION_VIC_INVALID_HIGH)) { continue; @@ -1199,19 +1195,17 @@ static void HdmiEdidExtSeveralDataBlockPhase(struct HdmiEdid *edid, uint8_t bloc struct HdmiSinkDeviceCapability *sinkCap = &(edid->sinkCap); uint8_t blkOffset = HDMI_EDID_EXTENSION_BLOCK_OFFSET; uint8_t dtdOffset = data[UINT8_ARRAY_TELEMENT_2]; - uint8_t dbTagCode; uint8_t blkLen; - int32_t ret; data += blkOffset; /* phase data block */ for (blkLen = 0; (blkOffset < dtdOffset) && (data != NULL); blkOffset += (blkLen + 1)) { data += blkLen; blkLen = (data[UINT8_ARRAY_TELEMENT_0] & HDMI_EDID_EXTENSION_DATA_BLOCK_LEN_MARK); - dbTagCode = (data[UINT8_ARRAY_TELEMENT_0] & HDMI_EDID_EXTENSION_DATA_BLOCK_TAG_CODE_MARK) >> + uint8_t dbTagCode = (data[UINT8_ARRAY_TELEMENT_0] & HDMI_EDID_EXTENSION_DATA_BLOCK_TAG_CODE_MARK) >> HDMI_EDID_EXTENSION_DATA_BLOCK_TAG_CODE_SHIFT; data++; - ret = HdmiEdidExtDataBlockPhase(sinkCap, data, blkLen, dbTagCode); + int32_t ret = HdmiEdidExtDataBlockPhase(sinkCap, data, blkLen, dbTagCode); if (ret != HDF_SUCCESS) { HDF_LOGE("data block %hhu phase fail", dbTagCode); return; diff --git a/framework/support/platform/src/hdmi/hdmi_frl.c b/framework/support/platform/src/hdmi/hdmi_frl.c index 1dd76100c..02ddc24bb 100644 --- a/framework/support/platform/src/hdmi/hdmi_frl.c +++ b/framework/support/platform/src/hdmi/hdmi_frl.c @@ -679,8 +679,6 @@ static void HdmiFrlTrainingResultCheckTimeout(struct HdmiFrl *frl) static void HdmiFrlTrainingResultHandleTimeout(struct HdmiFrl *frl) { - uint64_t curTime; - bool frlStart; struct HdmiCntlr *cntlr = (struct HdmiCntlr *)frl->priv; if (cntlr == NULL || cntlr->ops == NULL) { @@ -688,7 +686,7 @@ static void HdmiFrlTrainingResultHandleTimeout(struct HdmiFrl *frl) } do { - frlStart = HdmiFrlGetFrlStart(cntlr->scdc); + bool frlStart = HdmiFrlGetFrlStart(cntlr->scdc); if (frlStart == true && frl->info.start == true) { frl->info.work = true; /* n/cts config */ @@ -705,7 +703,7 @@ static void HdmiFrlTrainingResultHandleTimeout(struct HdmiFrl *frl) break; } - curTime = OsalGetSysTimeMs(); + uint64_t curTime = OsalGetSysTimeMs(); if ((curTime - frl->info.machineInfo.startTime) > frl->info.machineInfo.waitHandleTime) { (frl->info.machineInfo.timeoutCnt)++; break; diff --git a/framework/support/platform/src/hdmi/hdmi_hdcp.c b/framework/support/platform/src/hdmi/hdmi_hdcp.c index 087483093..232d92e8f 100644 --- a/framework/support/platform/src/hdmi/hdmi_hdcp.c +++ b/framework/support/platform/src/hdmi/hdmi_hdcp.c @@ -124,18 +124,16 @@ static int32_t HdmiHdcpWriteMsgAn(struct HdmiHdcp *hdcp) static int32_t HdmiHdcpReadMsgHv(struct HdmiHdcp *hdcp) { - uint8_t offset; uint8_t i; uint8_t vhNum = HDMI_HDCP_MSG_ALL_VH_LEN / HDMI_HDCP_MSG_PER_VH_LEN; - int32_t ret; if (hdcp == NULL) { return HDF_ERR_INVALID_PARAM; } for (i = 0; i < vhNum; i++) { - offset = HDMI_HDCP_V_H0 + i * HDMI_HDCP_MSG_PER_VH_LEN; - ret = HdmiHdcpRead(hdcp, offset, &(hdcp->vh[i]), HDMI_HDCP_MSG_PER_VH_LEN); + uint8_t offset = HDMI_HDCP_V_H0 + i * HDMI_HDCP_MSG_PER_VH_LEN; + int32_t ret = HdmiHdcpRead(hdcp, offset, &(hdcp->vh[i]), HDMI_HDCP_MSG_PER_VH_LEN); if (ret != HDF_SUCCESS) { return ret; } @@ -175,11 +173,9 @@ static void HdmiHdcpRegPrepare(const struct HdmiHdcp *hdcp) static int32_t HdmiHdcpAuthenticationPrepare(struct HdmiHdcp *hdcp) { - int32_t ret; - HdmiHdcpRegPrepare(hdcp); if (hdcp->aksvValid == false) { - ret = HdmiHdcpAuthenticationGenerateAksvAn(hdcp); + int32_t ret = HdmiHdcpAuthenticationGenerateAksvAn(hdcp); if (ret != HDF_SUCCESS) { hdcp->state = HDMI_HDCP_AUTH_AKSV_INVALID; return ret; diff --git a/framework/support/platform/src/hdmi/hdmi_infoframe.c b/framework/support/platform/src/hdmi/hdmi_infoframe.c index 351e2452d..1dbb78f67 100644 --- a/framework/support/platform/src/hdmi/hdmi_infoframe.c +++ b/framework/support/platform/src/hdmi/hdmi_infoframe.c @@ -653,7 +653,6 @@ static void HdmiFill14Vsif(struct HdmiVsInfoFrame *vs, const struct HdmiVideoAtt struct HdmiVideo4kInfo *info = NULL; struct HdmiVs14VsifContent *vsif = &(vs->vsifContent.vsif); enum HdmiVic vic; - uint32_t cnt; vsif->oui = HDMI_IEEE_OUI_1_4; vic = HdmiCommonGetVic(videoAttr->timing, videoAttr->aspect, false); @@ -661,7 +660,7 @@ static void HdmiFill14Vsif(struct HdmiVsInfoFrame *vs, const struct HdmiVideoAtt vic == HDMI_VIC_3840X2160P30_16_9 || vic == HDMI_VIC_4096X2160P24_256_135) && videoAttr->_3dStruct == HDMI_VS_VIDEO_3D_BUTT) { vsif->format = HDMI_VS_VIDEO_FORMAT_4K; - for (cnt = 0; cnt <= HDMI_VIDEO_4K_CODES_MAX; cnt++) { + for (uint32_t cnt = 0; cnt <= HDMI_VIDEO_4K_CODES_MAX; cnt++) { info = HdmiCommonGetVideo4kInfo(cnt); if (info != NULL && info->timing == videoAttr->timing) { vsif->vic = info->_4kVic; diff --git a/framework/support/platform/src/hdmi/hdmi_scdc.c b/framework/support/platform/src/hdmi/hdmi_scdc.c index d5d242bd5..67bcc05ed 100644 --- a/framework/support/platform/src/hdmi/hdmi_scdc.c +++ b/framework/support/platform/src/hdmi/hdmi_scdc.c @@ -272,7 +272,6 @@ bool HdmiScdcSinkSupport(struct HdmiScdc *scdc) { uint8_t srcVer; uint8_t i; - int32_t ret; if (scdc == NULL) { return HDF_ERR_INVALID_PARAM; @@ -280,7 +279,7 @@ bool HdmiScdcSinkSupport(struct HdmiScdc *scdc) for (i = 0; i < HDMI_SCDC_READ_SOURCE_VERSION_TIMES; i++) { srcVer = HDMI_SCDC_HDMI20_VERSION; - ret = HdmiScdcWriteSourceVersion(scdc, &srcVer); + int32_t ret = HdmiScdcWriteSourceVersion(scdc, &srcVer); if (ret != HDF_SUCCESS) { HDF_LOGE("scdc write source version fail"); return false; diff --git a/framework/support/platform/src/i3c/i3c_core.c b/framework/support/platform/src/i3c/i3c_core.c index ae0cd2355..abd903674 100644 --- a/framework/support/platform/src/i3c/i3c_core.c +++ b/framework/support/platform/src/i3c/i3c_core.c @@ -248,12 +248,9 @@ struct I3cDevice *I3cGetDeviceByAddr(const struct I3cCntlr *cntlr, uint16_t addr static int32_t I3cDeviceDefineI3cDevices(struct I3cDevice *device) { - int32_t ret; - int32_t addr; - - ret = SetAddrStatus(device->cntlr, device->addr, I3C_ADDR_I3C_DEVICE); + int32_t ret = SetAddrStatus(device->cntlr, device->addr, I3C_ADDR_I3C_DEVICE); if (ret != HDF_SUCCESS) { - addr = GetFreeAddr(device->cntlr); + int32_t addr = GetFreeAddr(device->cntlr); if (addr <= 0) { HDF_LOGE("I3cDeviceDefineI3cDevices: no free addresses left!"); return HDF_ERR_DEVICE_BUSY; diff --git a/framework/support/platform/src/pin/pin_core.c b/framework/support/platform/src/pin/pin_core.c index 87d6a6665..d0a76a0ca 100644 --- a/framework/support/platform/src/pin/pin_core.c +++ b/framework/support/platform/src/pin/pin_core.c @@ -178,14 +178,13 @@ struct PinCntlr *PinCntlrGetByPin(const struct PinDesc *desc) static int32_t GetPinIndex(struct PinCntlr *cntlr, struct PinDesc *desc) { uint16_t index; - int32_t ret; for (index = 0; index < cntlr->pinCount; index++) { if (cntlr->pins[index].pinName == NULL) { HDF_LOGE("GetPinIndex: cntlr->pin[index].pinName is null!"); break; } - ret = strcmp(cntlr->pins[index].pinName, desc->pinName); + int32_t ret = strcmp(cntlr->pins[index].pinName, desc->pinName); if (ret == 0) { HDF_LOGI("GetPinIndex: get pin index:%hu success!", index); return (int32_t)index; diff --git a/framework/support/platform/src/pwm/pwm_core.c b/framework/support/platform/src/pwm/pwm_core.c index 291298802..fa75f70f5 100644 --- a/framework/support/platform/src/pwm/pwm_core.c +++ b/framework/support/platform/src/pwm/pwm_core.c @@ -14,8 +14,6 @@ int32_t PwmDeviceGet(struct PwmDev *pwm) { - int32_t ret; - if (pwm == NULL) { HDF_LOGE("PwmDeviceGet: pwm is null!\n"); return HDF_ERR_INVALID_PARAM; @@ -28,7 +26,7 @@ int32_t PwmDeviceGet(struct PwmDev *pwm) return HDF_ERR_DEVICE_BUSY; } if (pwm->method != NULL && pwm->method->open != NULL) { - ret = pwm->method->open(pwm); + int32_t ret = pwm->method->open(pwm); if (ret != HDF_SUCCESS) { (void)OsalSpinUnlock(&(pwm->lock)); HDF_LOGE("PwmDeviceGet: open fail, ret: %d!", ret); @@ -43,15 +41,13 @@ int32_t PwmDeviceGet(struct PwmDev *pwm) int32_t PwmDevicePut(struct PwmDev *pwm) { - int32_t ret; - if (pwm == NULL) { HDF_LOGE("PwmDevicePut: pwm is null!\n"); return HDF_ERR_INVALID_PARAM; } if (pwm->method != NULL && pwm->method->close != NULL) { - ret = pwm->method->close(pwm); + int32_t ret = pwm->method->close(pwm); if (ret != HDF_SUCCESS) { HDF_LOGE("PwmDevicePut: close fail, ret: %d!", ret); return ret; diff --git a/framework/support/platform/src/rtc/rtc_base.c b/framework/support/platform/src/rtc/rtc_base.c index 5a092801e..f8290d01c 100644 --- a/framework/support/platform/src/rtc/rtc_base.c +++ b/framework/support/platform/src/rtc/rtc_base.c @@ -14,7 +14,6 @@ uint8_t RtcGetMonthDays(const uint8_t isLeapYear, const uint8_t month) { uint8_t days; - uint8_t oddMonth; if (IS_INVALID_MONTH(month) || (isLeapYear > RTC_TRUE)) { return 0; @@ -23,7 +22,7 @@ uint8_t RtcGetMonthDays(const uint8_t isLeapYear, const uint8_t month) if (month == RTC_FEBRUARY) { days = RTC_TWO_MONTH_DAY + isLeapYear; } else { - oddMonth = (month >= RTC_AUGUST) ? (month - RTC_UNIT_DIFF) : month; + uint8_t oddMonth = (month >= RTC_AUGUST) ? (month - RTC_UNIT_DIFF) : month; days = (oddMonth & RTC_ODD_MONTH_MASK) ? RTC_GREAT_MONTH_DAY : RTC_SMALL_MONTH_DAY; } return days; diff --git a/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp b/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp index 537d3f777..e2e9fbf47 100644 --- a/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp +++ b/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp @@ -22,7 +22,7 @@ constexpr int32_t MAX = 2; constexpr uint16_t GPIO_TEST_NUM = 3; } -struct AllParameters { +struct GpioAllParameters { uint16_t descVal; uint16_t descDir; uint16_t descMode; @@ -39,7 +39,7 @@ namespace OHOS { static bool GpioFuzzTest(const uint8_t *data, size_t size) { int32_t number; - const struct AllParameters *params = reinterpret_cast(data); + const struct GpioAllParameters *params = reinterpret_cast(data); number = randNum(MIN, MAX); switch (static_cast(number)) { @@ -68,7 +68,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) return 0; } - if (size < sizeof(struct AllParameters)) { + if (size < sizeof(struct GpioAllParameters)) { HDF_LOGE("LLVMFuzzerTestOneInput: gpio fuzz test size is small!"); return 0; } diff --git a/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.cpp b/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.cpp index b4756afb0..1c72545fd 100644 --- a/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.cpp +++ b/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.cpp @@ -15,7 +15,7 @@ constexpr int32_t BUS_NUM = 6; constexpr uint16_t BUF_LEN = 7; } -struct AllParameters { +struct I2cAllParameters { uint16_t addr; uint16_t flags; uint8_t buf[BUF_LEN]; @@ -25,7 +25,7 @@ namespace OHOS { static bool I2cFuzzTest(const uint8_t *data, size_t size) { DevHandle handle = nullptr; - const struct AllParameters *params = reinterpret_cast(data); + const struct I2cAllParameters *params = reinterpret_cast(data); struct I2cMsg msg; handle = I2cOpen(BUS_NUM); @@ -64,7 +64,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) return 0; } - if (size < sizeof(struct AllParameters)) { + if (size < sizeof(struct I2cAllParameters)) { HDF_LOGE("LLVMFuzzerTestOneInput: i2c fuzz test size is small!"); return 0; } diff --git a/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp b/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp index a515c1ed1..1e1c2933a 100644 --- a/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp +++ b/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp @@ -22,7 +22,7 @@ constexpr int32_t MAX = 2; constexpr int32_t PWM_FUZZ_NUM = 1; } -struct AllParameters { +struct PwmAllParameters { uint32_t descPer; uint32_t descDuty; uint8_t descPolar; @@ -33,7 +33,7 @@ static bool PwmFuzzTest(const uint8_t *data, size_t size) { int32_t number; DevHandle handle = nullptr; - const struct AllParameters *params = reinterpret_cast(data); + const struct PwmAllParameters *params = reinterpret_cast(data); number = randNum(MIN, MAX); handle = PwmOpen(PWM_FUZZ_NUM); @@ -68,7 +68,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) return 0; } - if (size < sizeof(struct AllParameters)) { + if (size < sizeof(struct PwmAllParameters)) { HDF_LOGE("LLVMFuzzerTestOneInput: pwm fuzz test size is small!"); return 0; } diff --git a/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp b/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp index ae3075099..648e2033b 100644 --- a/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp +++ b/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp @@ -22,7 +22,7 @@ constexpr int32_t MAX = 4; constexpr uint8_t RTC_USER_INDEX = 8; } -struct AllParameters { +struct RtcAllParameters { uint32_t desFreq; uint8_t desValue; uint8_t desEnable; @@ -35,7 +35,7 @@ static bool RtcFuzzTest(const uint8_t *data, size_t size) { int32_t number; DevHandle handle = nullptr; - const struct AllParameters *params = reinterpret_cast(data); + const struct RtcAllParameters *params = reinterpret_cast(data); number = randNum(MIN, MAX); handle = RtcOpen(); @@ -76,7 +76,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) return 0; } - if (size < sizeof(struct AllParameters)) { + if (size < sizeof(struct RtcAllParameters)) { HDF_LOGE("LLVMFuzzerTestOneInput: rtc fuzz test size is small!"); return 0; } diff --git a/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp b/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp index 03a837174..35c9b24ec 100644 --- a/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp +++ b/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp @@ -24,7 +24,7 @@ constexpr int32_t CS_TEST_NUM = 0; constexpr uint32_t SPI_BUF_SIZE = 8; } -struct AllParameters { +struct SpiAllParameters { uint32_t descSpeed; uint16_t descDelay; uint8_t descKeep; @@ -62,7 +62,7 @@ static bool SpiFuzzTest(const uint8_t *data, size_t size) struct SpiCfg cfg; DevHandle handle = nullptr; struct SpiDevInfo info; - const struct AllParameters *params = reinterpret_cast(data); + const struct SpiAllParameters *params = reinterpret_cast(data); info.busNum = BUS_TEST_NUM; info.csNum = CS_TEST_NUM; @@ -113,7 +113,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) return 0; } - if (size < sizeof(struct AllParameters)) { + if (size < sizeof(struct SpiAllParameters)) { HDF_LOGE("LLVMFuzzerTestOneInput: spi fuzz test size is small!"); return 0; } diff --git a/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp b/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp index c8e5367fb..80cc8c4b8 100644 --- a/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp +++ b/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp @@ -22,7 +22,7 @@ constexpr int32_t MAX = 2; constexpr int32_t UART_FUZZ_PORT = 1; } -struct AllParameters { +struct UartAllParameters { uint32_t desBaudRate; struct UartAttribute paraAttribute; uint32_t paraMode; @@ -33,7 +33,7 @@ static bool UartFuzzTest(const uint8_t *data, size_t size) { int32_t number; DevHandle handle = nullptr; - const struct AllParameters *params = reinterpret_cast(data); + const struct UartAllParameters *params = reinterpret_cast(data); number = randNum(MIN, MAX); handle = UartOpen(UART_FUZZ_PORT); @@ -68,7 +68,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) return 0; } - if (size < sizeof(struct AllParameters)) { + if (size < sizeof(struct UartAllParameters)) { HDF_LOGE("LLVMFuzzerTestOneInput: uart fuzz test size is small!"); return 0; } diff --git a/framework/test/unittest/platform/common/adc_test.c b/framework/test/unittest/platform/common/adc_test.c index 188befc18..6e8586921 100644 --- a/framework/test/unittest/platform/common/adc_test.c +++ b/framework/test/unittest/platform/common/adc_test.c @@ -107,7 +107,6 @@ static int32_t AdcTestRead(void) { struct AdcTester *tester = NULL; uint32_t value[TEST_ADC_VAL_NUM]; - int32_t ret; int i; HDF_LOGI("AdcTestRead: enter!"); @@ -118,7 +117,7 @@ static int32_t AdcTestRead(void) } for (i = 0; i < TEST_ADC_VAL_NUM; i++) { value[i] = 0; - ret = AdcRead(tester->handle, tester->config.channel, &value[i]); + int32_t ret = AdcRead(tester->handle, tester->config.channel, &value[i]); if (ret != HDF_SUCCESS || value[i] >= (1U << tester->config.dataWidth)) { HDF_LOGE("AdcTestRead: read value fail, ret: %d!", ret); return HDF_ERR_IO; @@ -135,7 +134,6 @@ static int AdcTestThreadFunc(void *param) struct AdcTester *tester = NULL; uint32_t val; int i; - int32_t ret; HDF_LOGI("AdcTestThreadFunc: enter!"); tester = AdcTesterGet(); @@ -146,7 +144,7 @@ static int AdcTestThreadFunc(void *param) } for (i = 0; i < ADC_TEST_WAIT_TIMES; i++) { - ret = AdcRead(tester->handle, tester->config.channel, &val); + int32_t ret = AdcRead(tester->handle, tester->config.channel, &val); if (ret != HDF_SUCCESS) { HDF_LOGE("AdcTestThreadFunc: adc read fail, ret: %d!", ret); *((int32_t *)param) = 1; @@ -259,8 +257,6 @@ static int32_t AdcIfPerformanceTest(void) #endif struct AdcTester *tester = NULL; uint64_t startMs; - uint64_t endMs; - uint64_t useTime; // ms uint32_t val; int32_t ret; @@ -273,8 +269,8 @@ static int32_t AdcIfPerformanceTest(void) startMs = OsalGetSysTimeMs(); ret = AdcRead(tester->handle, tester->config.channel, &val); if (ret == HDF_SUCCESS) { - endMs = OsalGetSysTimeMs(); - useTime = endMs - startMs; + uint64_t endMs = OsalGetSysTimeMs(); + uint64_t useTime = endMs - startMs; HDF_LOGI("AdcIfPerformanceTest: ----->interface performance test:[start - end] < 1ms[%{pubilc}s]\r\n", useTime < 1 ? "yes" : "no"); return HDF_SUCCESS; diff --git a/framework/test/unittest/platform/common/dac_test.c b/framework/test/unittest/platform/common/dac_test.c index 56eba4aaf..2dcab72c7 100644 --- a/framework/test/unittest/platform/common/dac_test.c +++ b/framework/test/unittest/platform/common/dac_test.c @@ -99,7 +99,6 @@ static int32_t DacTestWrite(void) { struct DacTester *tester = NULL; uint32_t value[TEST_DAC_VAL_NUM]; - int32_t ret; int i; tester = DacTesterGet(); @@ -109,7 +108,7 @@ static int32_t DacTestWrite(void) } for (i = 0; i < TEST_DAC_VAL_NUM; i++) { value[i] = i; - ret = DacWrite(tester->handle, tester->config.channel, value[i]); + int32_t ret = DacWrite(tester->handle, tester->config.channel, value[i]); if (ret != HDF_SUCCESS) { HDF_LOGE("DacTestWrite: write value fail:%u, ret: %d!", value[i], ret); return HDF_ERR_IO; @@ -124,7 +123,6 @@ static int DacTestThreadFunc(void *param) struct DacTester *tester = NULL; uint32_t val; uint32_t i; - int32_t ret; tester = DacTesterGet(); if (tester == NULL) { @@ -134,7 +132,7 @@ static int DacTestThreadFunc(void *param) } for (i = 0; i < DAC_TEST_WAIT_TIMES; i++) { val = i; - ret = DacWrite(tester->handle, tester->config.channel, val); + int32_t ret = DacWrite(tester->handle, tester->config.channel, val); if (ret != HDF_SUCCESS) { HDF_LOGE("DacTestThreadFunc: DacWrite fail, ret: %d!", ret); *((int32_t *)param) = 1; diff --git a/framework/test/unittest/platform/common/gpio_test.c b/framework/test/unittest/platform/common/gpio_test.c index 34798ba7e..a4e3eab46 100644 --- a/framework/test/unittest/platform/common/gpio_test.c +++ b/framework/test/unittest/platform/common/gpio_test.c @@ -543,11 +543,10 @@ int32_t GpioTestExecute(int cmd) void GpioTestExecuteAll(void) { int32_t i; - int32_t ret; int32_t fails = 0; for (i = 0; i < GPIO_TEST_MAX; i++) { - ret = GpioTestExecute(i); + int32_t ret = GpioTestExecute(i); fails += (ret != HDF_SUCCESS) ? 1 : 0; } diff --git a/framework/test/unittest/platform/common/i2c_test.c b/framework/test/unittest/platform/common/i2c_test.c index 7d7ee1e55..9d34fb64d 100644 --- a/framework/test/unittest/platform/common/i2c_test.c +++ b/framework/test/unittest/platform/common/i2c_test.c @@ -342,7 +342,6 @@ static int32_t I2cTestPeformance(void) #endif uint64_t startMs; uint64_t endMs; - uint64_t useTime; // ms struct I2cTester *tester = NULL; DevHandle handle = NULL; @@ -357,7 +356,7 @@ static int32_t I2cTestPeformance(void) endMs = OsalGetSysTimeMs(); if (handle != NULL) { - useTime = endMs - startMs; + uint64_t useTime = endMs - startMs; HDF_LOGI("I2cTestPeformance: ----->interface performance test:[start - end] < 1ms[%s]\r\n", useTime < 1 ? "yes" : "no"); I2cClose(handle); @@ -442,14 +441,13 @@ int32_t I2cTestExecute(int cmd) void I2cTestExecuteAll(void) { int32_t i; - int32_t ret; int32_t fails = 0; /* setup env for all test cases */ (void)I2cTestExecute(I2C_TEST_CMD_SETUP_ALL); for (i = 0; i <= I2C_TEST_CMD_RELIABILITY; i++) { - ret = I2cTestExecute(i); + int32_t ret = I2cTestExecute(i); fails += (ret != HDF_SUCCESS) ? 1 : 0; } diff --git a/framework/test/unittest/platform/common/i3c_test.c b/framework/test/unittest/platform/common/i3c_test.c index 6a5a0246c..5b93f6d19 100644 --- a/framework/test/unittest/platform/common/i3c_test.c +++ b/framework/test/unittest/platform/common/i3c_test.c @@ -445,7 +445,6 @@ static struct I3cTestEntry g_multiThreadEntry[] = { static int32_t I3cTestMultiThread(void *param) { uint32_t i; - int32_t ret; for (i = 0; i < sizeof(g_multiThreadEntry) / sizeof(g_multiThreadEntry[0]); i++) { if (g_multiThreadEntry[i].func == NULL) { @@ -453,7 +452,7 @@ static int32_t I3cTestMultiThread(void *param) return HDF_FAILURE; } HDF_LOGI("I3cTestMultiThread: =================calling func %u =========================", i); - ret = I3cTestThreadFunc((OsalThreadEntry)g_multiThreadEntry[i].func); + int32_t ret = I3cTestThreadFunc((OsalThreadEntry)g_multiThreadEntry[i].func); if (ret != HDF_SUCCESS) { HDF_LOGE("I3cTestMultiThread: Multithreading test fail: %u", i); return ret; diff --git a/framework/test/unittest/platform/common/platform_device_test.c b/framework/test/unittest/platform/common/platform_device_test.c index bc8868ab9..448268e99 100644 --- a/framework/test/unittest/platform/common/platform_device_test.c +++ b/framework/test/unittest/platform/common/platform_device_test.c @@ -317,11 +317,10 @@ int PlatformDeviceTestExecute(int cmd) void PlatformDeviceTestExecuteAll(void) { int32_t i; - int32_t ret; int32_t fails = 0; for (i = 0; i < PLAT_DEVICE_TEST_CMD_MAX; i++) { - ret = PlatformDeviceTestExecute(i); + int32_t ret = PlatformDeviceTestExecute(i); fails += (ret != HDF_SUCCESS) ? 1 : 0; } diff --git a/framework/test/unittest/platform/common/platform_event_test.c b/framework/test/unittest/platform/common/platform_event_test.c index bdb0194f7..39b240d63 100644 --- a/framework/test/unittest/platform/common/platform_event_test.c +++ b/framework/test/unittest/platform/common/platform_event_test.c @@ -237,11 +237,10 @@ int PlatformEventTestExecute(int cmd) void PlatformEventTestExecuteAll(void) { int32_t i; - int32_t ret; int32_t fails = 0; for (i = 0; i < PLAT_EVENT_TEST_CMD_MAX; i++) { - ret = PlatformEventTestExecute(i); + int32_t ret = PlatformEventTestExecute(i); fails += (ret != HDF_SUCCESS) ? 1 : 0; } diff --git a/framework/test/unittest/platform/common/platform_queue_test.c b/framework/test/unittest/platform/common/platform_queue_test.c index ddb90c842..ca8c8630d 100644 --- a/framework/test/unittest/platform/common/platform_queue_test.c +++ b/framework/test/unittest/platform/common/platform_queue_test.c @@ -165,11 +165,10 @@ int PlatformQueueTestExecute(int cmd) void PlatformQueueTestExecuteAll(void) { int32_t i; - int32_t ret; int32_t fails = 0; for (i = 0; i < PLAT_QUEUE_TEST_CMD_MAX; i++) { - ret = PlatformQueueTestExecute(i); + int32_t ret = PlatformQueueTestExecute(i); fails += (ret != HDF_SUCCESS) ? 1 : 0; } diff --git a/framework/test/unittest/platform/common/spi_test.c b/framework/test/unittest/platform/common/spi_test.c index 5049f5e67..16aa57848 100644 --- a/framework/test/unittest/platform/common/spi_test.c +++ b/framework/test/unittest/platform/common/spi_test.c @@ -493,14 +493,13 @@ static int32_t SpiIfPerformanceTest(struct SpiTester *tester) struct SpiCfg cfg = {0}; uint64_t startMs; uint64_t endMs; - uint64_t useTime; // ms startMs = OsalGetSysTimeMs(); ret = SpiGetCfg(tester->handle, &cfg); endMs = OsalGetSysTimeMs(); if (ret == HDF_SUCCESS) { - useTime = endMs - startMs; + uint64_t useTime = endMs - startMs; HDF_LOGI("SpiIfPerformanceTest: ----->interface performance test:[start - end] < 1ms[%s]\r\n", useTime < 1 ? "yes" : "no"); return HDF_SUCCESS; diff --git a/framework/test/unittest/platform/config/can_test_config.c b/framework/test/unittest/platform/config/can_test_config.c index f42bc8001..455717f7b 100644 --- a/framework/test/unittest/platform/config/can_test_config.c +++ b/framework/test/unittest/platform/config/can_test_config.c @@ -75,7 +75,6 @@ static int32_t CanTestReadConfig(struct CanTestConfig *config, const struct Devi static int32_t CanTestBind(struct HdfDeviceObject *device) { - int32_t ret; static struct IDeviceIoService service; if (device == NULL) { @@ -87,7 +86,7 @@ static int32_t CanTestBind(struct HdfDeviceObject *device) HDF_LOGI("CanTestBind: property not configed, using default!"); CanTestSetDftConfig(&g_config); } else { - ret = CanTestReadConfig(&g_config, device->property); + int32_t ret = CanTestReadConfig(&g_config, device->property); if (ret != HDF_SUCCESS) { HDF_LOGE("CanTestBind: read config fail, ret: %d!", ret); return ret; diff --git a/framework/test/unittest/platform/virtual/i3c_virtual.c b/framework/test/unittest/platform/virtual/i3c_virtual.c index 07514bea5..56072367b 100644 --- a/framework/test/unittest/platform/virtual/i3c_virtual.c +++ b/framework/test/unittest/platform/virtual/i3c_virtual.c @@ -368,7 +368,6 @@ static int32_t VirtualI3cParseAndInit(struct HdfDeviceObject *device, const stru static int32_t VirtualI3cInit(struct HdfDeviceObject *device) { - int32_t ret; const struct DeviceResourceNode *childNode = NULL; HDF_LOGD("VirtualI3cInit: enter!"); @@ -378,7 +377,7 @@ static int32_t VirtualI3cInit(struct HdfDeviceObject *device) } DEV_RES_NODE_FOR_EACH_CHILD_NODE(device->property, childNode) { - ret = VirtualI3cParseAndInit(device, childNode); + int32_t ret = VirtualI3cParseAndInit(device, childNode); if (ret != HDF_SUCCESS) { break; } diff --git a/framework/test/unittest/platform/virtual/pin_virtual.c b/framework/test/unittest/platform/virtual/pin_virtual.c index f96180665..e7da8ce48 100644 --- a/framework/test/unittest/platform/virtual/pin_virtual.c +++ b/framework/test/unittest/platform/virtual/pin_virtual.c @@ -114,7 +114,6 @@ static int32_t VirtualPinGetStrength(struct PinCntlr *cntlr, uint32_t index, uin static int32_t VirtualPinSetFunc(struct PinCntlr *cntlr, uint32_t index, const char *funcName) { - int ret; uint32_t funcNum; struct VirtualPinCntlr *virtual = NULL; @@ -131,7 +130,7 @@ static int32_t VirtualPinSetFunc(struct PinCntlr *cntlr, uint32_t index, const c virtual = (struct VirtualPinCntlr *)cntlr; for (funcNum = 0; funcNum < VIRTUAL_PIN_FUNC_MAX; funcNum++) { - ret = strcmp(funcName, virtual->desc[index].func[funcNum]); + int ret = strcmp(funcName, virtual->desc[index].func[funcNum]); if (ret == 0) { virtual->desc[index].curFunc = virtual->desc[index].func[funcNum]; return HDF_SUCCESS; diff --git a/framework/test/unittest/platform/virtual/regulator_virtual.c b/framework/test/unittest/platform/virtual/regulator_virtual.c index 7c17c5485..74148fa75 100644 --- a/framework/test/unittest/platform/virtual/regulator_virtual.c +++ b/framework/test/unittest/platform/virtual/regulator_virtual.c @@ -257,7 +257,6 @@ static int32_t VirtualRegulatorParseAndInit(struct HdfDeviceObject *device, cons static int32_t VirtualRegulatorInit(struct HdfDeviceObject *device) { - int32_t ret; const struct DeviceResourceNode *childNode = NULL; if (device == NULL || device->property == NULL) { @@ -266,7 +265,7 @@ static int32_t VirtualRegulatorInit(struct HdfDeviceObject *device) } DEV_RES_NODE_FOR_EACH_CHILD_NODE(device->property, childNode) { - ret = VirtualRegulatorParseAndInit(device, childNode); + int32_t ret = VirtualRegulatorParseAndInit(device, childNode); if (ret != HDF_SUCCESS) { HDF_LOGE("VirtualRegulatorInit: VirtualRegulatorParseAndInit fail, ret: %d!", ret); return ret; diff --git a/framework/test/unittest/platform/virtual/spi_virtual.c b/framework/test/unittest/platform/virtual/spi_virtual.c index beca6f684..bd633404a 100644 --- a/framework/test/unittest/platform/virtual/spi_virtual.c +++ b/framework/test/unittest/platform/virtual/spi_virtual.c @@ -274,7 +274,6 @@ static int32_t VirtualSpiTransferOneMessage(struct VirtualSpi *virtual, struct S static int32_t VirtualSpiTransfer(struct SpiCntlr *cntlr, struct SpiMsg *msg, uint32_t count) { - int32_t ret; uint32_t i; struct VirtualSpi *virtual = NULL; @@ -293,7 +292,7 @@ static int32_t VirtualSpiTransfer(struct SpiCntlr *cntlr, struct SpiMsg *msg, ui return HDF_FAILURE; } for (i = 0; i < count; i++) { - ret = VirtualSpiTransferOneMessage(virtual, &(msg[i])); + int32_t ret = VirtualSpiTransferOneMessage(virtual, &(msg[i])); if (ret != 0) { HDF_LOGE("VirtualSpiTransfer: transfer error, ret: %d!", ret); return ret; -- Gitee