diff --git a/drivers/acpi.cpp b/drivers/acpi.cpp index 43e7337..0463544 100644 --- a/drivers/acpi.cpp +++ b/drivers/acpi.cpp @@ -769,9 +769,12 @@ void ACPIInitialise2() { } void KPS2SafeToInitialise() { + // TODO Qemu sets this to true? +#if 0 if (acpi.ps2ControllerUnavailable) { return; } +#endif // This is only called when either: // - the PCI driver determines there are no USB controllers diff --git a/drivers/ps2.cpp b/drivers/ps2.cpp index c358bd4..45409fa 100644 --- a/drivers/ps2.cpp +++ b/drivers/ps2.cpp @@ -89,7 +89,7 @@ uint16_t scancodeConversionTable2[] = { 0, ES_SCANCODE_PERIOD, ES_SCANCODE_SLASH, ES_SCANCODE_L, ES_SCANCODE_PUNCTUATION_3, ES_SCANCODE_P, ES_SCANCODE_HYPHEN, 0, 0, 0, ES_SCANCODE_PUNCTUATION_4, 0, ES_SCANCODE_LEFT_BRACE, ES_SCANCODE_EQUALS, 0, 0, ES_SCANCODE_CAPS_LOCK, ES_SCANCODE_RIGHT_SHIFT, ES_SCANCODE_ENTER, ES_SCANCODE_RIGHT_BRACE, 0, ES_SCANCODE_PUNCTUATION_1, 0, 0, - 0, 0, 0, 0, 0, 0, ES_SCANCODE_BACKSPACE, 0, + 0, ES_SCANCODE_PUNCTUATION_6, 0, 0, 0, 0, ES_SCANCODE_BACKSPACE, 0, 0, ES_SCANCODE_NUM_1, 0, ES_SCANCODE_NUM_4, ES_SCANCODE_NUM_7, 0, 0, 0, ES_SCANCODE_NUM_0, ES_SCANCODE_NUM_POINT, ES_SCANCODE_NUM_2, ES_SCANCODE_NUM_5, ES_SCANCODE_NUM_6, ES_SCANCODE_NUM_8, ES_SCANCODE_ESCAPE, ES_SCANCODE_NUM_LOCK, ES_SCANCODE_F11, ES_SCANCODE_NUM_ADD, ES_SCANCODE_NUM_3, ES_SCANCODE_NUM_SUBTRACT, ES_SCANCODE_NUM_MULTIPLY, ES_SCANCODE_NUM_9, ES_SCANCODE_SCROLL_LOCK, 0,