Changeset 15d0046 in mainline for uspace/drv/bus/usb/vhc/hub.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/bus/usb/vhc/hub.c (modified) (2 diffs)

uspace/drv/bus/usb/vhc/hub.c

@@ -94 +94 @@
 {
         ddf_fun_t *hc_dev = (ddf_fun_t *) arg;
-
-        /*
-         * Wait until parent device is properly initialized.
-         */
-        async_sess_t *sess;
-        do {
-                sess = devman_device_connect(EXCHANGE_SERIALIZE,
-                    ddf_fun_get_handle(hc_dev), 0);
-        } while (!sess);
-        async_hangup(sess);
-
         int rc;
 
@@ -114 +103 @@
 
         ddf_fun_t *hub_dev;
-        rc = usb_hc_new_device_wrapper(ddf_fun_get_dev(hc_dev), &hc_conn, USB_SPEED_FULL,
-            pretend_port_rest, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
+
+        hub_dev = ddf_fun_create(ddf_fun_get_dev(hc_dev), fun_inner, NULL);
+        if (hub_dev == NULL) {
+                rc = ENOMEM;
+                usb_log_fatal("Failed to create root hub: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        rc = usb_hc_new_device_wrapper(ddf_fun_get_dev(hc_dev), hub_dev,
+            &hc_conn, USB_SPEED_FULL, pretend_port_rest, NULL, NULL, &rh_ops);
         if (rc != EOK) {
                 usb_log_fatal("Failed to create root hub: %s.\n",
                     str_error(rc));
+                ddf_fun_destroy(hub_dev);
         }