Changeset 8f1dd3b in mainline

Timestamp:

2013-09-28T21:14:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8064c2f6

Parents:

8d2e251

Message:

libdrv: Avoid type conflict between usb and usbhc iface

File:

• uspace/lib/drv/include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usb_iface.h

@@ -64 +64 @@
 
 /** Callback for outgoing transfer. */
-typedef void (*usbhc_iface_transfer_out_callback_t)(int, void *);
+typedef void (*usb_iface_transfer_out_callback_t)(int, void *);
 
 /** Callback for incoming transfer. */
-typedef void (*usbhc_iface_transfer_in_callback_t)(int, size_t, void *);
+typedef void (*usb_iface_transfer_in_callback_t)(int, size_t, void *);
 
 /** USB device communication interface. */
@@ -86 +86 @@
 
         int (*read)(ddf_fun_t *, usb_endpoint_t, uint64_t, uint8_t *, size_t,
-            usbhc_iface_transfer_in_callback_t, void *);
+            usb_iface_transfer_in_callback_t, void *);
         int (*write)(ddf_fun_t *, usb_endpoint_t, uint64_t, const uint8_t *,
-            size_t, usbhc_iface_transfer_out_callback_t, void *);
+            size_t, usb_iface_transfer_out_callback_t, void *);
 } usb_iface_t;