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

Timestamp:

2018-01-18T02:05:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5bccec3

Parents:

94f8c363

Message:

xhci: rewrite RH to use usb/port

File:

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

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

@@ -109 +109 @@
                                 return ENOTSUP;
                         }
+
+                        unsigned offset = XHCI_REG_RD(ec, XHCI_EC_SP_CP_OFF);
+                        unsigned count = XHCI_REG_RD(ec, XHCI_EC_SP_CP_COUNT);
+                        xhci_rh_set_ports_protocol(&hc->rh, offset, count, major);
 
                         // "Implied" speed
@@ -229 +233 @@
         hc->ist = (ist & 0x10 >> 1) * (ist & 0xf);
 
-        if ((err = hc_parse_ec(hc))) {
-                pio_disable(hc->reg_base, RNGSZ(hc->mmio_range));
-                return err;
-        }
-
-        return EOK;
+        if ((err = xhci_rh_init(&hc->rh, hc)))
+                goto err_pio;
+
+        if ((err = hc_parse_ec(hc)))
+                goto err_rh;
+
+        return EOK;
+
+err_rh:
+        xhci_rh_fini(&hc->rh);
+err_pio:
+        pio_disable(hc->reg_base, RNGSZ(hc->mmio_range));
+        return err;
 }
 
@@ -260 +271 @@
                 goto err_cmd;
 
-        if ((err = xhci_rh_init(&hc->rh, hc)))
-                goto err_bus;
-
-        return EOK;
-
-err_bus:
-        xhci_bus_fini(&hc->bus);
+        return EOK;
+
 err_cmd:
         xhci_fini_commands(hc);