Changeset 56257ba in mainline for uspace/drv/bus/usb/ohci/ohci_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/ohci/ohci_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -43 +43 @@
 #include "hc.h"
 
-/** Callback to set toggle on ED.
+/** Callback to reset toggle on ED.
  *
  * @param[in] hcd_ep hcd endpoint structure
  * @param[in] toggle new value of toggle bit
  */
-static void ohci_ep_toggle_set(endpoint_t *ep, bool toggle)
+static void ohci_ep_toggle_reset(endpoint_t *ep)
 {
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
         assert(instance);
         assert(instance->ed);
-        ep->toggle = toggle;
-        ed_toggle_set(instance->ed, toggle);
-}
-
-/** Callback to get value of toggle bit.
- *
- * @param[in] hcd_ep hcd endpoint structure
- * @return Current value of toggle bit.
- */
-static bool ohci_ep_toggle_get(endpoint_t *ep)
-{
-        ohci_endpoint_t *instance = ohci_endpoint_get(ep);
-        assert(instance);
-        assert(instance->ed);
-        return ed_toggle_get(instance->ed);
+        ep->toggle = 0;
+        ed_toggle_set(instance->ed, 0);
 }
 
@@ -166 +153 @@
         .endpoint_unregister = ohci_unregister_ep,
         .endpoint_count_bw = bandwidth_count_usb11,
-        .endpoint_set_toggle = ohci_ep_toggle_set,
-        .endpoint_get_toggle = ohci_ep_toggle_get,
+        .endpoint_toggle_reset = ohci_ep_toggle_reset,
         .batch_create = ohci_create_batch,
         .batch_destroy = ohci_destroy_batch,