Changeset 72d120e in mainline for uspace/drv/bus/usb/usbhid/generic/hiddev.h

Timestamp:

2014-06-16T20:17:44Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

File:

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

uspace/drv/bus/usb/usbhid/generic/hiddev.h

@@ -38 +38 @@
 
 #include <usb/dev/driver.h>
-
-struct usb_hid_dev;
+#include "../usbhid.h"
 
 extern const usb_endpoint_description_t
     usb_hid_generic_poll_endpoint_description;
 
-const char *HID_GENERIC_FUN_NAME;
-const char *HID_GENERIC_CLASS_NAME;
+extern const char *HID_GENERIC_FUN_NAME;
+extern const char *HID_GENERIC_CATEGORY;
 
 /** The USB HID generic 'hid' function softstate */
 typedef struct {
-        struct usb_hid_dev *hid_dev;
+        usb_hid_dev_t *hid_dev;
 } usb_hid_gen_fun_t;
 
-int usb_generic_hid_init(struct usb_hid_dev *hid_dev, void **data);
-
-void usb_generic_hid_deinit(struct usb_hid_dev *hid_dev, void *data);
-
-bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev, void *data);
+extern int usb_generic_hid_init(usb_hid_dev_t *, void **);
+extern void usb_generic_hid_deinit(usb_hid_dev_t *, void *);
+extern bool usb_generic_hid_polling_callback(usb_hid_dev_t *, void *);
 
 #endif // USB_HID_HIDDDEV_H_