From 1df1b7d4053e0cd8ef6e6ebde2d6a51c7f36909f Mon Sep 17 00:00:00 2001 From: dufresne_andy Date: Tue, 23 Apr 2024 15:29:23 +0800 Subject: [PATCH 1/2] Description:add english(US) language id Feature or Bugfix:Bugfix Binary Source: No Signed-off-by: dufresne_andy --- usb/hdi_service/src/usb_impl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usb/hdi_service/src/usb_impl.cpp b/usb/hdi_service/src/usb_impl.cpp index dbe9837c7a..70a22098bd 100644 --- a/usb/hdi_service/src/usb_impl.cpp +++ b/usb/hdi_service/src/usb_impl.cpp @@ -38,6 +38,7 @@ #include "usbd_wrapper.h" using namespace OHOS::HiviewDFX; constexpr double USB_RECOGNITION_FAIL_RATE_BASE = 100.00; +constexpr uint16_t LANGUAGE_ID = 0x409; namespace OHOS { namespace HDI { @@ -1039,7 +1040,8 @@ int32_t UsbImpl::GetStringDescriptor(const UsbDev &dev, uint8_t descId, std::vec uint8_t buffer[USB_MAX_DESCRIPTOR_SIZE] = {0}; UsbControlParams controlParams = {0}; MakeUsbControlParams( - &controlParams, buffer, length, (static_cast(USB_DDK_DT_STRING) << TYPE_OFFSET_8) + descId, 0); + &controlParams, buffer, length, + (static_cast(USB_DDK_DT_STRING) << TYPE_OFFSET_8) + descId, LANGUAGE_ID); int32_t ret = UsbControlTransferEx(port, &controlParams, GET_STRING_SET_TIMEOUT); if (ret != HDF_SUCCESS) { HDF_LOGE("%{public}s:UsbControlTransferEx failed ret=%{public}d", __func__, ret); -- Gitee From 0048442bf058d28b3962c4a5aa44e57eec75f06b Mon Sep 17 00:00:00 2001 From: Zhao Zhen Date: Tue, 23 Apr 2024 07:34:02 +0000 Subject: [PATCH 2/2] update usb/hdi_service/src/usb_impl.cpp. Signed-off-by: Zhao Zhen --- usb/hdi_service/src/usb_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usb/hdi_service/src/usb_impl.cpp b/usb/hdi_service/src/usb_impl.cpp index 70a22098bd..2090fe596e 100644 --- a/usb/hdi_service/src/usb_impl.cpp +++ b/usb/hdi_service/src/usb_impl.cpp @@ -38,7 +38,7 @@ #include "usbd_wrapper.h" using namespace OHOS::HiviewDFX; constexpr double USB_RECOGNITION_FAIL_RATE_BASE = 100.00; -constexpr uint16_t LANGUAGE_ID = 0x409; +constexpr uint16_t ENGLISH_US_LANGUAGE_ID = 0x409; namespace OHOS { namespace HDI { @@ -1041,7 +1041,7 @@ int32_t UsbImpl::GetStringDescriptor(const UsbDev &dev, uint8_t descId, std::vec UsbControlParams controlParams = {0}; MakeUsbControlParams( &controlParams, buffer, length, - (static_cast(USB_DDK_DT_STRING) << TYPE_OFFSET_8) + descId, LANGUAGE_ID); + (static_cast(USB_DDK_DT_STRING) << TYPE_OFFSET_8) + descId, ENGLISH_US_LANGUAGE_ID); int32_t ret = UsbControlTransferEx(port, &controlParams, GET_STRING_SET_TIMEOUT); if (ret != HDF_SUCCESS) { HDF_LOGE("%{public}s:UsbControlTransferEx failed ret=%{public}d", __func__, ret); -- Gitee