Changeset 79e1abd in mainline for uspace/drv/usbmid/usbmid.h

Timestamp:

2011-03-29T12:09:15Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

d012590

Parents:

841e6e5 (diff), 51e5608 (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:

development merge - mainline changes

File:

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

uspace/drv/usbmid/usbmid.h

@@ -41 +41 @@
 #include <usb/pipes.h>
 #include <usb/debug.h>
+#include <usb/devdrv.h>
 
 #define NAME "usbmid"
-
-/** USB MID device container. */
-typedef struct {
-        /** Device container. */
-        ddf_dev_t *dev;
-
-        /** Representation of USB wire. */
-        usb_device_connection_t wire;
-        /** Default control pipe. */
-        usb_pipe_t ctrl_pipe;
-} usbmid_device_t;
-
 
 /** Container for single interface in a MID device. */
@@ -65 +54 @@
 } usbmid_interface_t;
 
-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 *,
+bool usbmid_explore_device(usb_device_t *);
+int usbmid_spawn_interface_child(usb_device_t *,
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *);