Changeset 741bcdeb in mainline for uspace/drv/bus/usb/ehci/hc.c

Timestamp:

2017-10-13T09:21:22Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c0e4b5b2

Parents:

e6b9182

Message:

WIP usbhost refactoring: ehci completed

vhc to go…

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (4 diffs)

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

@@ -190 +190 @@
             &instance->rh, instance->caps, instance->registers, "ehci rh");
 
+        ehci_bus_init(&instance->bus, instance);
         return EOK;
 }
@@ -214 +215 @@
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
         usb_log_debug("HC(%p) enqueue EP(%d:%d:%s:%s)\n", instance,
-            ep->address, ep->endpoint,
+            ep->target.address, ep->target.endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -238 +239 @@
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
         usb_log_debug("HC(%p) dequeue EP(%d:%d:%s:%s)\n", instance,
-            ep->address, ep->endpoint,
+            ep->target.address, ep->target.endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -290 +291 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == ehci_rh_get_address(&instance->rh)) {
+        if (batch->ep->target.address == ehci_rh_get_address(&instance->rh)) {
                 usb_log_debug("HC(%p): Scheduling BATCH(%p) for RH(%p)",
                     instance, batch, &instance->rh);