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

Timestamp:

2010-12-03T09:59:35Z (15 years ago)

Author:

smekideki@…>

Branches:

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

Children:

4144630

Parents:

da55d5b (diff), 78f01ff9 (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 parent

Location:

uspace/lib/usb/include/usb

Files:

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

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

@@ -37 +37 @@
 
 #include <adt/list.h>
+#include <bool.h>
 #include <driver.h>
 #include <usb/usb.h>
@@ -175 +176 @@
 int usb_hc_async_wait_for(usb_handle_t);
 
+int usb_hc_add_child_device(device_t *, const char *, const char *, bool);
 
 #endif

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

@@ -48 +48 @@
     void *, size_t, size_t *, usb_handle_t *);
 
+int usb_drv_async_control_write_setup(int, usb_target_t,
+    void *, size_t, usb_handle_t *);
+int usb_drv_async_control_write_data(int, usb_target_t,
+    void *, size_t, usb_handle_t *);
+int usb_drv_async_control_write_status(int, usb_target_t,
+    usb_handle_t *);
+
+int usb_drv_async_control_read_setup(int, usb_target_t,
+    void *, size_t, usb_handle_t *);
+int usb_drv_async_control_read_data(int, usb_target_t,
+    void *, size_t, size_t *, usb_handle_t *);
+int usb_drv_async_control_read_status(int, usb_target_t,
+    usb_handle_t *);
+
 int usb_drv_async_wait_for(usb_handle_t);