Changeset 25696fea in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.h

Timestamp:

2011-10-15T20:05:00Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

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;