Changeset 0f6b50f in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-19T20:00:08Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

1fd2f81

Parents:

60af4cdb

Message:

Added DDF device to HCD initialization to prepare RH data structures before it is started.

File:

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

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

@@ -61 +61 @@
         XHCI_REG_MASK(XHCI_PORT_CEC);
 
-int xhci_rh_init(xhci_rh_t *rh, xhci_hc_t *hc)
+int xhci_rh_init(xhci_rh_t *rh, xhci_hc_t *hc, ddf_dev_t *device)
 {
         assert(rh);
@@ -68 +68 @@
         rh->hc = hc;
         rh->max_ports = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_PORTS);
-
-        return EOK;
+        hc->rh.hc_device = device;
+
+        return device_init(&hc->rh.device);
 }
 
@@ -211 +212 @@
         int err;
         assert(rh);
+        assert(rh->hc_device);
 
         xhci_bus_t *bus = &rh->hc->bus;