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

Timestamp:

2018-01-19T20:56:14Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7ec7b7e

Parents:

69b2dfee

Message:

libusbhost: do not try to handle the toggle bit in a generic way

File:

• uspace/lib/usbhost/src/endpoint.c (modified) (3 diffs)

uspace/lib/usbhost/src/endpoint.c

@@ -121 +121 @@
 }
 
-static void endpoint_toggle_reset(endpoint_t *ep, toggle_reset_mode_t mode);
-
 /**
  * Wait until the endpoint have no transfer scheduled.
@@ -166 +164 @@
         assert(ep);
         assert(fibril_mutex_is_locked(&ep->guard));
-
-        if (ep->active_batch && ep->active_batch->error == EOK)
-                endpoint_toggle_reset(ep, ep->active_batch->toggle_reset_mode);
-
         ep->active_batch = NULL;
         fibril_condvar_signal(&ep->avail);
-}
-
-/**
- * The transfer on an endpoint can trigger a reset of the toggle bit. This
- * function calls the respective bus callbacks to resolve it.
- *
- * @param ep The endpoint that triggered the reset
- * @param mode Whether to reset no, one or all endpoints on a device.
- */
-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;
-
-
-        if (mode == RESET_ALL) {
-                const device_t *dev = ep->device;
-                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);
-        }
 }
 
@@ -282 +246 @@
         batch->on_complete_data = arg;
 
-        /* Check for commands that reset toggle bit */
-        if (ep->transfer_type == USB_TRANSFER_CONTROL)
-                batch->toggle_reset_mode
-                        = hc_get_request_toggle_reset_mode(&batch->setup.packet);
-
         const int ret = ops->batch_schedule(batch);
         if (ret != EOK) {