Changeset 8f840ed in mainline for uspace/lib

Timestamp:

2011-02-24T19:31:07Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f2ba5d9f

Parents:

e7b7ebd5

Message:

Modifiers handling.

• Renamed constants in hidparser.
• Changed parsing of modifiers.
• GUI keys are not recognized yet (no keycodes for them).

File:

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

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

@@ -72 +72 @@
 
 typedef enum {
-        USB_HID_MOD_BOOT_NUM_LOCK = 0x01,
-        USB_HID_MOD_BOOT_CAPS_LOCK = 0x02,
-        USB_HID_MOD_BOOT_SCROLL_LOCK = 0x04,
-        USB_HID_MOD_BOOT_COMPOSE = 0x08,
-        USB_HID_MOD_BOOT_KANA = 0x10,
-        USB_HID_MOD_BOOT_COUNT = 5
-} usb_hid_modifiers_boot_t;
+        USB_HID_MOD_LCTRL = 0x01,
+        USB_HID_MOD_LSHIFT = 0x02,
+        USB_HID_MOD_LALT = 0x04,
+        USB_HID_MOD_LGUI = 0x08,
+        USB_HID_MOD_RCTRL = 0x10,
+        USB_HID_MOD_RSHIFT = 0x20,
+        USB_HID_MOD_RALT = 0x40,
+        USB_HID_MOD_RGUI = 0x80,
+        USB_HID_MOD_COUNT = 8
+} usb_hid_modifiers_t;
 
-static const usb_hid_modifiers_boot_t usb_hid_modifiers_boot_consts[5] = {
-        USB_HID_MOD_BOOT_NUM_LOCK,
-        USB_HID_MOD_BOOT_CAPS_LOCK,
-        USB_HID_MOD_BOOT_SCROLL_LOCK,
-        USB_HID_MOD_BOOT_COMPOSE,
-        USB_HID_MOD_BOOT_KANA
+static const usb_hid_modifiers_t 
+    usb_hid_modifiers_consts[USB_HID_MOD_COUNT] = {
+        USB_HID_MOD_LCTRL,
+        USB_HID_MOD_LSHIFT,
+        USB_HID_MOD_LALT,
+        USB_HID_MOD_LGUI,
+        USB_HID_MOD_RCTRL,
+        USB_HID_MOD_RSHIFT,
+        USB_HID_MOD_RALT,
+        USB_HID_MOD_RGUI
 };