Changeset 6843a9c in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

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

@@ -48 +48 @@
         /** IPC session to console (consumer). */
         async_sess_t *mouse_sess;
-        async_sess_t *wheel_sess;
 
         /* Mouse buttons statuses. */
@@ -57 +56 @@
         /* DDF mouse function */
         ddf_fun_t *mouse_fun;
-        /* DDF mouse function */
-        ddf_fun_t *wheel_fun;
 } usb_mouse_t;