#include <palacios/vm_guest.h>
-#ifndef CONFIG_DEBUG_KEYBOARD
+#ifndef V3_CONFIG_DEBUG_KEYBOARD
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
// After the Keyboard SET_RATE is called
// we wait for the output byte on 64?
SET_RATE,
+ // after having a f0 sent to 60
+ // we wait for a new output byte on 60
+ GETSET_SCANCODES,
} state;
uint8_t wrap;
int mouse_enabled;
+ int scancode_set;
struct queue kbd_queue;
struct queue mouse_queue;
#include <palacios/vmm_telemetry.h>
-#ifdef CONFIG_SYMMOD
+#ifdef V3_CONFIG_SYMMOD
#include <palacios/vmm_symmod.h>
#endif
}
// PrintGuestPageTables(info, info->shdw_pg_state.guest_cr3);
}
-#ifdef CONFIG_SYMCALL
+#ifdef V3_CONFIG_SYMCALL
else if (evt->scan_code == 0x43) { // F9 Sym test
struct guest_info * core = &(vm->cores[0]);
PrintDebug("Testing sym call\n");
v3_dbg_enable ^= 1;
}
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
else if (evt->scan_code == 0x41) { // F7 telemetry dump
v3_print_telemetry(vm);
}
#endif
-#ifdef CONFIG_SYMMOD
+#ifdef V3_CONFIG_SYMMOD
else if (evt->scan_code == 0x40) { // F6 Test symmod load
v3_load_sym_capsule(vm, "lnx_test");
}
#if KEYBOARD_DEBUG_80H
-static int keyboard_write_delay(ushort_t port, void * src, uint_t length, void * priv_data) {
+static int keyboard_write_delay(struct guest_info *core, ushort_t port, void * src, uint_t length, void * priv_data) {
if (length == 1) {
PrintDebug("keyboard: write of 0x%x to 80h\n", *((uint8_t*)src));
kbd->state = NORMAL;
break;
+ case GETSET_SCANCODES:
+ switch (data) {
+ case 0:
+ PrintDebug("Keyboard: scancode set being read\n");
+ push_to_output_queue(kbd, 0x45 - 2 * kbd->scancode_set, COMMAND, KEYBOARD);
+ break;
+ case 1:
+ PrintError("keyboard: unsupported scancode set %d selected\n", data);
+ return -1;
+ case 2:
+ PrintDebug("Keyboard: scancode set being set to %d\n", data);
+ kbd->scancode_set = data;
+ push_to_output_queue(kbd, 0xfa, COMMAND, KEYBOARD);
+ break;
+ case 3:
+ /* OpenBSD wants scancode set 3, but falls back to 2 if a
+ * subsequent read reveals that the request was ignored
+ */
+ PrintError("keyboard: ignoring request for scancode set %d\n", data);
+ break;
+ default:
+ PrintError("keyboard: unknown scancode set %d selected\n", data);
+ return -1;
+
+ }
+ kbd->state = NORMAL;
+ break;
+
default:
case NORMAL: {
// command is being sent to keyboard controller
push_to_output_queue(kbd, 0xee, COMMAND, KEYBOARD);
break;
+ case 0xf0: // get/set scancode set
+ push_to_output_queue(kbd, 0xfa, COMMAND, KEYBOARD);
+ kbd->state = GETSET_SCANCODES;
+ break;
+
case 0xfe: // resend
case 0xfd: // set key type make
case 0xfc: // set key typ make/break
kbd->kbd_queue.count = 0;
kbd->mouse_enabled = 0;
+ kbd->scancode_set = 2;
kbd->state = NORMAL;
kbd->mouse_state = STREAM;