Changeset ad7bb42 in mainline for uspace/lib/usb/include/usb/classes/hidparser.h

Timestamp:

2011-04-01T11:51:42Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

70a71e5

Parents:

2f4b3a4 (diff), 85fa1e1 (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 keyboard output changes

File:

• uspace/lib/usb/include/usb/classes/hidparser.h (modified) (1 diff)

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

@@ -182 +182 @@
 } usb_hid_modifiers_t;
 
-typedef enum {
-        USB_HID_LED_NUM_LOCK = 0x1,
-        USB_HID_LED_CAPS_LOCK = 0x2,
-        USB_HID_LED_SCROLL_LOCK = 0x4,
-        USB_HID_LED_COMPOSE = 0x8,
-        USB_HID_LED_KANA = 0x10,
-        USB_HID_LED_COUNT = 5
-} usb_hid_led_t;
+//typedef enum {
+//      USB_HID_LED_NUM_LOCK = 0x1,
+//      USB_HID_LED_CAPS_LOCK = 0x2,
+//      USB_HID_LED_SCROLL_LOCK = 0x4,
+//      USB_HID_LED_COMPOSE = 0x8,
+//      USB_HID_LED_KANA = 0x10,
+//      USB_HID_LED_COUNT = 5
+//} usb_hid_led_t;
 
 static const usb_hid_modifiers_t