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

Timestamp:

2017-10-22T16:37:44Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

4594baa

Parents:

2c091a6

Message:

Very rudimentary support for device disconnection.

File:

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

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

@@ -248 +248 @@
 }
 
+int xhci_transfer_abort(xhci_transfer_t *transfer)
+{
+        usb_transfer_batch_t *batch = &transfer->batch;
+        batch->error = EAGAIN;
+        batch->transfered_size = 0;
+        usb_transfer_batch_finish(batch);
+        return EOK;
+}
+
 int xhci_handle_transfer_event(xhci_hc_t* hc, xhci_trb_t* trb)
 {
@@ -304 +313 @@
         assert(xhci_ep);
 
+        xhci_device_t *xhci_dev = xhci_ep_to_dev(xhci_ep);
+
+        /* Offline devices don't schedule transfers other than on EP0. */
+        if (!xhci_dev->online && xhci_ep->base.target.endpoint) {
+                return EAGAIN;
+        }
+
         const usb_transfer_type_t type = batch->ep->transfer_type;
         assert(type >= 0 && type < ARRAY_SIZE(transfer_handlers));
@@ -321 +337 @@
                 return err;
 
-        const uint8_t slot_id = xhci_ep_to_dev(xhci_ep)->slot_id;
+        const uint8_t slot_id = xhci_dev->slot_id;
         const uint8_t target = xhci_endpoint_index(xhci_ep) + 1; /* EP Doorbells start at 1 */
         return hc_ring_doorbell(hc, slot_id, target);