When USB keyboard active, don't send keyboard commands to ps2 port.

Route keyboard commands to a USB handler when USB keyboard is active.

Add a GETID handler for USB keyboards.

1 files changed, 23 insertions, 0 deletions

diff --git a/src/usb-hid.c b/src/usb-hid.c
index f82965d7..bffd81cd 100644
--- a/src/usb-hid.c
+++ b/src/usb-hid.c
@@ -9,6 +9,7 @@
 #include "config.h" // CONFIG_*
 #include "usb.h" // usb_ctrlrequest
 #include "biosvar.h" // GET_GLOBAL
+#include "ps2port.h" // ATKBD_CMD_GETID
 
 struct usb_pipe *keyboard_pipe VAR16VISIBLE;
 
@@ -252,3 +253,25 @@ usb_check_key(void)
         handle_key(&data);
     }
 }
+
+// Test if USB keyboard is active.
+inline int
+usb_kbd_active(void)
+{
+    return GET_GLOBAL(keyboard_pipe) != NULL;
+}
+
+// Handle a ps2 style keyboard command.
+inline int
+usb_kbd_command(int command, u8 *param)
+{
+    switch (command) {
+    case ATKBD_CMD_GETID:
+        // Return the id of a standard AT keyboard.
+        param[0] = 0xab;
+        param[1] = 0x83;
+        return 0;
+    default:
+        return -1;
+    }
+}