From 1241e1c133f6101b5749559ad3d49cb72f4b66c8 Mon Sep 17 00:00:00 2001
From: qinjihong <qinjihong111@huawei.com>
Date: Wed, 26 Jun 2024 14:12:06 +0800
Subject: [PATCH] fix controlTransferRead

Signed-off-by: qinjihong <qinjihong111@huawei.com>
---
 usb/v1_1/BUILD.gn          |  5 +++-
 usb/v1_1/IUsbInterface.idl | 18 +++++++++++++-
 usb/v1_1/UsbTypes.idl      | 50 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 usb/v1_1/UsbTypes.idl

diff --git a/usb/v1_1/BUILD.gn b/usb/v1_1/BUILD.gn
index f3193765..42bfb359 100644
--- a/usb/v1_1/BUILD.gn
+++ b/usb/v1_1/BUILD.gn
@@ -22,7 +22,10 @@ if (defined(ohos_lite)) {
     module_name = "usbd"
     imports = [ "ohos.hdi.usb.v1_0:usb" ]
 
-    sources = [ "IUsbInterface.idl" ]
+    sources = [
+      "IUsbInterface.idl",
+      "UsbTypes.idl",
+    ]
 
     language = "cpp"
     subsystem_name = "hdf"
diff --git a/usb/v1_1/IUsbInterface.idl b/usb/v1_1/IUsbInterface.idl
index c68594f3..e01daa7e 100644
--- a/usb/v1_1/IUsbInterface.idl
+++ b/usb/v1_1/IUsbInterface.idl
@@ -40,7 +40,7 @@
 
 package ohos.hdi.usb.v1_1;
 
-import ohos.hdi.usb.v1_0.UsbTypes;
+import ohos.hdi.usb.v1_1.UsbTypes;
 import ohos.hdi.usb.v1_0.IUsbdSubscriber;
 import ohos.hdi.usb.v1_0.IUsbdBulkCallback;
 import ohos.hdi.usb.v1_0.IUsbInterface;
@@ -104,4 +104,20 @@ interface IUsbInterface extends ohos.hdi.usb.v1_0.IUsbInterface{
      * @version 1.0
      */
     BulkTransferReadwithLength([in] struct UsbDev dev, [in] struct UsbPipe pipe, [in] int timeout, [in] int length, [out] unsigned char[] data);
+
+    /* *
+     * @brief Performs control transfer for endpoint 0 of the device. The data transfer direction is determined by the
+     * request type. If the result of <b>requestType</b>&
+     * <b>USB_ENDPOINT_DIR_MASK</b> is <b>USB_DIR_OUT</b>, the endpoint is in the data writing direction; if the result
+     * is <b>USB_DIR_IN</b>, the endpoint is in the data reading direction.
+     *
+     * @param dev Indicates the USB device address.
+     * @param ctrl Indicates the control data packet structure.
+     * @param data Indicates the read data.
+     *
+     * @return Returns <b>0</b> if the operation is successful; returns a non-0 value if the operation fails.
+     * @since 5.0
+     * @version 1.0
+     */
+    ControlTransferReadwithLength([in] struct UsbDev dev, [in] struct ExtendedUsbCtrlTransfer ctrl, [out] unsigned char[] data);
 }
\ No newline at end of file
diff --git a/usb/v1_1/UsbTypes.idl b/usb/v1_1/UsbTypes.idl
new file mode 100644
index 00000000..9178b110
--- /dev/null
+++ b/usb/v1_1/UsbTypes.idl
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /**
+ * @addtogroup HdiUsb
+ * @{
+ *
+ * @brief Provides unified APIs for usb services to access usb drivers.
+ *
+ * A usb service can obtain a usb driver object or agent and then call APIs provided by this object or agent to
+ * access different types of usb devices based on the usb IDs, thereby obtaining usb information,
+ * subscribing to or unsubscribing from usb data, enabling or disabling a usb,
+ * setting the usb data reporting mode, and setting usb options such as the accuracy and measurement range.
+ *
+ * @since 5.0
+ */
+
+/**
+ * @file UsbTypes.idl
+ *
+ * @brief Defines the data used by the usb module, including the usb information,
+ * and reported usb data.
+ *
+ * @since 5.0
+ * @version 1.0
+ */
+
+package ohos.hdi.usb.v1_1;
+import ohos.hdi.usb.v1_0.UsbTypes;
+
+struct ExtendedUsbCtrlTransfer {
+    int requestType;
+    int requestCmd;
+    int value;
+    int index;
+    int length;
+    int timeout;
+};
\ No newline at end of file
-- 
Gitee