Changeset 56257ba in mainline for uspace/drv/bus/usb/ehci/ehci_bus.c

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/drv/bus/usb/ehci/ehci_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -48 +48 @@
  * @param[in] toggle new value of toggle bit
  */
-static void ehci_ep_toggle_set(endpoint_t *ep, bool toggle)
+static void ehci_ep_toggle_reset(endpoint_t *ep)
 {
         ehci_endpoint_t *instance = ehci_endpoint_get(ep);
-        assert(instance);
-        assert(instance->qh);
-        ep->toggle = toggle;
         if (qh_toggle_from_td(instance->qh))
-                usb_log_warning("EP(%p): Setting toggle bit for transfer "
-                    "directed EP", instance);
-        qh_toggle_set(instance->qh, toggle);
+                usb_log_warning("EP(%p): Resetting toggle bit for transfer directed EP", instance);
+        qh_toggle_set(instance->qh, 0);
+        ep->toggle = 0;
 }
 
-/** Callback to get value of toggle bit.
- *
- * @param[in] hcd_ep hcd endpoint structure
- * @return Current value of toggle bit.
- */
-static bool ehci_ep_toggle_get(endpoint_t *ep)
-{
-        ehci_endpoint_t *instance = ehci_endpoint_get(ep);
-        assert(instance);
-        assert(instance->qh);
-
-        if (qh_toggle_from_td(instance->qh))
-                usb_log_warning("EP(%p): Reading useless toggle bit", instance);
-        return qh_toggle_get(instance->qh);
-}
 
 /** Creates new hcd endpoint representation.
@@ -166 +148 @@
         .endpoint_register = ehci_register_ep,
         .endpoint_unregister = ehci_unregister_ep,
-        .endpoint_set_toggle = ehci_ep_toggle_set,
-        .endpoint_get_toggle = ehci_ep_toggle_get,
+        .endpoint_toggle_reset = ehci_ep_toggle_reset,
         .endpoint_count_bw = bandwidth_count_usb11,
         .batch_create = ehci_create_batch,