Changeset 8f840ed in mainline

Timestamp:

2011-02-24T19:31:07Z (14 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).

Location:

uspace

Files:

• drv/usbhid/main.c (modified) (3 diffs)
• lib/usb/include/usb/classes/hidparser.h (modified) (1 diff)

uspace/drv/usbhid/main.c

@@ -139 +139 @@
  */
 
-/** Currently active modifiers. 
+/** Currently active modifiers (locks is probably better word).
  *
  * TODO: put to device?
@@ -258 +258 @@
          */
 
-static const keycode_t usb_hid_modifiers_boot_keycodes[5] = {
-        KC_NUM_LOCK,      /* USB_HID_MOD_BOOT_NUM_LOCK */
-        KC_CAPS_LOCK,     /* USB_HID_MOD_BOOT_CAPS_LOCK */
-        KC_SCROLL_LOCK,   /* USB_HID_MOD_BOOT_SCROLL_LOCK */
-        0,                /* USB_HID_MOD_BOOT_COMPOSE */
-        0                 /* USB_HID_MOD_BOOT_KANA */
+static const keycode_t usb_hid_modifiers_keycodes[USB_HID_MOD_COUNT] = {
+        KC_LCTRL,         /* USB_HID_MOD_LCTRL */
+        KC_LSHIFT,        /* USB_HID_MOD_LSHIFT */
+        KC_LALT,          /* USB_HID_MOD_LALT */
+        0,                /* USB_HID_MOD_LGUI */
+        KC_RCTRL,         /* USB_HID_MOD_RCTRL */
+        KC_RSHIFT,        /* USB_HID_MOD_RSHIFT */
+        KC_RALT,          /* USB_HID_MOD_RALT */
+        0,                /* USB_HID_MOD_RGUI */
 };
 
@@ -279 +282 @@
         
         int i;
-        for (i = 0; i < USB_HID_MOD_BOOT_COUNT; ++i) {
-                if ((modifiers & usb_hid_modifiers_boot_consts[i]) &&
-                    !(kbd_dev->modifiers & usb_hid_modifiers_boot_consts[i])) {
+        for (i = 0; i < USB_HID_MOD_COUNT; ++i) {
+                if ((modifiers & usb_hid_modifiers_consts[i]) &&
+                    !(kbd_dev->modifiers & usb_hid_modifiers_consts[i])) {
                         // modifier pressed
-                        if (usb_hid_modifiers_boot_keycodes[i] != 0) {
+                        if (usb_hid_modifiers_keycodes[i] != 0) {
                                 kbd_push_ev(KEY_PRESS, 
-                                    usb_hid_modifiers_boot_keycodes[i]);
+                                    usb_hid_modifiers_keycodes[i]);
                         }
-                } else if (!(modifiers & usb_hid_modifiers_boot_consts[i]) &&
-                    (kbd_dev->modifiers & usb_hid_modifiers_boot_consts[i])) {
+                } else if (!(modifiers & usb_hid_modifiers_consts[i]) &&
+                    (kbd_dev->modifiers & usb_hid_modifiers_consts[i])) {
                         // modifier released
-                        if (usb_hid_modifiers_boot_keycodes[i] != 0) {
+                        if (usb_hid_modifiers_keycodes[i] != 0) {
                                 kbd_push_ev(KEY_RELEASE, 
-                                    usb_hid_modifiers_boot_keycodes[i]);
+                                    usb_hid_modifiers_keycodes[i]);
                         }
                 }       // no change

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
 };