Changeset 20eaa82 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-10-15T13:44:39Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2770b66

Parents:

867b375

Message:

usbhost refactoring: introduced bus→enumerate_device

File:

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

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

@@ -158 +158 @@
                 return err;
 
-        hc->base = base;
+        hc->reg_base = base;
         hc->cap_regs = (xhci_cap_regs_t *)  base;
         hc->op_regs  = (xhci_op_regs_t *)  (base + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_LENGTH));
@@ -180 +180 @@
 
         if ((err = hc_parse_ec(hc))) {
-                pio_disable(hc->base, RNGSZ(hc->mmio_range));
+                pio_disable(hc->reg_base, RNGSZ(hc->mmio_range));
                 return err;
         }
@@ -619 +619 @@
         xhci_fini_commands(hc);
         xhci_rh_fini(&hc->rh);
-        pio_disable(hc->base, RNGSZ(hc->mmio_range));
+        pio_disable(hc->reg_base, RNGSZ(hc->mmio_range));
         usb_log_info("HC(%p): Finalized.", hc);
 }