Changeset 4837092 in mainline

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

Location:

uspace

Files:

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

uspace/drv/usbhid/hid.h

@@ -79 +79 @@
         uint8_t *keycodes;
         size_t keycode_count;
+        uint8_t modifiers;
 } usb_hid_dev_kbd_t;
 

uspace/drv/usbhid/main.c

@@ -248 +248 @@
          */
 
+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 void usbkbd_check_modifier_changes(usb_hid_dev_kbd_t *kbd_dev,
     uint8_t modifiers)
 {
-        // ignore for now
-        // modifiers should be sent as normal keys to usbkbd_parse_scancode()!!
-        // so it would be better if I received it from report parser in that way
+        /*
+         * TODO: why the USB keyboard has NUM_, SCROLL_ and CAPS_LOCK
+         *       both as modifiers and as keys with their own scancodes???
+         *
+         * modifiers should be sent as normal keys to usbkbd_parse_scancode()!!
+         * so maybe it would be better if I received it from report parser in 
+         * that way
+         */
+        
+        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])) {
+                        // modifier pressed
+                        if (usb_hid_modifiers_boot_keycodes[i] != 0) {
+                                kbd_push_ev(KEY_PRESS, 
+                                    usb_hid_modifiers_boot_keycodes[i]);
+                        }
+                } else if (!(modifiers & usb_hid_modifiers_boot_consts[i]) &&
+                    (kbd_dev->modifiers & usb_hid_modifiers_boot_consts[i])) {
+                        // modifier released
+                        if (usb_hid_modifiers_boot_keycodes[i] != 0) {
+                                kbd_push_ev(KEY_RELEASE, 
+                                    usb_hid_modifiers_boot_keycodes[i]);
+                        }
+                }       // no change
+        }
 }
 
@@ -262 +294 @@
         
         unsigned int key;
-        int i, j;
+        unsigned int i, j;
         
         // TODO: quite dummy right now, think of better implementation
@@ -486 +518 @@
         kbd_dev->keycode_count = BOOTP_REPORT_SIZE;
         kbd_dev->keycodes = (uint8_t *)calloc(
-            kbd_dev->keycode_count * sizeof(uint8_t));
+            kbd_dev->keycode_count, sizeof(uint8_t));
         
         if (kbd_dev->keycodes == NULL) {

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
 
 /*