Changeset bb4ba92 in mainline

Timestamp:

2022-06-27T10:46:59Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9e9d9bc6

Parents:

b7155d7

git-author:

Jiri Svoboda <jiri@…> (2022-06-26 17:46:37)

git-committer:

Jiri Svoboda <jiri@…> (2022-06-27 10:46:59)

Message:

XT keyboard driver needs a function for getting scan codes

File:

• uspace/drv/hid/xtkbd/xtkbd.c (modified) (14 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.
  *
@@ -198 +198 @@
 }
 
+/** 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.
  *
@@ -208 +231 @@
 {
         xt_kbd_t *kbd = arg;
-        size_t nread;
         errno_t rc;
 
@@ -216 +238 @@
 
                 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;
@@ -229 +251 @@
                         map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
 
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &code);
                         if (rc != EOK)
                                 return EIO;
@@ -237 +258 @@
 
                         if (code == 0x2a) {  /* Print Screen */
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
+                                rc = xtkbd_get_code(kbd, &code);
                                 if (rc != EOK)
                                         return EIO;
@@ -245 +265 @@
                                         continue;
 
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
+                                rc = xtkbd_get_code(kbd, &code);
                                 if (rc != EOK)
                                         return EIO;
@@ -257 +276 @@
 
                         if (code == 0x46) {  /* Break */
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
+                                rc = xtkbd_get_code(kbd, &code);
                                 if (rc != EOK)
                                         return EIO;
@@ -265 +283 @@
                                         continue;
 
-                                rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                                    chardev_f_none);
+                                rc = xtkbd_get_code(kbd, &code);
                                 if (rc != EOK)
                                         return EIO;
@@ -279 +296 @@
                 /* Extended special set */
                 if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &code);
                         if (rc != EOK)
                                 return EIO;
@@ -287 +303 @@
                                 continue;
 
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &code);
                         if (rc != EOK)
                                 return EIO;
@@ -295 +310 @@
                                 continue;
 
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &code);
                         if (rc != EOK)
                                 return EIO;
@@ -303 +317 @@
                                 continue;
 
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &code);
                         if (rc != EOK)
                                 return EIO;
@@ -311 +324 @@
                                 continue;
 
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread,
-                            chardev_f_none);
+                        rc = xtkbd_get_code(kbd, &code);
                         if (rc != EOK)
                                 return EIO;