Changeset 26f6094 in mainline for uspace/lib/usb/include/usb/classes/hidut.h

Timestamp:

2011-05-06T09:25:44Z (13 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/lib/usb/include/usb/classes/hidut.h (modified) (1 diff)

uspace/lib/usb/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_ = , */