Changeset 25251bb in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2017-10-26T08:38:53Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

928afc8d

Parents:

62558202

Message:

xhci: move pointer to hc from device to bus

Also, fixes the bug of hc ptr not set on tier 2+ device.

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (3 diffs)

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

@@ -269 +269 @@
 }
 
-int xhci_device_add_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
+int xhci_device_add_endpoint(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *ep)
 {
         assert(dev);
@@ -299 +299 @@
         xhci_setup_endpoint_context(ep, &ep_ctx);
 
-        return hc_add_endpoint(dev->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx);
-}
-
-int xhci_device_remove_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
+        return hc_add_endpoint(hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx);
+}
+
+int xhci_device_remove_endpoint(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *ep)
 {
         assert(&dev->base == ep->base.device);
@@ -320 +320 @@
 
         /* Drop the endpoint. */
-        if ((err = hc_drop_endpoint(dev->hc, dev->slot_id, xhci_endpoint_index(ep)))) {
+        if ((err = hc_drop_endpoint(hc, dev->slot_id, xhci_endpoint_index(ep)))) {
                 goto err;
         }