Changeset 78f01ff9 in mainline for uspace/lib/drv/include/usbhc_iface.h

Timestamp:

2010-11-28T22:25:01Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4570779, c39544a

Parents:

36bcf84f (diff), 1f43c8f (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) (1 diff)

uspace/lib/drv/include/usbhc_iface.h

@@ -166 +166 @@
     usb_transaction_outcome_t, size_t, void *);
 
+
+/** Out transfer processing function prototype. */
+typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t,
+    void *, size_t,
+    usbhc_iface_transfer_out_callback_t, void *);
+
+/** Setup transfer processing function prototype. */
+typedef usbhc_iface_transfer_out_t usbhc_iface_transfer_setup_t;
+
+/** In transfer processing function prototype. */
+typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t,
+    void *, size_t,
+    usbhc_iface_transfer_in_callback_t, void *);
+
 /** USB devices communication interface. */
 typedef struct {
         int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
 
-        int (*interrupt_out)(device_t *, usb_target_t,
-            void *, size_t,
-            usbhc_iface_transfer_out_callback_t, void *);
-        int (*interrupt_in)(device_t *, usb_target_t,
-            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 *);
+        usbhc_iface_transfer_out_t interrupt_out;
+        usbhc_iface_transfer_in_t interrupt_in;
+
+        usbhc_iface_transfer_setup_t control_write_setup;
+        usbhc_iface_transfer_out_t control_write_data;
         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 *);
+        usbhc_iface_transfer_setup_t control_read_setup;
+        usbhc_iface_transfer_in_t control_read_data;
         int (*control_read_status)(device_t *, usb_target_t,
             usbhc_iface_transfer_out_callback_t, void *);