Changeset 327f147 in mainline for uspace/lib/drv/include/usb_iface.h

Timestamp:

2017-10-23T19:03:37Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

b724494

Parents:

e160bfe8

Message:

usbhost: change parameters of methods

Pass (device_t, usb_target_t) to read and write, which finally allows to drop hash tables and access device right away. Then, all callbacks to complete transfer now uses usb_transfer_batch. This requires libdrv to include libusbhost, but it is not linked against it - it is there only to share definition of usb_transfer_batch_t.

File:

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

uspace/lib/drv/include/usb_iface.h

@@ -64 +64 @@
     size_t);
 
-/** Callback for outgoing transfer. */
-typedef void (*usb_iface_transfer_out_callback_t)(int, void *);
+/** Defined in usb/host/usb_transfer_batch.h */
+typedef struct usb_transfer_batch usb_transfer_batch_t;
 
-/** Callback for incoming transfer. */
-typedef void (*usb_iface_transfer_in_callback_t)(int, size_t, void *);
+/** Callback for outgoing transfer - clone of usb_transfer_batch_callback_t */
+typedef int (*usb_iface_transfer_callback_t)(usb_transfer_batch_t *);
 
 /** USB device communication interface. */
@@ -84 +84 @@
         int (*unregister_endpoint)(ddf_fun_t *, usb_endpoint_desc_t *);
 
-        int (*read)(ddf_fun_t *, usb_endpoint_t, uint64_t, uint8_t *, size_t,
-            usb_iface_transfer_in_callback_t, void *);
-        int (*write)(ddf_fun_t *, usb_endpoint_t, uint64_t, const uint8_t *,
-            size_t, usb_iface_transfer_out_callback_t, void *);
+        int (*read)(ddf_fun_t *, usb_target_t,
+                uint64_t, char *, size_t,
+                usb_iface_transfer_callback_t, void *);
+        int (*write)(ddf_fun_t *, usb_target_t,
+                uint64_t, const char *, size_t,
+                usb_iface_transfer_callback_t, void *);
 } usb_iface_t;