Changeset 327f147 in mainline for uspace/lib/usbhost/include

Timestamp:

2017-10-23T19:03:37Z (8 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.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (3 diffs)
• hcd.h (modified) (1 diff)
• usb2_bus.h (modified) (1 diff)
• usb_transfer_batch.h (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/bus.h

@@ -85 +85 @@
         int (*register_endpoint)(bus_t *, endpoint_t *);
         int (*unregister_endpoint)(bus_t *, endpoint_t *);
-        endpoint_t *(*find_endpoint)(bus_t *, usb_target_t, usb_direction_t);
+        endpoint_t *(*find_endpoint)(bus_t *, device_t*, usb_target_t, usb_direction_t);
         void (*destroy_endpoint)(endpoint_t *);                 /**< Optional */
         bool (*endpoint_get_toggle)(endpoint_t *);              /**< Optional */
@@ -120 +120 @@
     usb_direction_t dir, usb_transfer_type_t type, size_t max_packet_size,
     unsigned packets, size_t size);
-extern int bus_remove_ep(bus_t *bus, usb_target_t target, usb_direction_t dir);
+extern int bus_remove_ep(bus_t *, device_t *, usb_target_t, usb_direction_t);
 
 int device_set_default_name(device_t *);
@@ -130 +130 @@
 int bus_register_endpoint(bus_t *, endpoint_t *);
 int bus_unregister_endpoint(bus_t *, endpoint_t *);
-endpoint_t *bus_find_endpoint(bus_t *, usb_target_t, usb_direction_t);
+endpoint_t *bus_find_endpoint(bus_t *, device_t *, usb_target_t, usb_direction_t);
 
 size_t bus_count_bw(endpoint_t *, size_t);

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -108 +108 @@
 extern int hcd_remove_ep(hcd_t *, usb_target_t, usb_direction_t);
 
-extern int hcd_send_batch(hcd_t *, usb_target_t, usb_direction_t, void *,
-    size_t, uint64_t, usbhc_iface_transfer_in_callback_t,
-    usbhc_iface_transfer_out_callback_t, void *, const char *);
+extern int hcd_send_batch(hcd_t *, device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    usb_transfer_batch_callback_t, void *, const char *);
 
-extern ssize_t hcd_send_batch_sync(hcd_t *, usb_target_t, usb_direction_t,
-    void *, size_t, uint64_t, const char *);
+extern ssize_t hcd_send_batch_sync(hcd_t *, device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    const char *);
 
 #endif

uspace/lib/usbhost/include/usb/host/usb2_bus.h

@@ -56 +56 @@
                 usb_speed_t speed;      /**< Device speed */
                 bool occupied;          /**< The address is in use. */
+                // TODO: This can be stored in usb2_bus-specific device_t
                 list_t endpoint_list;   /**< Store endpoint_t instances */
         } devices[USB_ADDRESS_COUNT];

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -108 +108 @@
 void usb_transfer_batch_destroy(usb_transfer_batch_t *);
 
-/** Provided to ease the transition. Wraps old-style handlers into a new one.
- */
-extern void usb_transfer_batch_set_old_handlers(usb_transfer_batch_t *,
-        usbhc_iface_transfer_in_callback_t,
-        usbhc_iface_transfer_out_callback_t, void *);
-
 #endif