Changeset 7cfe5c0 in mainline for uspace/drv/bus/usb/vhc/connhost.c

Timestamp:

2012-08-20T19:16:24Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

6b99156

Parents:

b9cb911 (diff), 01e397ac (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:

Merged with mainline 0.5.0 changes.

File:

• uspace/drv/bus/usb/vhc/connhost.c (modified) (3 diffs)

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

@@ -42 +42 @@
 
 #define GET_VHC_DATA(fun) \
-        ((vhc_data_t *)fun->dev->driver_data)
+        ((vhc_data_t *)ddf_dev_data_get(ddf_fun_get_dev(fun)))
 #define VHC_DATA(vhc, fun) \
         vhc_data_t *vhc = GET_VHC_DATA(fun); assert(vhc->magic == 0xdeadbeef)
@@ -483 +483 @@
         VHC_DATA(vhc, root_hub_fun);
 
-        *handle = vhc->hc_fun->handle;
+        *handle = ddf_fun_get_handle(vhc->hc_fun);
 
         return EOK;
@@ -492 +492 @@
         VHC_DATA(vhc, root_hub_fun);
 
-        devman_handle_t handle = root_hub_fun->handle;
+        devman_handle_t handle = ddf_fun_get_handle(root_hub_fun);
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);