Changeset 36bcf84f in mainline for uspace/lib/drv/include/usbhc_iface.h

Timestamp:

2010-11-28T18:03:19Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

78f01ff9

Parents:

ef75332 (diff), 710f518 (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 with vojtechhorky/

File:

• uspace/lib/drv/include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -169 +169 @@
 typedef struct {
         int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
+
         int (*interrupt_out)(device_t *, usb_target_t,
             void *, size_t,
@@ -175 +176 @@
             void *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);
+
+        int (*control_write_setup)(device_t *, usb_target_t,
+            void *, size_t,
+            usbhc_iface_transfer_out_callback_t, void *);
+        int (*control_write_data)(device_t *, usb_target_t,
+            void *, size_t,
+            usbhc_iface_transfer_out_callback_t, void *);
+        int (*control_write_status)(device_t *, usb_target_t,
+            usbhc_iface_transfer_in_callback_t, void *);
+
+        int (*control_read_setup)(device_t *, usb_target_t,
+            void *, size_t,
+            usbhc_iface_transfer_out_callback_t, void *);
+        int (*control_read_data)(device_t *, usb_target_t,
+            void *, size_t,
+            usbhc_iface_transfer_in_callback_t, void *);
+        int (*control_read_status)(device_t *, usb_target_t,
+            usbhc_iface_transfer_out_callback_t, void *);
 } usbhc_iface_t;