Changeset 93fb170c in mainline for uspace/lib/usb/include

Timestamp:

2011-01-08T18:51:31Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 from main branch

Location:

uspace/lib/usb/include/usb

Files:

• devreq.h (modified) (1 diff)
• hcdhubd.h (modified) (1 diff)
• usb.h (modified) (1 diff)
• usbdrv.h (modified) (2 diffs)

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

@@ -92 +92 @@
 int usb_drv_req_get_full_configuration_descriptor(int, usb_address_t, int,
     void *, size_t, size_t *);
+int usb_drv_req_get_descriptor(int, usb_address_t, usb_request_type_t,
+    uint8_t, uint8_t, uint16_t, void *, size_t, size_t *);
 
 

uspace/lib/usb/include/usb/hcdhubd.h

@@ -207 +207 @@
 int usb_hc_add_child_device(device_t *, const char *, const char *, bool);
 
+
+/**
+ * @}
+ */
+
 #endif

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

@@ -54 +54 @@
         USB_DIRECTION_OUT
 } usb_direction_t;
+
+/** USB request type target. */
+typedef enum {
+        USB_REQUEST_TYPE_STANDARD = 0,
+        USB_REQUEST_TYPE_CLASS = 1,
+        USB_REQUEST_TYPE_VENDOR = 2
+} usb_request_type_t;
 
 /** USB transaction outcome. */

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

@@ -41 +41 @@
 #include <usb/descriptor.h>
 
-int usb_drv_hc_connect(device_t *, unsigned int);
+int usb_drv_find_hc(device_t *, devman_handle_t *);
+int usb_drv_hc_connect(device_t *, devman_handle_t, unsigned int);
+int usb_drv_hc_connect_auto(device_t *, unsigned int);
 
 int usb_drv_reserve_default_address(int);
@@ -94 +96 @@
 int usb_drv_async_wait_for(usb_handle_t);
 
+int usb_drv_create_match_ids_from_device_descriptor(match_id_list_t *,
+    const usb_standard_device_descriptor_t *);
+int usb_drv_create_match_ids_from_configuration_descriptor(match_id_list_t *,
+    const void *, size_t);
+
 int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
 int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,