Changeset 26f6094 in mainline for uspace/drv/usbhid/mouse/mousedev.h

Timestamp:

2011-05-06T09:25:44Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d0c060b

Parents:

9e929a0 (diff), 310c4df (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 usb/development

File:

• uspace/drv/usbhid/mouse/mousedev.h (modified) (1 diff)

uspace/drv/usbhid/mouse/mousedev.h

@@ -49 +49 @@
         /** IPC phone to console (consumer). */
         int console_phone;
+        
+        int32_t *buttons;
 } usb_mouse_t;