Changeset 3b5d1535 in mainline for uspace/lib/drv/include/usb_iface.h

Timestamp:

2011-02-23T10:28:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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/drv/include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usb_iface.h

@@ -38 +38 @@
 #define LIBDRV_USB_IFACE_H_
 
-#include "driver.h"
+#include "ddf/driver.h"
 #include <usb/usb.h>
 typedef enum {
@@ -75 +75 @@
 /** USB device communication interface. */
 typedef struct {
-        int (*get_address)(device_t *, devman_handle_t, usb_address_t *);
-        int (*get_interface)(device_t *, devman_handle_t, int *);
-        int (*get_hc_handle)(device_t *, devman_handle_t *);
+        int (*get_address)(ddf_fun_t *, devman_handle_t, usb_address_t *);
+        int (*get_interface)(ddf_fun_t *, devman_handle_t, int *);
+        int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
 } usb_iface_t;