Changeset cdc1aa1 in mainline for uspace/lib/usb/include

Timestamp:

2010-12-10T09:50:58Z (15 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.

Location:

uspace/lib/usb/include/usb

Files:

• devreq.h (modified) (2 diffs)
• usbdrv.h (modified) (2 diffs)

uspace/lib/usb/include/usb/devreq.h

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <async.h>
+#include <usb/usb.h>
+#include <usb/descriptor.h>
 
 /** Standard device request. */
@@ -83 +85 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
+int usb_drv_req_set_address(int, usb_address_t, usb_address_t);
+int usb_drv_req_get_device_descriptor(int, usb_address_t,
+    usb_standard_device_descriptor_t *);
+int usb_drv_req_get_bare_configuration_descriptor(int, usb_address_t, int,
+    usb_standard_configuration_descriptor_t *);
+int usb_drv_req_get_full_configuration_descriptor(int, usb_address_t, int,
+    void *, size_t, size_t *);
+
+
 #endif
 /**

uspace/lib/usb/include/usb/usbdrv.h

@@ -72 +72 @@
 int usb_drv_psync_control_write_status(int, usb_target_t);
 
+int usb_drv_psync_control_write(int, usb_target_t,
+    void *, size_t, void *, size_t);
+
 
 int usb_drv_async_control_read_setup(int, usb_target_t,
@@ -84 +87 @@
 int usb_drv_psync_control_read_status(int, usb_target_t);
 
+int usb_drv_psync_control_read(int, usb_target_t,
+    void *, size_t, void *, size_t, size_t *);
+
+
 
 int usb_drv_async_wait_for(usb_handle_t);
 
-
-int usb_drv_req_set_address(int, usb_address_t, usb_address_t);
-int usb_drv_req_get_device_descriptor(int, usb_address_t,
-    usb_standard_device_descriptor_t *);
 
 #endif