Changeset 5e718d9 in mainline for uspace/drv/bus/usb/vhc/hub.c

Timestamp:

2012-08-21T10:04:16Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 with upstream (lp:~wtachi/helenos/bithenge)

File:

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

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

@@ -100 +100 @@
         async_sess_t *sess;
         do {
-                sess = devman_device_connect(EXCHANGE_SERIALIZE, hc_dev->handle, 0);
+                sess = devman_device_connect(EXCHANGE_SERIALIZE,
+                    ddf_fun_get_handle(hc_dev), 0);
         } while (!sess);
         async_hangup(sess);
@@ -107 +108 @@
 
         usb_hc_connection_t hc_conn;
-        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
+        usb_hc_connection_initialize(&hc_conn, ddf_fun_get_handle(hc_dev));
 
         rc = usb_hc_connection_open(&hc_conn);
@@ -113 +114 @@
 
         ddf_fun_t *hub_dev;
-        rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn, USB_SPEED_FULL,
+        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);
         if (rc != EOK) {
@@ -123 +124 @@
 
         usb_log_info("Created root hub function (handle %zu).\n",
-            (size_t) hub_dev->handle);
+            (size_t) ddf_fun_get_handle(hub_dev));
 
         return 0;