Changes in uspace/drv/vhc/hub.c [b476347:4e8e1f5] in mainline

File:

• uspace/drv/vhc/hub.c (modified) (3 diffs)

uspace/drv/vhc/hub.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <driver.h>
-#include <usb/hub.h>
+#include <usb/usbdrv.h>
 #include <usb/recognise.h>
 
@@ -71 +71 @@
 }
 
-static int pretend_port_rest(int unused, void *unused2)
-{
-        return EOK;
-}
-
 /** Register root hub in devman.
  *
@@ -85 +80 @@
         device_t *hc_dev = (device_t *) arg;
 
-        /*
-         * Wait until parent device is properly initialized.
-         */
-        int phone;
+        int hc;
         do {
-                phone = devman_device_connect(hc_dev->handle, 0);
-        } while (phone < 0);
-        async_hangup(phone);
+                hc = usb_drv_hc_connect(hc_dev, hc_dev->handle,
+                    IPC_FLAG_BLOCKING);
+        } while (hc < 0);
 
-        usb_hc_connection_t hc_conn;
-        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
+        usb_drv_reserve_default_address(hc);
 
-        usb_hc_connection_open(&hc_conn);
+        usb_address_t hub_address = usb_drv_request_address(hc);
+        usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, hub_address);
 
-        int rc = usb_hc_new_device_wrapper(hc_dev, &hc_conn, USB_SPEED_FULL,
-            pretend_port_rest, 0, NULL,
-            NULL, NULL);
-        if (rc != EOK) {
-                usb_log_fatal("Failed to create root hub: %s.\n",
-                    str_error(rc));
-        }
+        usb_drv_release_default_address(hc);
 
-        usb_hc_connection_close(&hc_conn);
+        devman_handle_t hub_handle;
+        usb_device_register_child_in_devman(hub_address, hc_dev->handle,
+            hc_dev, &hub_handle);
+        //usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
+        usb_drv_bind_address(hc, hub_address, hub_handle);
 
-        return 0;
+        return EOK;
 }