Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbmid/usbmid.h

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

uspace/drv/bus/usb/usbmid/usbmid.h

@@ -50 +50 @@
         /** Function container. */
         ddf_fun_t *fun;
-        /** Interface descriptor. */
-        const usb_standard_interface_descriptor_t *interface;
         /** Interface number. */
         int interface_no;
@@ -60 +58 @@
 /** Container to hold all the function pointers */
 typedef struct usb_mid {
-        ddf_dev_t *dev;
         ddf_fun_t *ctl_fun;
         list_t interface_list;
 } usb_mid_t;
 
-bool usbmid_explore_device(usb_device_t *);
-int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t *,
+int usbmid_explore_device(usb_device_t *);
+int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *);