Changeset 664a331c in mainline for uspace/lib/usb/include

Timestamp:

2011-04-29T11:43:28Z (15 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

2571089

Parents:

28d7185 (diff), f19f1b7 (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 merged

Location:

uspace/lib/usb/include/usb

Files:

• classes/hidut.h (modified) (1 diff)
• usb.h (modified) (1 diff)

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;
 

uspace/lib/usb/include/usb/usb.h

@@ -96 +96 @@
         USB_REQUEST_RECIPIENT_DEVICE = 0,
         USB_REQUEST_RECIPIENT_INTERFACE = 1,
-        USB_REQUEST_RECIPIENT_ENDPOINT = 2
+        USB_REQUEST_RECIPIENT_ENDPOINT = 2,
+        USB_REQUEST_RECIPIENT_OTHER = 3
 } usb_request_recipient_t;