Changeset 56257ba in mainline for uspace/lib/usbhost/src/endpoint.c

Timestamp:

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

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

63431db2

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/src/endpoint.c (modified) (3 diffs)

uspace/lib/usbhost/src/endpoint.c

@@ -108 +108 @@
 }
 
+static void endpoint_toggle_reset(endpoint_t *ep, toggle_reset_mode_t mode);
+
 /** Mark the endpoint as active and block access for further fibrils.
  * @param ep endpoint_t structure.
@@ -132 +134 @@
 
         if (ep->active_batch && ep->active_batch->error == EOK)
-                usb_transfer_batch_reset_toggle(ep->active_batch);
+                endpoint_toggle_reset(ep, ep->active_batch->toggle_reset_mode);
 
         ep->active_batch = NULL;
@@ -155 +157 @@
 }
 
-/** Get the value of toggle bit. Either uses the toggle_get op, or just returns
- * the value of the toggle.
- * @param ep endpoint_t structure.
- */
-int endpoint_toggle_get(endpoint_t *ep)
-{
-        assert(ep);
-
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(get_bus_ops(ep), endpoint_get_toggle);
-        return ops
-            ? ops->endpoint_get_toggle(ep)
-            : ep->toggle;
-}
-
-/** Set the value of toggle bit. Either uses the toggle_set op, or just sets
- * the toggle inside.
- * @param ep endpoint_t structure.
- */
-void endpoint_toggle_set(endpoint_t *ep, bool toggle)
-{
-        assert(ep);
-
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(get_bus_ops(ep), endpoint_set_toggle);
-        if (ops) {
-                ops->endpoint_set_toggle(ep, toggle);
-        }
-        else {
-                ep->toggle = toggle;
+static void endpoint_toggle_reset(endpoint_t *ep, toggle_reset_mode_t mode)
+{
+        assert(ep);
+
+        if (mode == RESET_NONE)
+                return;
+
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(get_bus_ops(ep), endpoint_toggle_reset);
+        if (!ops)
+                return;
+
+        device_t *dev = ep->device;
+
+        if (mode == RESET_ALL) {
+                for (usb_endpoint_t i = 0; i < USB_ENDPOINT_MAX; ++i) {
+                        if (dev->endpoints[i])
+                                ops->endpoint_toggle_reset(dev->endpoints[i]);
+                }
+        } else {
+                ops->endpoint_toggle_reset(ep);
         }
 }