Changeset 4fe3b6d in mainline for uspace/lib/usbhid/include/usb/hid/usages/core.h

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 development

File:

• uspace/lib/usbhid/include/usb/hid/usages/core.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidut.h ) (3 diffs)

uspace/lib/usbhid/include/usb/hid/usages/core.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb
+/** @addtogroup libusbhid
  * @{
  */
@@ -33 +33 @@
  * @brief USB HID Usage Tables.
  */
-#ifndef LIBUSB_HIDUT_H_
-#define LIBUSB_HIDUT_H_
+#ifndef LIBUSBHID_HIDUT_H_
+#define LIBUSBHID_HIDUT_H_
 
 /** USB/HID Usage Pages. */
@@ -67 +67 @@
 } usb_hidut_usage_generic_desktop_t;
 
+typedef enum {
+        USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL = 1
+} usb_hidut_usage_consumer_t;
+
 
 #endif