Changeset 21a0d8a in mainline

Timestamp:

2018-08-09T18:30:45Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b13d80b

Parents:

3cdd876

Message:

atkbd: Explicitly enable the keyboard

Do not rely on the keyboard being enabled by the firmware and always
enable it explicitly. This will become necessary starting with QEMU
3.0.0 on the Integrator/CP machine. QEMU's ps2 keyboard will ignore
keyboard events unless in enabled state.

File:

• uspace/drv/hid/atkbd/atkbd.c (modified) (2 diffs)

uspace/drv/hid/atkbd/atkbd.c

@@ -48 +48 @@
 #define AT_NUM_SCAN_CODE 0x77
 #define AT_SCROLL_SCAN_CODE 0x7E
+
+#define AT_KBD_ENABLE 0xF4
+#define AT_KBD_ACK 0xFA
 
 /* Set 2 scan codes (AT keyboard) */
@@ -405 +408 @@
         }
 
+        uint8_t code = AT_KBD_ENABLE;
+        size_t bytes;
+        rc = chardev_write(kbd->chardev, &code, 1, &bytes);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to enable keyboard.");
+                fibril_destroy(kbd->polling_fibril);
+                ddf_fun_unbind(kbd->kbd_fun);
+                ddf_fun_destroy(kbd->kbd_fun);
+                return EIO;
+        }
+        rc = chardev_read(kbd->chardev, &code, 1, &bytes);
+        if (rc != EOK || code != AT_KBD_ACK) {
+                ddf_msg(LVL_ERROR, "Failed to confirm keyboard enable: %hhx.",
+                    code);
+                fibril_destroy(kbd->polling_fibril);
+                ddf_fun_unbind(kbd->kbd_fun);
+                ddf_fun_destroy(kbd->kbd_fun);
+                return EIO;
+        }
+
         fibril_add_ready(kbd->polling_fibril);
         return EOK;