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

Timestamp:

2017-10-12T14:07:27Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a5976973

Parents:

7e74911

Message:

WIP usbhost refactoring

This commit replaces callbacks with more systematic virtual-like inheritance-like solution. Currently breaks build of HelenOS, but both xhci and usbhost are buildable. More refactoring follows…

File:

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

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

@@ -36 +36 @@
 #include <usb/host/utils/malloc32.h>
 #include <usb/debug.h>
+#include "endpoint.h"
 #include "hc.h"
 #include "hw_struct/trb.h"
@@ -141 +142 @@
                 return EINVAL;
         }
-        if (batch->ep->endpoint != 0 || batch->ep->transfer_type != USB_TRANSFER_CONTROL) {
+        if (batch->ep->target.endpoint != 0 || batch->ep->transfer_type != USB_TRANSFER_CONTROL) {
                 /* This method only works for control transfers. */
                 usb_log_error("Attempted to schedule control transfer to non 0 endpoint.");
@@ -147 +148 @@
         }
 
-        uint8_t slot_id = batch->ep->hc_data.slot_id;
+        xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
+
+        uint8_t slot_id = xhci_ep->slot_id;
         xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[0];
 
@@ -230 +233 @@
         }
 
-        uint8_t slot_id = batch->ep->hc_data.slot_id;
-        xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->endpoint];
+        xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
+        uint8_t slot_id = xhci_ep->slot_id;
+        xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
 
         xhci_transfer_t *transfer = xhci_transfer_alloc(batch);