Changeset b476347 in mainline

Timestamp:

2011-02-20T22:52:19Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

83c291d

Parents:

da7c0a9

Message:

Virtual HC uses phone-less API

Forgot to update the virtual root hub.

File:

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

uspace/drv/vhc/hub.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <driver.h>
-#include <usb/usbdrv.h>
+#include <usb/hub.h>
 #include <usb/recognise.h>
 
@@ -71 +71 @@
 }
 
+static int pretend_port_rest(int unused, void *unused2)
+{
+        return EOK;
+}
+
 /** Register root hub in devman.
  *
@@ -80 +85 @@
         device_t *hc_dev = (device_t *) arg;
 
-        int hc;
+        /*
+         * Wait until parent device is properly initialized.
+         */
+        int phone;
         do {
-                hc = usb_drv_hc_connect(hc_dev, hc_dev->handle,
-                    IPC_FLAG_BLOCKING);
-        } while (hc < 0);
+                phone = devman_device_connect(hc_dev->handle, 0);
+        } while (phone < 0);
+        async_hangup(phone);
 
-        usb_drv_reserve_default_address(hc);
+        usb_hc_connection_t hc_conn;
+        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
 
-        usb_address_t hub_address = usb_drv_request_address(hc);
-        usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, hub_address);
+        usb_hc_connection_open(&hc_conn);
 
-        usb_drv_release_default_address(hc);
+        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));
+        }
 
-        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);
+        usb_hc_connection_close(&hc_conn);
 
-        return EOK;
+        return 0;
 }