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

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

@@ -469 +469 @@
 }
 
-/** Add a new XHCI endpoint to a device. The device must be online unless
- * the added endpoint is number 0.
- * @param[in] dev XHCI device, to which to add the endpoint
- * @param[in] ep XHCI endpoint to add.
- *
- * @return Error code.
- */
-int xhci_device_add_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
-{
-        assert(dev);
-        assert(ep);
-
-        /* Offline devices don't create new endpoints other than EP0. */
-        if (!dev->base.online && ep->base.endpoint > 0) {
-                return EAGAIN;
-        }
-
-        const usb_endpoint_t ep_num = ep->base.endpoint;
-
-        if (dev->endpoints[ep_num])
-                return EEXIST;
-
-        /* Device reference */
-        endpoint_add_ref(&ep->base);
-        ep->base.device = &dev->base;
-        dev->endpoints[ep_num] = ep;
-
-        return EOK;
-}
-
-/** Remove XHCI endpoint from a device.
- * @param[in] ep XHCI endpoint to remove.
- */
-void xhci_device_remove_endpoint(xhci_endpoint_t *ep)
-{
-        assert(ep);
-        xhci_device_t *dev = xhci_device_get(ep->base.device);
-
-        assert(dev->endpoints[ep->base.endpoint]);
-        dev->endpoints[ep->base.endpoint] = NULL;
-        ep->base.device = NULL;
-}
-
 /** Retrieve XHCI endpoint from a device by the endpoint number.
  * @param[in] dev XHCI device to query.
@@ -520 +477 @@
 xhci_endpoint_t *xhci_device_get_endpoint(xhci_device_t *dev, usb_endpoint_t ep)
 {
-        return dev->endpoints[ep];
+        return xhci_endpoint_get(dev->base.endpoints[ep]);
 }