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

Timestamp:

2017-10-13T08:49:29Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

741bcdeb

Parents:

0a5833d7

Message:

WIP usbhost refactoring: ohci completed

Along with that we noticed hcd_t in bus_t is superfluous and it complicates initialization (and breaks isolation), so we removed it. Also, type of the toggle has changed to bool in the functions.

File:

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

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

@@ -216 +216 @@
                 goto err_cmd;
 
-        return EOK;
-
+        if ((err = xhci_bus_init(&hc->bus)))
+                goto err_rh;
+
+
+        return EOK;
+
+err_rh:
+        xhci_rh_fini(&hc->rh);
 err_cmd:
         xhci_fini_commands(hc);
@@ -610 +616 @@
 void hc_fini(xhci_hc_t *hc)
 {
+        xhci_bus_fini(&hc->bus);
         xhci_trb_ring_fini(&hc->command_ring);
         xhci_event_ring_fini(&hc->event_ring);