openharmony/third_party_cups
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_cups synced 2024-11-26 19:40:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!46 usb interface 方法整改

Browse Source 
Merge pull request !46 from 包泽伟/master
This commit is contained in:
openharmony_ci 2024-11-05 09:08:48 +00:00 committed by Gitee
commit cc080ba814
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ohos-usb-manager.patch
View File

@ -1,9 +1,9 @@
diff --git a/backend/usb_manager.cxx b/backend/usb_manager.cxx
new file mode 100644
index 0000000..2604e10
index 0000000..f903774
--- /dev/null
+++ b/backend/usb_manager.cxx
@@ -0,0 +1,663 @@
@@ -0,0 +1,669 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
@ -448,11 +448,17 @@ index 0000000..2604e10
+ if (usbIfaces[usbIfacesIndex].GetId() == ifaceIndex) {
+ ohusb_interface_descriptor *altsetting;
+ altsetting = (ohusb_interface_descriptor *)
+ realloc(usbInterface->altsetting, sizeof(*altsetting) * (size_t)(usbInterface->num_altsetting +1));
+ calloc((size_t)(usbInterface->num_altsetting + 1), sizeof(*altsetting));
+ if (altsetting == nullptr) {
+ fprintf(stderr, "DEBUG: ParseInterface altsetting is nullptr\n");
+ return OHUSB_ERROR_NO_MEM;
+ }
+ if (usbInterface->num_altsetting != 0 &&
+ memcpy_s(altsetting, sizeof(*altsetting) * (size_t)(usbInterface->num_altsetting),
+ usbInterface->altsetting, sizeof(*altsetting) * (size_t)(usbInterface->num_altsetting)) != 0) {
+ fprintf(stderr, "DEBUG: ParseInterface memcpy_s fail.\n");
+ return OHUSB_ERROR_NO_MEM;
+ }
+ usbInterface->altsetting = altsetting;
+ if (ParseInterfaceDescriptor(usbIfaces[usbIfacesIndex], altsetting + (usbInterface->num_altsetting))
+ != OHUSB_SUCCESS) {