Changeset cdc1aa1 in mainline for uspace/lib/usb/src/drvpsync.c

Timestamp:

2010-12-10T09:50:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7964475, bf2063e9

Parents:

040068c (diff), 99ea659c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge retrieval of configuration descriptor

The merge also includes extension of `usbinfo' app.

File:

• uspace/lib/usb/src/drvpsync.c (modified) (2 diffs)

uspace/lib/usb/src/drvpsync.c

@@ -100 +100 @@
 
 
+/** Perform complete control write transaction over USB.
+ *
+ * The DATA stage is performed only when @p data is not NULL and
+ * @p data_size is greater than zero.
+ *
+ * @param phone Open phone to host controller.
+ * @param target Target device and endpoint.
+ * @param setup_packet Setup packet data.
+ * @param setup_packet_size Size of the setup packet.
+ * @param data Data to be sent.
+ * @param data_size Size of the @p data buffer.
+ * @return Error code.
+ */
+int usb_drv_psync_control_write(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *data, size_t data_size)
+{
+        int rc;
+        
+        rc = usb_drv_psync_control_write_setup(phone, target,
+            setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if ((data != NULL) && (data_size > 0)) {
+                rc = usb_drv_psync_control_write_data(phone, target,
+                    data, data_size);
+                if (rc != EOK) {
+                        return rc;
+                }
+        }
+
+        rc = usb_drv_psync_control_write_status(phone, target);
+
+        return rc;
+}
+
 
 int usb_drv_psync_control_read_setup(int phone, usb_target_t target,
@@ -137 +175 @@
 }
 
+
+/** Perform complete control read transaction over USB.
+ *
+ * @param phone Open phone to host controller.
+ * @param target Target device and endpoint.
+ * @param setup_packet Setup packet data.
+ * @param setup_packet_size Size of the setup packet.
+ * @param data Storage for read data.
+ * @param data_size Size of the @p data buffer.
+ * @param actual_data_size Storage for number of actually transferred data from
+ *        device.
+ * @return Error code.
+ */
+int usb_drv_psync_control_read(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *data, size_t data_size, size_t *actual_data_size)
+{
+        int rc;
+        
+        rc = usb_drv_psync_control_read_setup(phone, target,
+            setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_drv_psync_control_read_data(phone, target,
+            data, data_size, actual_data_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_drv_psync_control_read_status(phone, target);
+
+        return rc;
+}
+
+
+
+
 /**
  * @}