Changeset 1ed3eb4 in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2018-01-13T19:13:04Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2489353

Parents:

001778c

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-13 19:12:34)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-13 19:13:04)

Message:

usbhost: endpoint is identified also by its direction

File:

• uspace/drv/bus/usb/xhci/transfers.c (modified) (4 diffs)

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

@@ -258 +258 @@
 
         const usb_endpoint_t ep_num = ep_dci / 2;
-        xhci_endpoint_t *ep = xhci_device_get_endpoint(dev, ep_num);
-        if (!ep) {
-                usb_log_error("Transfer event on dropped endpoint %u of device "
-                    XHCI_DEV_FMT, ep_num, XHCI_DEV_ARGS(*dev));
+        const usb_endpoint_t dir = ep_dci % 2 ? USB_DIRECTION_IN : USB_DIRECTION_OUT;
+        endpoint_t *ep_base = bus_find_endpoint(&dev->base, ep_num, dir);
+        if (!ep_base) {
+                usb_log_error("Transfer event on dropped endpoint %u %s of device "
+                    XHCI_DEV_FMT, ep_num, usb_str_direction(dir), XHCI_DEV_ARGS(*dev));
                 return ENOENT;
         }
-        // No need to add reference for endpoint, it is held by the transfer batch.
+        xhci_endpoint_t *ep = xhci_endpoint_get(ep_base);
 
         /* FIXME: This is racy. Do we care? */
@@ -270 +271 @@
 
         if (ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                return isoch_handle_transfer_event(hc, ep, trb);
+                isoch_handle_transfer_event(hc, ep, trb);
+                endpoint_del_ref(&ep->base);
+                return EOK;
         }
 
@@ -277 +280 @@
         if (!batch) {
                 fibril_mutex_unlock(&ep->base.guard);
+                endpoint_del_ref(&ep->base);
                 return ENOENT;
         }
@@ -305 +309 @@
 
         usb_transfer_batch_finish(batch);
+        endpoint_del_ref(&ep->base);
         return EOK;
 }