Changes in uspace/drv/hid/xtkbd/xtkbd.c [fafb8e5:a635535] in mainline

File:

• uspace/drv/hid/xtkbd/xtkbd.c (modified) (7 diffs)

uspace/drv/hid/xtkbd/xtkbd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2022 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
- * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <io/keycode.h>
 #include <io/chardev.h>
-#include <io/console.h>
+#include <io/kbd_event.h>
 #include <ipc/kbdev.h>
 #include <abi/ipc/methods.h>
@@ -132 +132 @@
         [0x58] = KC_F12,
 
+        [0x54] = KC_SYSREQ,
         [0x46] = KC_SCROLL_LOCK,
 
@@ -163 +164 @@
         [0x1d] = KC_RCTRL,
 
-        [0x37] = KC_SYSREQ,
+        [0x37] = KC_PRTSCR,
+        [0x46] = KC_PAUSE,
 
         [0x52] = KC_INSERT,
@@ -198 +200 @@
 }
 
+/** Get one scancode byte from the keyboard.
+ *
+ * @param kbd Keyboard
+ * @param code Place to store scancode byte
+ * @return EOK on success or an error code
+ */
+static errno_t xtkbd_get_code(xt_kbd_t *kbd, uint8_t *code)
+{
+        errno_t rc;
+        size_t nread;
+
+        *code = 0;
+        rc = chardev_read(kbd->chardev, code, 1, &nread, chardev_f_none);
+        if (rc != EOK) {
+                ddf_msg(LVL_WARN, "Error reading from keyboard device.");
+                return EIO;
+        }
+
+        ddf_msg(LVL_DEBUG, "Read scancode: 0x%02hhx", *code);
+
+        return EOK;
+}
+
 /** Get data and parse scancodes.
  *
@@ -207 +232 @@
 static errno_t polling(void *arg)
 {
+        kbd_event_type_t evtype;
+        unsigned int key;
+        size_t map_size;
         xt_kbd_t *kbd = arg;
-        size_t nread;
+        uint8_t code;
+        uint8_t xcode1;
+        uint8_t xcode2;
         errno_t rc;
 
         while (true) {
-                const unsigned int *map = scanmap_simple;
-                size_t map_size = sizeof(scanmap_simple) / sizeof(unsigned int);
-
-                uint8_t code = 0;
-                rc = chardev_read(kbd->chardev, &code, 1, &nread, chardev_f_none);
+                rc = xtkbd_get_code(kbd, &code);
                 if (rc != EOK)
                         return EIO;
@@ -226 +252 @@
                 /* Extended set */
                 if (code == KBD_SCANCODE_SET_EXTENDED) {
-                        map = scanmap_e0;
-                        map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
-
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &xcode1);
                         if (rc != EOK)
                                 return EIO;
 
-                        /* Handle really special keys */
-
-                        if (code == 0x2a) {  /* Print Screen */
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
-                                if (rc != EOK)
-                                        return EIO;
-
-                                if (code != 0xe0)
-                                        continue;
-
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
-                                if (rc != EOK)
-                                        return EIO;
-
-                                if (code == 0x37)
-                                        push_event(kbd->client_sess, KEY_PRESS, KC_PRTSCR);
-
+                        if ((xcode1 & 0x7f) == 0x2a)  /* Fake shift */
+                                continue;
+
+                        /* Bit 7 indicates press/release */
+                        evtype = (xcode1 & 0x80) ? KEY_RELEASE : KEY_PRESS;
+
+                        map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
+                        key = (xcode1 & 0x7f) < map_size ?
+                            scanmap_e0[xcode1 & 0x7f] : 0;
+
+                        if (key != 0)
+                                push_event(kbd->client_sess, evtype, key);
+                        else
+                                ddf_msg(LVL_WARN, "Unknown scancode: e0 %hhx", xcode1);
+
+                        continue;
+                }
+
+                /* Extended special set */
+                if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
+                        rc = xtkbd_get_code(kbd, &xcode1);
+                        if (rc != EOK)
+                                return EIO;
+
+                        rc = xtkbd_get_code(kbd, &xcode2);
+                        if (rc != EOK)
+                                return EIO;
+
+                        if ((xcode1 & 0x80) == (xcode2 & 0x80) &&
+                            (xcode1 & 0x7f) == 0x1d && (xcode2 & 0x7f) == 0x45) {
+                                /* Pause */
+                                evtype = (xcode1 & 0x80) ? KEY_RELEASE :
+                                    KEY_PRESS;
+                                push_event(kbd->client_sess, evtype, KC_PAUSE);
                                 continue;
                         }
 
-                        if (code == 0x46) {  /* Break */
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
-                                if (rc != EOK)
-                                        return EIO;
-
-                                if (code != 0xe0)
-                                        continue;
-
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
-                                if (rc != EOK)
-                                        return EIO;
-
-                                if (code == 0xc6)
-                                        push_event(kbd->client_sess, KEY_PRESS, KC_BREAK);
-
-                                continue;
-                        }
-                }
-
-                /* Extended special set */
-                if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
-                        if (rc != EOK)
-                                return EIO;
-
-                        if (code != 0x1d)
-                                continue;
-
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
-                        if (rc != EOK)
-                                return EIO;
-
-                        if (code != 0x45)
-                                continue;
-
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
-                        if (rc != EOK)
-                                return EIO;
-
-                        if (code != 0xe1)
-                                continue;
-
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
-                        if (rc != EOK)
-                                return EIO;
-
-                        if (code != 0x9d)
-                                continue;
-
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
-                        if (rc != EOK)
-                                return EIO;
-
-                        if (code == 0xc5)
-                                push_event(kbd->client_sess, KEY_PRESS, KC_PAUSE);
-
+                        ddf_msg(LVL_WARN, "Unknown scancode: e1 %hhx %hhx",
+                            xcode1, xcode2);
                         continue;
                 }
 
                 /* Bit 7 indicates press/release */
-                const kbd_event_type_t type =
-                    (code & 0x80) ? KEY_RELEASE : KEY_PRESS;
-                code &= ~0x80;
-
-                const unsigned int key = (code < map_size) ? map[code] : 0;
+                evtype = (code & 0x80) ? KEY_RELEASE : KEY_PRESS;
+
+                map_size = sizeof(scanmap_simple) / sizeof(unsigned int);
+                key = (code & 0x7f) < map_size ?
+                    scanmap_simple[code & 0x7f] : 0;
 
                 if (key != 0)
-                        push_event(kbd->client_sess, type, key);
+                        push_event(kbd->client_sess, evtype, key);
                 else
                         ddf_msg(LVL_WARN, "Unknown scancode: %hhx", code);