Changeset 0f6b50f in mainline for uspace/drv/bus/usb/xhci/main.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/main.c (modified) (4 diffs)

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

@@ -47 +47 @@
 #define NAME "xhci"
 
-static int hc_driver_init(hcd_t *, const hw_res_list_parsed_t *);
+static int hc_driver_init(hcd_t *, const hw_res_list_parsed_t *, ddf_dev_t *);
 static int hcd_irq_code_gen(irq_code_t *, hcd_t *, const hw_res_list_parsed_t *);
 static int hcd_claim(hcd_t *, ddf_dev_t *);
@@ -72 +72 @@
 };
 
-static int hc_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
+static int hc_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *hw_res, ddf_dev_t *device)
 {
         int err;
@@ -83 +83 @@
                 goto err;
 
-        if ((err = hc_init_memory(hc)))
+        if ((err = hc_init_memory(hc, device)))
                 goto err;
 
@@ -124 +124 @@
         assert(hc);
 
-        hc->rh.hc_device = dev;
-        return device_init(&hc->rh.device);
+        return EOK;
 }