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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

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

@@ -51 +51 @@
         ddf_fun_t *fun;
         /** Interface descriptor. */
-        usb_standard_interface_descriptor_t *interface;
+        const usb_standard_interface_descriptor_t *interface;
         /** Interface number. */
         int interface_no;
@@ -71 +71 @@
 int usbmid_interface_destroy(usbmid_interface_t *mid_iface);
 
+static inline usbmid_interface_t * usbmid_interface_from_link(link_t *item)
+{
+        return list_get_instance(item, usbmid_interface_t, link);
+}
+
 #endif
 /**