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

uspace/drv/bus/usb/xhci/bus.c

@@ -77 +77 @@
                 goto err_slot;
 
-        /* Temporary reference */
+        /* Bus reference */
         endpoint_add_ref(ep0_base);
+        dev->base.endpoints[0] = ep0_base;
 
         xhci_endpoint_t *ep0 = xhci_endpoint_get(ep0_base);
 
         if ((err = xhci_endpoint_alloc_transfer_ds(ep0)))
-                goto err_ep;
-
-        /* Register EP0 */
-        if ((err = xhci_device_add_endpoint(dev, ep0)))
-                goto err_prepared;
+                goto err_added;
 
         /* Address device */
         if ((err = hc_address_device(bus->hc, dev, ep0)))
-                goto err_added;
-
-        /* Temporary reference */
-        endpoint_del_ref(ep0_base);
-        return EOK;
-
-err_added:
-        xhci_device_remove_endpoint(ep0);
+                goto err_prepared;
+
+        return EOK;
+
 err_prepared:
         xhci_endpoint_free_transfer_ds(ep0);
-err_ep:
-        /* Temporary reference */
+err_added:
+        /* Bus reference */
         endpoint_del_ref(ep0_base);
+        dev->base.endpoints[0] = NULL;
 err_slot:
         hc_disable_slot(bus->hc, dev);
@@ -123 +117 @@
                 return err;
 
-        xhci_endpoint_t *ep0 = dev->endpoints[0];
+        xhci_endpoint_t *ep0 = xhci_device_get_endpoint(dev, 0);
         assert(ep0);
 
@@ -218 +212 @@
         /* Abort running transfers. */
         usb_log_debug2("Aborting all active transfers to device " XHCI_DEV_FMT ".", XHCI_DEV_ARGS(*xhci_dev));
-        for (size_t i = 0; i < ARRAY_SIZE(xhci_dev->endpoints); ++i) {
-                xhci_endpoint_t *ep = xhci_dev->endpoints[i];
+        for (usb_endpoint_t i = 0; i < USB_ENDPOINT_MAX; ++i) {
+                xhci_endpoint_t *ep = xhci_device_get_endpoint(xhci_dev, i);
                 if (!ep)
                         continue;
@@ -244 +238 @@
 
         /* Unregister remaining endpoints, freeing memory. */
-        for (unsigned i = 0; i < ARRAY_SIZE(xhci_dev->endpoints); ++i) {
-                if (!xhci_dev->endpoints[i])
+        for (usb_endpoint_t i = 0; i < USB_ENDPOINT_MAX; ++i) {
+                if (!dev->endpoints[i])
                         continue;
 
-                if ((err = endpoint_unregister(&xhci_dev->endpoints[i]->base))) {
+                if ((err = endpoint_unregister(dev->endpoints[i]))) {
                         usb_log_warning("Failed to unregister endpoint " XHCI_EP_FMT ": %s",
-                            XHCI_EP_ARGS(*xhci_dev->endpoints[i]), str_error(err));
+                            XHCI_EP_ARGS(*xhci_device_get_endpoint(xhci_dev, i)), str_error(err));
                 }
         }
@@ -332 +326 @@
 
         /* We will need the endpoint array later for DS deallocation. */
-        xhci_endpoint_t *endpoints[ARRAY_SIZE(dev->endpoints)];
-        memcpy(endpoints, dev->endpoints, sizeof(dev->endpoints));
-
-        /* Remove all endpoints except zero. */
-        for (unsigned i = 1; i < ARRAY_SIZE(endpoints); ++i) {
-                if (!endpoints[i])
-                        continue;
-
+        endpoint_t *endpoints[USB_ENDPOINT_MAX];
+        memcpy(endpoints, dev->base.endpoints, sizeof(endpoints));
+
+        for (usb_endpoint_t i = 1; i < USB_ENDPOINT_MAX; ++i) {
                 /* FIXME: Asserting here that the endpoint is not active. If not, EBUSY? */
-
-                xhci_device_remove_endpoint(endpoints[i]);
+                dev->base.endpoints[i] = NULL;
         }
 
@@ -356 +345 @@
                         continue;
 
-                xhci_endpoint_free_transfer_ds(endpoints[i]);
-        }
-
-        /* FIXME: What happens to unregistered endpoints now? Destroy them? */
+                xhci_endpoint_free_transfer_ds(xhci_endpoint_get(endpoints[i]));
+                /* Bus reference */
+                endpoint_del_ref(endpoints[i]);
+        }
 
         return EOK;
@@ -397 +386 @@
                 return err;
 
-        if ((err = xhci_device_add_endpoint(dev, ep)))
-                goto err_prepared;
-
         usb_log_info("Endpoint " XHCI_EP_FMT " registered to XHCI bus.", XHCI_EP_ARGS(*ep));
 
@@ -406 +392 @@
 
         if ((err = hc_add_endpoint(bus->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx)))
-                goto err_added;
-
-        return EOK;
-
-err_added:
-        xhci_device_remove_endpoint(ep);
+                goto err_prepared;
+
+        return EOK;
+
 err_prepared:
         xhci_endpoint_free_transfer_ds(ep);
@@ -425 +409 @@
 
         usb_log_info("Endpoint " XHCI_EP_FMT " unregistered from XHCI bus.", XHCI_EP_ARGS(*ep));
-
-        xhci_device_remove_endpoint(ep);
 
         /* If device slot is still available, drop the endpoint. */
@@ -444 +426 @@
 }
 
-static endpoint_t* device_find_endpoint(device_t *dev_base, usb_target_t target, usb_direction_t direction)
-{
-        xhci_device_t *dev = xhci_device_get(dev_base);
-
-        xhci_endpoint_t *ep = xhci_device_get_endpoint(dev, target.endpoint);
-        if (!ep)
-                return NULL;
-
-        return &ep->base;
-}
-
-static int reset_toggle(bus_t *bus_base, usb_target_t target, toggle_reset_mode_t mode)
-{
-        // TODO: Implement me!
-        return ENOTSUP;
-}
-
-/* Endpoint ops, optional (have generic fallback) */
-static bool endpoint_get_toggle(endpoint_t *ep)
-{
-        // TODO: Implement me!
-        return ENOTSUP;
-}
-
-static void endpoint_set_toggle(endpoint_t *ep, bool toggle)
-{
-        // TODO: Implement me!
-}
-
 static int reserve_default_address(bus_t *bus_base, usb_speed_t speed)
 {
@@ -510 +463 @@
         BIND_OP(reserve_default_address)
         BIND_OP(release_default_address)
-        BIND_OP(reset_toggle)
 
         BIND_OP(device_enumerate)
@@ -516 +468 @@
         BIND_OP(device_online)
         BIND_OP(device_offline)
-        BIND_OP(device_find_endpoint)
 
         BIND_OP(endpoint_create)
@@ -522 +473 @@
         BIND_OP(endpoint_register)
         BIND_OP(endpoint_unregister)
-        BIND_OP(endpoint_get_toggle)
-        BIND_OP(endpoint_set_toggle)
 
         BIND_OP(batch_create)