Changeset 8fe29a7c in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2018-01-18T17:12:53Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

41abf3c

Parents:

fb28cde

Message:

xhci: clear endpoint halted condition

File:

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

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

@@ -358 +358 @@
 
                 case XHCI_TRBC_BABBLE_DETECTED_ERROR:
-                        usb_log_warning("Babble detected during the transfer. Resetting endpoint.");
+                        usb_log_warning("Babble detected during the transfer.");
                         batch->error = EAGAIN;
                         batch->transfered_size = 0;
-                        hc_reset_endpoint(hc, slot_id, ep_dci);
                         break;
 
                 case XHCI_TRBC_USB_TRANSACTION_ERROR:
-                        usb_log_warning("USB Transaction error. Resetting endpoint.");
+                        usb_log_warning("USB Transaction error.");
                         batch->error = ESTALL;
                         batch->transfered_size = 0;
-                        hc_reset_endpoint(hc, slot_id, ep_dci);
                         break;
 
@@ -392 +390 @@
                         usb_log_warning("Transfer not successfull: %u", completion_code);
                         batch->error = EIO;
+        }
+
+        
+        if (xhci_endpoint_get_state(ep) == EP_STATE_HALTED) {
+                usb_log_debug("Endpoint halted, resetting endpoint.");
+                xhci_endpoint_clear_halt(ep, batch->target.stream);
+                
         }