Changeset a81a1d09 in mainline for uspace/lib/usbhid/include/usb/classes/hidut.h

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/lib/usbhid/include/usb/classes/hidut.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidut.h ) (1 diff)

uspace/lib/usbhid/include/usb/classes/hidut.h

@@ -59 +59 @@
         USB_HIDUT_USAGE_GENERIC_DESKTOP_GAMEPAD = 5,
         USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD = 6,
-        USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7,
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_X = 0x30,
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_Y = 0x31,
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL = 0x38
         /* USB_HIDUT_USAGE_GENERIC_DESKTOP_ = , */