Changeset 233e68d in mainline for uspace/drv/usbmid/usbmid.h

Timestamp:

2011-02-23T18:28:41Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e9e58ea3

Parents:

deece2f (diff), a9c674e0 (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:

Devel changes

File:

• uspace/drv/usbmid/usbmid.h (modified) (4 diffs)

uspace/drv/usbmid/usbmid.h

@@ -37 +37 @@
 #define USBMID_H_
 
-#include <driver.h>
+#include <ddf/driver.h>
 #include <usb/usb.h>
 #include <usb/pipes.h>
@@ -46 +46 @@
 typedef struct {
         /** Device container. */
-        device_t *dev;
+        ddf_dev_t *dev;
 
         /** Representation of USB wire. */
@@ -55 +55 @@
 
 typedef struct {
-        /** Device container. */
-        device_t *dev;
+        /** Function container. */
+        ddf_fun_t *fun;
 
         /** Interface number. */
@@ -62 +62 @@
 } usbmid_interface_t;
 
-usbmid_device_t *usbmid_device_create(device_t *);
-usbmid_interface_t *usbmid_interface_create(device_t *, int);
+usbmid_device_t *usbmid_device_create(ddf_dev_t *);
+usbmid_interface_t *usbmid_interface_create(ddf_fun_t *, int);
 bool usbmid_explore_device(usbmid_device_t *);
 int usbmid_spawn_interface_child(usbmid_device_t *,