Changeset 2568c94 in mainline for uspace/lib/usb/src/ddfiface.c

Timestamp:

2012-08-17T17:15:19Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1789023

Parents:

4f351432 (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:

merge mainline changes

File:

• uspace/lib/usb/src/ddfiface.c (modified) (4 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -68 +68 @@
 {
         assert(fun);
-        return usb_get_hc_by_handle(fun->handle, handle);
+        return usb_get_hc_by_handle(ddf_fun_get_handle(fun), handle);
 }
 
@@ -82 +82 @@
 
         if (handle != NULL) {
-                *handle = fun->handle;
+                *handle = ddf_fun_get_handle(fun);
         }
 
@@ -99 +99 @@
 {
         assert(fun);
-        return usb_get_address_by_handle(fun->handle, address);
+        return usb_get_address_by_handle(ddf_fun_get_handle(fun), address);
 }
 
@@ -116 +116 @@
     usb_address_t *address)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        const usb_hub_attached_device_t *device = fun->driver_data;
+        const usb_hub_attached_device_t *device = ddf_fun_data_get(fun);
         assert(device->fun == fun);
         if (address)