Changeset 5fd9c30 in mainline for uspace/lib/usbhost/include/usb/host/bus.h

Timestamp:

2017-10-21T20:52:56Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

File:

• uspace/lib/usbhost/include/usb/host/bus.h (modified) (5 diffs)

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

@@ -33 +33 @@
  *
  * The purpose of this structure is to keep information about connected devices
- * and enpoints, manage available bandwidth and the toggle bit flipping.
+ * and endpoints, manage available bandwidth and the toggle bit flipping.
  *
  * The generic implementation is provided for USB 1 and 2 in usb2_bus.c. Some
@@ -53 +53 @@
 typedef struct bus bus_t;
 typedef struct ddf_fun ddf_fun_t;
+typedef struct usb_transfer_batch usb_transfer_batch_t;
 
 typedef struct device {
@@ -85 +86 @@
         int (*release_endpoint)(bus_t *, endpoint_t *);
         endpoint_t *(*find_endpoint)(bus_t *, usb_target_t, usb_direction_t);
+        void (*destroy_endpoint)(endpoint_t *);                 /**< Optional */
+        bool (*endpoint_get_toggle)(endpoint_t *);              /**< Optional */
+        void (*endpoint_set_toggle)(endpoint_t *, bool);        /**< Optional */
 
         int (*request_address)(bus_t *, usb_address_t*, bool, usb_speed_t);
@@ -93 +97 @@
         size_t (*count_bw) (endpoint_t *, size_t);
 
-        /* Endpoint ops, optional (have generic fallback) */
-        void (*destroy_endpoint)(endpoint_t *);
-        bool (*endpoint_get_toggle)(endpoint_t *);
-        void (*endpoint_set_toggle)(endpoint_t *, bool);
+        usb_transfer_batch_t *(*create_batch)(bus_t *, endpoint_t *); /**< Optional */
+        void (*destroy_batch)(usb_transfer_batch_t *);  /**< Optional */
 } bus_ops_t;
 
@@ -135 +137 @@
 int bus_release_address(bus_t *, usb_address_t);
 
+
 static inline int bus_reserve_default_address(bus_t *bus, usb_speed_t speed) {
         usb_address_t addr = USB_ADDRESS_DEFAULT;