From c610b7a4d619e08f11c1d730de9ead03d098bb40 Mon Sep 17 00:00:00 2001 From: zianed Date: Fri, 13 Aug 2021 16:18:58 +0800 Subject: [PATCH 1/2] support 64 bit Signed-off-by: zianed --- .../unittest/common/hdf_ioservice_test.cpp | 4 +-- .../model/usb/host/src/hdf_usb_entry_test.c | 4 +-- test/unittest/model/usb/host/src/usb_raw_io.c | 1 - test/unittest/model/usb/host/src/usb_test.c | 26 +++++++++---------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/core/manager/test/unittest/common/hdf_ioservice_test.cpp b/core/manager/test/unittest/common/hdf_ioservice_test.cpp index 338ef08b2..61e2a2aeb 100644 --- a/core/manager/test/unittest/common/hdf_ioservice_test.cpp +++ b/core/manager/test/unittest/common/hdf_ioservice_test.cpp @@ -73,7 +73,7 @@ int IoServiceTest::OnDevEventReceived(struct HdfDevEventlistener *listener, stru { OsalTimespec time; OsalGetTime(&time); - HDF_LOGE("%s: received event[%d] from %s at %llu.%llu", (char *)listener->priv, eventCount++, (char *)service->priv, + HDF_LOGE("%s: received event[%d] from %s at %" PRIu64 ".%" PRIu64 "", (char *)listener->priv, eventCount++, (char *)service->priv, time.sec, time.usec); const char *string = HdfSbufReadString(data); @@ -127,7 +127,7 @@ static int SendEvent(struct HdfIoService *serv, const char *eventData) HDF_LOGE("service call reply check fail, replyData=0x%x", replyData); ret = HDF_ERR_INVALID_OBJECT; } - HDF_LOGE("send event finish at %llu.%llu", time.sec, time.usec); + HDF_LOGE("send event finish at %" PRIu64 ".%" PRIu64 "", time.sec, time.usec); } while (0); HdfSBufRecycle(data); diff --git a/test/unittest/model/usb/host/src/hdf_usb_entry_test.c b/test/unittest/model/usb/host/src/hdf_usb_entry_test.c index 67fb14043..fb43d23ba 100644 --- a/test/unittest/model/usb/host/src/hdf_usb_entry_test.c +++ b/test/unittest/model/usb/host/src/hdf_usb_entry_test.c @@ -19,9 +19,9 @@ int32_t HdfUsbUnitTestEntry(HdfTestMsg *msg) return HDF_FAILURE; } dprintf("---%s::command[%u], subCommand[%u]\n", __func__, msg->cmd, msg->subCmd); - if (msg->cmd == TEST_USB_HOST_TYPE){ + if (msg->cmd == TEST_USB_HOST_TYPE) { msg->result = UsbTestEntry(msg->subCmd); - }else if (msg->cmd == TEST_USB_HOST_RAW_TYPE){ + } else if (msg->cmd == TEST_USB_HOST_RAW_TYPE) { msg->result = UsbRawTestEntry(msg->subCmd); } dprintf("%s::command[%u], subCommand[%u], result:%d\n", __func__, msg->cmd, msg->subCmd, msg->result); 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 ff638b341..8ac3a8179 100644 --- a/test/unittest/model/usb/host/src/usb_raw_io.c +++ b/test/unittest/model/usb/host/src/usb_raw_io.c @@ -168,7 +168,6 @@ void AcmReadBulkCallback(void *requestArg) if (size) { uint8_t *data = req->buffer; printf("rcv:%s\n", (char *)data); - } break; case USB_REQUEST_CANCELLED: diff --git a/test/unittest/model/usb/host/src/usb_test.c b/test/unittest/model/usb/host/src/usb_test.c index dcc3dc7d0..64d07ff38 100644 --- a/test/unittest/model/usb/host/src/usb_test.c +++ b/test/unittest/model/usb/host/src/usb_test.c @@ -232,7 +232,7 @@ static int32_t CheckHostSdkIfInit004(void) if (ret) { HDF_LOGE("%s: error", __func__); return HDF_FAILURE; - } + } ret = UsbExitHostSdk(NULL); if (ret) { HDF_LOGE("%s: error", __func__); @@ -1090,7 +1090,7 @@ static int32_t CheckHostSdkIfFillIsoRequest001(void) int i; char sendData[] = {"abcde\0"}; uint32_t size = strlen(sendData) + 1; - if (g_acm->isoPipe == NULL){ + if (g_acm->isoPipe == NULL) { return HDF_FAILURE; } for (i = 0; i < 1; i++) { @@ -1116,12 +1116,12 @@ static int32_t CheckHostSdkIfFillIsoRequest001(void) static int32_t CheckHostSdkIfFillIsoRequest002(void) { - int ret; + int ret; struct UsbRequestParams parmas; int i; char sendData[] = {"abcde\0"}; uint32_t size = strlen(sendData) + 1; - if (g_acm->isoPipe == NULL){ + if (g_acm->isoPipe == NULL) { return HDF_FAILURE; } for (i = 0; i < 1; i++) { @@ -1152,7 +1152,7 @@ static int32_t CheckHostSdkIfFillIsoRequest003(void) int i; char sendData[] = {"abcde\0"}; uint32_t size = strlen(sendData) + 1; - if (g_acm->isoPipe == NULL){ + if (g_acm->isoPipe == NULL) { return HDF_FAILURE; } for (i = 0; i < 1; i++) { @@ -1183,7 +1183,7 @@ static int32_t CheckHostSdkIfFillIsoRequest004(void) int i; char sendData[] = {"abcde\0"}; uint32_t size = strlen(sendData) + 1; - if (g_acm->isoPipe == NULL){ + if (g_acm->isoPipe == NULL) { return HDF_FAILURE; } for (i = 0; i < 1; i++) { @@ -1214,7 +1214,7 @@ static int32_t CheckHostSdkIfFillIsoRequest005(void) int i; char sendData[] = {"abcde\0"}; uint32_t size = strlen(sendData) + 1; - if (g_acm->isoPipe == NULL){ + if (g_acm->isoPipe == NULL) { return HDF_FAILURE; } for (i = 0; i < 1; i++) { @@ -1240,12 +1240,12 @@ static int32_t CheckHostSdkIfFillIsoRequest005(void) static int32_t CheckHostSdkIfFillIsoRequest006(void) { - int ret; + int ret; struct UsbRequestParams parmas; int i; char sendData[] = {"abcde\0"}; uint32_t size = strlen(sendData) + 1; - if (g_acm->isoPipe == NULL){ + if (g_acm->isoPipe == NULL) { return HDF_FAILURE; } for (i = 0; i < 1; i++) { @@ -1292,7 +1292,7 @@ static int32_t CheckHostSdkIfAllocRequest009(void) if (g_acm->readReq[i] == NULL) { HDF_LOGE("%s: error", __func__); return HDF_FAILURE; - } + } } g_acm->writeSize = g_acm->dataOutPipe->maxPacketSize; @@ -1307,7 +1307,7 @@ static int32_t CheckHostSdkIfAllocRequest009(void) if (g_acm->wb[i].request == NULL) { HDF_LOGE("%s: error", __func__); return HDF_FAILURE; - } + } } g_acm->intSize = g_acm->intPipe->maxPacketSize; g_acm->notifyReq = UsbAllocRequest(g_acm->int_devHandle, 0, g_acm->intSize); @@ -1456,7 +1456,7 @@ static int32_t CheckHostSdkIfSubmitRequestSync001(void) if (ret) { HDF_LOGE("%s: error", __func__); return HDF_FAILURE; - } + } } HDF_LOGE("%s: success", __func__); return HDF_SUCCESS; @@ -1472,7 +1472,7 @@ static int32_t CheckHostSdkIfSubmitRequestSync002(void) if (ret) { HDF_LOGE("%s: error", __func__); return HDF_FAILURE; - } + } } HDF_LOGE("%s: success", __func__); return HDF_SUCCESS; -- Gitee From 204701ea8d241a5ec84a9f035bac61de9ee340b9 Mon Sep 17 00:00:00 2001 From: zianed Date: Fri, 13 Aug 2021 16:58:58 +0800 Subject: [PATCH 2/2] support 64 bit Signed-off-by: zianed --- core/manager/test/unittest/common/hdf_ioservice_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/core/manager/test/unittest/common/hdf_ioservice_test.cpp b/core/manager/test/unittest/common/hdf_ioservice_test.cpp index 61e2a2aeb..d151d8c43 100644 --- a/core/manager/test/unittest/common/hdf_ioservice_test.cpp +++ b/core/manager/test/unittest/common/hdf_ioservice_test.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include "hdf_uhdf_test.h" -- Gitee