From 1892c1b37e46b930381fc5d668f15dfd2cbabda7 Mon Sep 17 00:00:00 2001 From: wanghchao Date: Thu, 17 Feb 2022 16:34:55 +0800 Subject: [PATCH] style:clean usb subsystem codedex Signed-off-by: wanghchao --- model/usb/src/usb_ddk_pnp_loader.c | 8 +++--- .../device/src/usb_device_lite_cdcacm_test.c | 4 +-- .../device/src/usb_device_lite_sdk_if_test.c | 10 ++++---- test/unittest/model/usb/host/src/usb_raw_io.c | 4 +-- .../model/usb/host/src/usb_raw_test.c | 25 +++++++++++-------- test/unittest/model/usb/host/src/usb_test.c | 10 +++++--- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/model/usb/src/usb_ddk_pnp_loader.c b/model/usb/src/usb_ddk_pnp_loader.c index 94e4b6c1..4fe5ffdc 100644 --- a/model/usb/src/usb_ddk_pnp_loader.c +++ b/model/usb/src/usb_ddk_pnp_loader.c @@ -839,8 +839,8 @@ static void UsbDdkPnpLoaderAddDevice(uint32_t cmdId, uint8_t index, struct HdfDe } HDF_LOGD("%s:%d matchDevice end, index=%d tableCount=%d is match \ - idTable=%p, moduleName=%s, serviceName=%s", - __func__, __LINE__, index, tableCount, idTable, idTable->moduleName, idTable->serviceName); + moduleName=%s, serviceName=%s", + __func__, __LINE__, index, tableCount, idTable->moduleName, idTable->serviceName); ret = UsbDdkPnpLoaderrAddPnpDevice(usbPnpManagerDevice, infoTable, idTable, cmdId); if (ret != HDF_SUCCESS) { @@ -1036,8 +1036,8 @@ int UsbDdkPnpLoaderEventReceived(void *usbPnpManagerPtr, uint32_t id, struct Hdf flag = HdfSbufReadBuffer(data, (const void **)(&infoTable), &infoSize); if ((flag == false) || (infoTable == NULL)) { ret = HDF_ERR_INVALID_PARAM; - HDF_LOGE("%s: fail to read infoTable in event data, flag=%d, infoTable=%p", \ - __func__, flag, infoTable); + HDF_LOGE("%s: fail to read infoTable in event data, flag=%d", \ + __func__, flag); return ret; } diff --git a/test/unittest/model/usb/device/src/usb_device_lite_cdcacm_test.c b/test/unittest/model/usb/device/src/usb_device_lite_cdcacm_test.c index a6254e77..478d396d 100755 --- a/test/unittest/model/usb/device/src/usb_device_lite_cdcacm_test.c +++ b/test/unittest/model/usb/device/src/usb_device_lite_cdcacm_test.c @@ -421,13 +421,13 @@ static int AllocCtrlRequests(struct AcmDevice *acmDevice) for (i = 0; i < count; i++) { ctrlInfo = (struct CtrlInfo *)OsalMemCalloc(sizeof(*ctrlInfo)); - if (NULL == ctrlInfo) { + if (ctrlInfo == NULL) { return -1; } ctrlInfo->acm = acmDevice; req = UsbFnAllocCtrlRequest(acmDevice->ctrlIface.handle, sizeof(struct UsbCdcLineCoding) + sizeof(struct UsbCdcLineCoding)); - if (NULL == req) { + if (req == NULL) { return -1; } req->complete = CtrlComplete; diff --git a/test/unittest/model/usb/device/src/usb_device_lite_sdk_if_test.c b/test/unittest/model/usb/device/src/usb_device_lite_sdk_if_test.c index 9f46ec60..52623e84 100755 --- a/test/unittest/model/usb/device/src/usb_device_lite_sdk_if_test.c +++ b/test/unittest/model/usb/device/src/usb_device_lite_sdk_if_test.c @@ -1704,7 +1704,7 @@ int32_t UsbFnDviceTestOpenInterface(void) return HDF_FAILURE; } handle = UsbFnOpenInterface(g_acmDevice->ctrlIface.fn); - if (NULL != handle) { + if (handle != NULL) { HDF_LOGE("%s: open interface success!!", __func__); return HDF_FAILURE; } @@ -1723,7 +1723,7 @@ int32_t UsbFnDviceTestOpenInterface002(void) return HDF_FAILURE; } handle = UsbFnOpenInterface(g_acmDevice->dataIface.fn); - if (NULL != handle) { + if (handle != NULL) { HDF_LOGE("%s: open interface success!!", __func__); return HDF_FAILURE; } @@ -1749,7 +1749,7 @@ int32_t UsbFnDviceTestOpenInterface003(void) } g_acmDevice->ctrlIface.handle = NULL; handle = UsbFnOpenInterface(g_acmDevice->ctrlIface.fn); - if (NULL == handle) { + if (handle ==NULL) { HDF_LOGE("%s: open interface failed", __func__); return HDF_FAILURE; } @@ -1776,7 +1776,7 @@ int32_t UsbFnDviceTestOpenInterface004(void) } g_acmDevice->dataIface.handle = NULL; handle = UsbFnOpenInterface(g_acmDevice->dataIface.fn); - if (NULL == handle) { + if (handle == NULL) { HDF_LOGE("%s: open interface failed", __func__); return HDF_FAILURE; } @@ -1790,7 +1790,7 @@ int32_t UsbFnDviceTestOpenInterface005(void) struct UsbFnInterface *fn = NULL; handle = UsbFnOpenInterface(fn); - if (NULL != handle) { + if (handle != NULL) { HDF_LOGE("%s: open interface success!!", __func__); return HDF_FAILURE; } diff --git a/test/unittest/model/usb/host/src/usb_raw_io.c b/test/unittest/model/usb/host/src/usb_raw_io.c index 45212bf9..fcb2fbb5 100755 --- a/test/unittest/model/usb/host/src/usb_raw_io.c +++ b/test/unittest/model/usb/host/src/usb_raw_io.c @@ -175,7 +175,7 @@ void AcmReadBulkCallback(const void *requestArg) } break; case USB_REQUEST_CANCELLED: - printf("%s: the request is cancelled request:%p\n", __func__, req); + printf("%s: the request is cancelled request \n", __func__); return; default: printf("%s: the request is failed\n", __func__); @@ -218,7 +218,7 @@ static int AcmWriteBufAllocHandle(const struct AcmRawDevice *acm) for (wb = (struct RawWb *)&acm->wb[0], i = 0; i < ACM_NW; i++, wb++) { wb->buf = OsalMemCalloc(acm->dataOutEp.maxPacketSize); if (!wb->buf) { - while (i != 0) { + while (i > 0) { --i; --wb; OsalMemFree(wb->buf); diff --git a/test/unittest/model/usb/host/src/usb_raw_test.c b/test/unittest/model/usb/host/src/usb_raw_test.c index 67946378..89a49574 100755 --- a/test/unittest/model/usb/host/src/usb_raw_test.c +++ b/test/unittest/model/usb/host/src/usb_raw_test.c @@ -313,7 +313,7 @@ int32_t CheckRawSdkIfFillIsoRequest001(void) char sendData[] = {"abcde\0"}; struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->isoEp.maxPacketSize) ? rawAcm->isoEp.maxPacketSize : size; for (i = 0; i < 1; i++) { reqData.endPoint = rawAcm->isoEp.addr; @@ -341,7 +341,7 @@ int32_t CheckRawSdkIfFillIsoRequest002(void) char sendData[] = {"abcde\0"}; struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->isoEp.maxPacketSize) ? rawAcm->isoEp.maxPacketSize : size; for (i = 0; i < 1; i++) { reqData.endPoint = rawAcm->isoEp.addr; @@ -369,7 +369,7 @@ int32_t CheckRawSdkIfFillIsoRequest003(void) char sendData[] = {"abcde\0"}; struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->isoEp.maxPacketSize) ? rawAcm->isoEp.maxPacketSize : size; for (i = 0; i < 1; i++) { reqData.endPoint = rawAcm->isoEp.addr; @@ -397,7 +397,7 @@ int32_t CheckRawSdkIfFillIsoRequest004(void) char sendData[] = {"abcde\0"}; struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->isoEp.maxPacketSize) ? rawAcm->isoEp.maxPacketSize : size; for (i = 0; i < 1; i++) { reqData.endPoint = rawAcm->isoEp.addr; @@ -425,7 +425,7 @@ int32_t CheckRawSdkIfFillIsoRequest005(void) char sendData[] = {"abcde\0"}; struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->isoEp.maxPacketSize) ? rawAcm->isoEp.maxPacketSize : size; for (i = 0; i < 1; i++) { reqData.endPoint = rawAcm->isoEp.addr; @@ -453,7 +453,7 @@ int32_t CheckRawSdkIfFillIsoRequest006(void) char sendData[] = {"abcde\0"}; struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->isoEp.maxPacketSize) ? rawAcm->isoEp.maxPacketSize : size; for (i = 0; i < 1; i++) { reqData.endPoint = rawAcm->isoEp.addr; @@ -956,7 +956,7 @@ int32_t CheckRawSdkIfFillBulkRequest001(void) struct AcmRawDevice *rawAcm = UsbGetIoAcm(); size = strlen(sendData) + 1; - printf("---size:%d\n", size); + printf("---size:%u\n", size); size = (size > rawAcm->dataOutEp.maxPacketSize) ? rawAcm->dataOutEp.maxPacketSize : size; for (i = 0; i < 1; i++) { @@ -964,7 +964,8 @@ int32_t CheckRawSdkIfFillBulkRequest001(void) snd->len = size; ret = memcpy_s(snd->buf, rawAcm->dataOutEp.maxPacketSize, sendData, size); if (ret) { - printf("memcpy_s fial"); + HDF_LOGE("%s: memcpy_s fail", __func__); + return HDF_FAILURE; } rawAcm->transmitting++; @@ -975,7 +976,7 @@ int32_t CheckRawSdkIfFillBulkRequest001(void) reqData.timeout = USB_CTRL_SET_TIMEOUT; reqData.buffer = snd->buf; reqData.length = snd->len; - printf("maxPacketSize:%d+snd->request:%p\n", rawAcm->dataOutEp.maxPacketSize, snd->request); + printf("maxPacketSize:%d+snd->request\n", rawAcm->dataOutEp.maxPacketSize); ret = UsbRawFillBulkRequest(snd->request, rawAcm->devHandle, &reqData); if (ret) { printf("%s: error++ret=%d\n", __func__, ret); @@ -1536,7 +1537,8 @@ int32_t CheckRawSdkIfSendBulkRequest001(void) snd->len = size; ret = memcpy_s(snd->buf, rawAcm->dataOutEp.maxPacketSize, sendData, size); if (ret) { - printf("memcpy_s fial"); + HDF_LOGE("%s: memcpy_s fail", __func__); + return HDF_FAILURE; } rawAcm->transmitting++; @@ -1756,7 +1758,8 @@ int32_t CheckRawSdkIfFillBulkRequest003(void) snd->len = size; ret = memcpy_s(snd->buf, rawAcm->dataOutEp.maxPacketSize, sendData, size); if (ret) { - printf("memcpy_s fial"); + HDF_LOGE("%s: memcpy_s fail", __func__); + return HDF_FAILURE; } rawAcm->transmitting++; diff --git a/test/unittest/model/usb/host/src/usb_test.c b/test/unittest/model/usb/host/src/usb_test.c index 72494b68..d06a89a2 100755 --- a/test/unittest/model/usb/host/src/usb_test.c +++ b/test/unittest/model/usb/host/src/usb_test.c @@ -36,7 +36,7 @@ static void AcmReadBulk(struct UsbRequest *req) uint32_t size; int status = req->compInfo.status; size = req->compInfo.actualLength; - printf("Bulk status:%d,actualLength:%d\n", status, size); + printf("Bulk status:%d,actualLength:%u\n", status, size); switch (status) { case 0: break; @@ -91,7 +91,7 @@ static int AcmWriteBufAllocHandle(const struct AcmDevice *acm) for (wb = (struct AcmWb *)&acm->wb[0], i = 0; i < ACM_NW; i++, wb++) { wb->buf = (uint8_t *)OsalMemCalloc(acm->writeSize); if (!wb->buf) { - while (i != 0) { + while (i > 0) { --i; --wb; OsalMemFree(wb->buf); @@ -1415,7 +1415,8 @@ static int32_t CheckHostSdkIfFillRequest002(void) g_acm->wb[i].len = size; ret = memcpy_s(g_acm->wb[i].buf, g_acm->writeSize, sendData, size); if (ret) { - printf("memcpy_s fial"); + HDF_LOGE("%s: memcpy_s failed", __func__); + return HDF_FAILURE; } parmas.interfaceId = g_acm->dataOutPipe->interfaceId; parmas.pipeAddress = g_acm->dataOutPipe->pipeAddress; @@ -1594,7 +1595,8 @@ static int32_t CheckHostSdkIfFillRequest006(void) g_acm->wb[i].len = size; ret = memcpy_s(g_acm->wb[i].buf, g_acm->writeSize, sendData, size); if (ret) { - printf("memcpy_s fial"); + HDF_LOGE("%s: memcpy_s failed", __func__); + return HDF_FAILURE; } parmas.interfaceId = g_acm->dataOutPipe->interfaceId; parmas.pipeAddress = g_acm->dataOutPipe->pipeAddress;