Changes in uspace/drv/uhci-rhd/root_hub.c [dced52a:0f21c0c] in mainline

File:

• uspace/drv/uhci-rhd/root_hub.c (modified) (2 diffs)

uspace/drv/uhci-rhd/root_hub.c

@@ -34 +34 @@
 #include <errno.h>
 #include <stdint.h>
-#include <ddi.h>
-#include <devman.h>
+
 #include <usb/debug.h>
 
 #include "root_hub.h"
 
+
 int uhci_root_hub_init(
-  uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh)
+  uhci_root_hub_t *instance, void *addr, size_t size, device_t *rh)
 {
         assert(instance);
         assert(rh);
         int ret;
+        ret = usb_hc_find(rh->handle, &instance->hc_handle);
+        usb_log_info("rh found(%d) hc handle: %d.\n", ret, instance->hc_handle);
+        if (ret != EOK) {
+                return ret;
+        }
 
         /* allow access to root hub registers */
         assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT == size);
         port_status_t *regs;
-        ret = pio_enable(addr, size, (void**)&regs);
+        ret = pio_enable(
+          addr, sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT, (void**)&regs);
 
         if (ret < 0) {
@@ -60 +66 @@
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
+                /* connect to the parent device (HC) */
+                int parent_phone = devman_device_connect(instance->hc_handle, 0);
+                //usb_drv_hc_connect(rh, instance->hc_handle, 0);
+                if (parent_phone < 0) {
+                        usb_log_error("Failed to connect to the HC device port %d.\n", i);
+                        return parent_phone;
+                }
                 /* mind pointer arithmetics */
-                ret = uhci_port_init(
-                  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
+                int ret = uhci_port_init(
+                  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh, parent_phone);
                 if (ret != EOK) {
                         unsigned j = 0;