Changeset 15d0046 in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.h

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

• uspace/drv/bus/usb/usbhid/mouse/mousedev.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/mouse/mousedev.h

@@ -39 +39 @@
 #include <usb/dev/driver.h>
 #include <async.h>
-
-struct usb_hid_dev;
-
-
+#include "../usbhid.h"
 
 /** Container for USB mouse device. */
@@ -48 +45 @@
         /** IPC session to consumer. */
         async_sess_t *mouse_sess;
-
-        /* Mouse buttons statuses. */
+        
+        /** Mouse buttons statuses. */
         int32_t *buttons;
         size_t buttons_count;
-
-        /* DDF mouse function */
+        
+        /** DDF mouse function */
         ddf_fun_t *mouse_fun;
 } usb_mouse_t;
 
-
-
 extern const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description;
 
-const char *HID_MOUSE_FUN_NAME;
-const char *HID_MOUSE_CATEGORY;
+extern const char *HID_MOUSE_FUN_NAME;
+extern const char *HID_MOUSE_CATEGORY;
 
-
-
-int usb_mouse_init(struct usb_hid_dev *hid_dev, void **data);
-
-bool usb_mouse_polling_callback(struct usb_hid_dev *hid_dev, void *data);
-
-void usb_mouse_deinit(struct usb_hid_dev *hid_dev, void *data);
-
-int usb_mouse_set_boot_protocol(struct usb_hid_dev *hid_dev);
-
-
+extern int usb_mouse_init(usb_hid_dev_t *, void **);
+extern bool usb_mouse_polling_callback(usb_hid_dev_t *, void *);
+extern void usb_mouse_deinit(usb_hid_dev_t *, void *);
+extern int usb_mouse_set_boot_protocol(usb_hid_dev_t *);
 
 #endif // USB_HID_MOUSEDEV_H_