Changeset 41abf3c in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2018-01-18T19:08:51Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7138a78b

Parents:

8fe29a7c

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-18 19:06:36)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-18 19:08:51)

Message:

xhci: various debugging changes

File:

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

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

@@ -297 +297 @@
         const usb_endpoint_t ep_num = ep_dci / 2;
         const usb_endpoint_t dir = ep_dci % 2 ? USB_DIRECTION_IN : USB_DIRECTION_OUT;
+        /* Creating temporary reference */
         endpoint_t *ep_base = bus_find_endpoint(&dev->base, ep_num, dir);
         if (!ep_base) {
@@ -325 +326 @@
                 if (ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
                         isoch_handle_transfer_event(hc, ep, trb);
+                        /* Dropping temporary reference */
                         endpoint_del_ref(&ep->base);
                         return EOK;
@@ -333 +335 @@
                 if (!batch) {
                         fibril_mutex_unlock(&ep->base.guard);
+                        /* Dropping temporary reference */
                         endpoint_del_ref(&ep->base);
                         return ENOENT;
@@ -395 +398 @@
         if (xhci_endpoint_get_state(ep) == EP_STATE_HALTED) {
                 usb_log_debug("Endpoint halted, resetting endpoint.");
-                xhci_endpoint_clear_halt(ep, batch->target.stream);
-                
+                const int err = xhci_endpoint_clear_halt(ep, batch->target.stream);
+                if (err)
+                        usb_log_error("Failed to clear halted condition on "
+                            "endpoint " XHCI_EP_FMT ". Unexpected results "
+                            "coming.", XHCI_EP_ARGS(*ep));
         }
 
@@ -406 +412 @@
 
         usb_transfer_batch_finish(batch);
+        /* Dropping temporary reference */
         endpoint_del_ref(&ep->base);
         return EOK;