Changeset b8b1e631 in mainline for uspace/drv/bus/usb/usbmid/usbmid.c

Timestamp:

2011-12-03T11:10:06Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

30413b31

Parents:

07fd4cd1 (diff), 1f5c9c96 (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 mainline

File:

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

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
-    int *iface_no)
+static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
 {
         assert(fun);
@@ -64 +63 @@
         .get_hc_handle = usb_iface_get_hc_handle_device_impl,
         .get_my_address = usb_iface_get_my_address_forward_impl,
-        .get_interface = usb_iface_get_interface_impl,
+        .get_my_interface = usb_iface_get_interface_impl,
 };