Changeset 20a3465 in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.h

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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) (1 diff)

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

@@ -49 +49 @@
         async_sess_t *mouse_sess;
         async_sess_t *wheel_sess;
-        
+
         /* Mouse buttons statuses. */
         int32_t *buttons;
         size_t buttons_count;
-        
+
         ddf_dev_ops_t ops;
+        /* DDF mouse function */
+        ddf_fun_t *mouse_fun;
+        /* DDF mouse function */
+        ddf_fun_t *wheel_fun;
 } usb_mouse_t;
 
 /*----------------------------------------------------------------------------*/
 
-usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description;
+extern const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description;
 
 const char *HID_MOUSE_FUN_NAME;