Changes in uspace/drv/vhc/hub.c [b476347:71ed4849] in mainline

File:

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

uspace/drv/vhc/hub.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbvhc
+/** @addtogroup usb
  * @{
  */
@@ -40 +40 @@
 #include <stdlib.h>
 #include <driver.h>
-#include <usb/hub.h>
-#include <usb/recognise.h>
+#include <usb/usbdrv.h>
 
 #include "hub.h"
@@ -64 +63 @@
             = fibril_create(hub_register_in_devman_fibril, hc_dev);
         if (root_hub_registration == 0) {
-                usb_log_fatal("Failed to create hub registration fibril.\n");
+                printf(NAME ": failed to register root hub\n");
                 return;
         }
 
         fibril_add_ready(root_hub_registration);
-}
-
-static int pretend_port_rest(int unused, void *unused2)
-{
-        return EOK;
 }
 
@@ -85 +79 @@
         device_t *hc_dev = (device_t *) arg;
 
-        /*
-         * Wait until parent device is properly initialized.
-         */
-        int phone;
-        do {
-                phone = devman_device_connect(hc_dev->handle, 0);
-        } while (phone < 0);
-        async_hangup(phone);
-
-        usb_hc_connection_t hc_conn;
-        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
-
-        usb_hc_connection_open(&hc_conn);
-
-        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));
+        int hc = usb_drv_hc_connect(hc_dev, hc_dev->handle, IPC_FLAG_BLOCKING);
+        if (hc < 0) {
+                printf(NAME ": failed to register root hub\n");
+                return hc;
         }
 
-        usb_hc_connection_close(&hc_conn);
+        usb_drv_reserve_default_address(hc);
 
-        return 0;
+        usb_address_t hub_address = usb_drv_request_address(hc);
+        usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, hub_address);
+
+        usb_drv_release_default_address(hc);
+
+        devman_handle_t 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 EOK;
 }