Changeset 56257ba in mainline for uspace/lib/usbhost/include/usb/host/bus.h

Timestamp:

2018-01-07T01:01:42Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

63431db

Parents:

9efad54

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-07 01:01:41)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-07 01:01:42)

Message:

usbhost: manage endpoints by library + get/set_toggle → reset_toggle

That simplifies things A LOT. Now you can find endpoints for device in
an array inside device. This array is managed automatically in
register/unregister endpoint. HC drivers still needs to write to it when
setting up/tearing down the device.

Sorry for these two changes being in one commit, but splitting them
would be simply more work for no benefit.

File:

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

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

@@ -76 +76 @@
         usb_speed_t speed;
         usb_address_t address;
+        endpoint_t *endpoints [USB_ENDPOINT_MAX];
 
         /* Managing bus */
@@ -101 +102 @@
         int (*reserve_default_address)(bus_t *, usb_speed_t);
         int (*release_default_address)(bus_t *);
-        int (*reset_toggle)(bus_t *, usb_target_t, toggle_reset_mode_t);
 
         /* Operations on device */
@@ -108 +108 @@
         int (*device_online)(device_t *);                       /**< Optional */
         int (*device_offline)(device_t *);                      /**< Optional */
-        endpoint_t *(*device_find_endpoint)(device_t*, usb_target_t, usb_direction_t);
         endpoint_t *(*endpoint_create)(device_t *, const usb_endpoint_descriptors_t *);
 
@@ -115 +114 @@
         int (*endpoint_unregister)(endpoint_t *);
         void (*endpoint_destroy)(endpoint_t *);                 /**< Optional */
-        bool (*endpoint_get_toggle)(endpoint_t *);              /**< Optional */
-        void (*endpoint_set_toggle)(endpoint_t *, bool);        /**< Optional */
-        ssize_t (*endpoint_count_bw) (endpoint_t *, size_t);
+        void (*endpoint_toggle_reset)(endpoint_t *);            /**< Optional */
+        ssize_t (*endpoint_count_bw) (endpoint_t *, size_t);    /**< Optional */
         usb_transfer_batch_t *(*batch_create)(endpoint_t *);    /**< Optional */
 
@@ -164 +162 @@
 
 int bus_endpoint_add(device_t *, const usb_endpoint_descriptors_t *, endpoint_t **);
-endpoint_t *bus_find_endpoint(device_t *, usb_target_t, usb_direction_t);
+endpoint_t *bus_find_endpoint(device_t *, usb_endpoint_t);
 int bus_endpoint_remove(endpoint_t *);
 
@@ -170 +168 @@
 int bus_release_default_address(bus_t *);
 
-int bus_reset_toggle(bus_t *, usb_target_t, bool);
-
 #endif
 /**