Changeset 41924f30 in mainline for uspace/drv/bus/usb/xhci/hc.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/hc.c (modified) (2 diffs)

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

@@ -447 +447 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == xhci_rh_get_address(&hc->rh)) {
+        if (batch->ep->target.address == xhci_rh_get_address(&hc->rh)) {
                 usb_log_debug("XHCI root hub request.\n");
                 return xhci_rh_schedule(&hc->rh, batch);
@@ -453 +453 @@
 
         usb_log_debug2("EP(%d:%d) started %s transfer of size %lu.",
-                batch->ep->address, batch->ep->endpoint,
+                batch->ep->target.address, batch->ep->target.endpoint,
                 usb_str_transfer_type(batch->ep->transfer_type),
                 batch->buffer_size);
 
-        if (!batch->ep->address) {
+        if (!batch->ep->target.address) {
                 usb_log_error("Attempted to schedule transfer to address 0.");
                 return EINVAL;