Changeset 8e7c9fe in mainline for uspace/drv/bus/usb/usbhid/multimedia/multimedia.h

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/bus/usb/usbhid/multimedia/multimedia.h (modified) (1 diff)

uspace/drv/bus/usb/usbhid/multimedia/multimedia.h

@@ -38 +38 @@
 
 #include <usb/dev/driver.h>
+#include "../usbhid.h"
 
-struct usb_hid_dev;
-
-
-
-int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data);
-
-void usb_multimedia_deinit(struct usb_hid_dev *hid_dev, void *data);
-
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data);
-
-
+extern int usb_multimedia_init(usb_hid_dev_t *, void **);
+extern void usb_multimedia_deinit(usb_hid_dev_t *, void *);
+extern bool usb_multimedia_polling_callback(usb_hid_dev_t *, void *);
 
 #endif // USB_HID_MULTIMEDIA_H_