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

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 mainline.

File:

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

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

@@ -62 +62 @@
 } usb_mid_t;
 
-int usbmid_explore_device(usb_device_t *);
-int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
+extern int usbmid_explore_device(usb_device_t *);
+extern int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *);
-void usbmid_dump_descriptors(uint8_t *, size_t);
-int usbmid_interface_destroy(usbmid_interface_t *mid_iface);
+extern void usbmid_dump_descriptors(uint8_t *, size_t);
+extern int usbmid_interface_destroy(usbmid_interface_t *mid_iface);
 
 static inline usbmid_interface_t * usbmid_interface_from_link(link_t *item)
@@ -75 +75 @@
 
 #endif
+
 /**
  * @}