Changeset 3d4aa055 in mainline for uspace/lib/usb/include/usb/classes/hidut.h

Timestamp:

2011-05-06T13:08:10Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

075c1eb, 3da17644

Parents:

a58dd620 (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:

Development branch changes

File:

• uspace/lib/usb/include/usb/classes/hidut.h (modified) (2 diffs)

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

@@ -46 +46 @@
         USB_HIDUT_PAGE_KEYBOARD = 7,
         USB_HIDUT_PAGE_LED = 8,
-        USB_HIDUT_PAGE_BUTTON = 9
-        /* USB_HIDUT_PAGE_ = , */
+        USB_HIDUT_PAGE_BUTTON = 9,
+        USB_HIDUT_PAGE_ORDINAL = 0x0a,
+        USB_HIDUT_PAGE_TELEPHONY_DEVICE = 0x0b,
+        USB_HIDUT_PAGE_CONSUMER = 0x0c
 } usb_hidut_usage_page_t;
 
@@ -57 +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_ = , */