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

Timestamp:

2011-02-04T16:40:10Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

92574f4

Parents:

8c3c756

Message:

Modifiers handling + fixes.

• Handle modifiers from flags. However, modifiers may be sent also as regular keys, would need to look into that.
• Changed modifier constants in hidparser.h

File:

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

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

@@ -70 +70 @@
 } usb_hid_report_in_callbacks_t;
 
-#define USB_HID_BOOT_KEYBOARD_NUM_LOCK          0x01
-#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK         0x02
-#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK       0x04
-#define USB_HID_BOOT_KEYBOARD_COMPOSE           0x08
-#define USB_HID_BOOT_KEYBOARD_KANA                      0x10
+
+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;
+
+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
+};
+
+//#define USB_HID_BOOT_KEYBOARD_NUM_LOCK                0x01
+//#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK               0x02
+//#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK     0x04
+//#define USB_HID_BOOT_KEYBOARD_COMPOSE         0x08
+//#define USB_HID_BOOT_KEYBOARD_KANA                    0x10
 
 /*