Add FADT check for presence of i8042 controller.

[lunaix-os.git] / lunaix-os / kernel / peripheral / ps2kbd.c

diff --git a/lunaix-os/kernel/peripheral/ps2kbd.c b/lunaix-os/kernel/peripheral/ps2kbd.c
index 4e7fb63c27d394dc18ec7fdfa6cf640e1270a401..0cd3f2cb52b8076c192022bdf8ffd2443774bde2 100644 (file)
--- a/lunaix-os/kernel/peripheral/ps2kbd.c
+++ b/lunaix-os/kernel/peripheral/ps2kbd.c
@@ -3,6 +3,7 @@
 #include <lunaix/timer.h>
 #include <lunaix/common.h>
 #include <lunaix/syslog.h>
+#include <hal/acpi/acpi.h>
 
 #include <hal/cpu.h>
 #include <arch/x86/interrupts.h>
@@ -104,10 +105,15 @@ void ps2_kbd_init() {
     kbd_state.translation_table = scancode_set2;
     kbd_state.state = KBD_STATE_KWAIT;
 
+    acpi_context* acpi_ctx = acpi_get_context();
+    if (!(acpi_ctx->fadt.boot_arch & IAPC_ARCH_8042)) {
+        kprintf(KERROR "No PS/2 controller detected.\n");
+        // FUTURE: Some alternative fallback on this? Check PCI bus for USB controller instead?
+        return;
+    }
+    
     cpu_disable_interrupt();
 
-    // XXX: 是否需要使用FADT探测PS/2控制器的存在？
-
     // 1、禁用任何的PS/2设备
     ps2_post_cmd(PS2_PORT_CTRL_CMDREG, PS2_CMD_PORT1_DISABLE, PS2_NO_ARG);
     ps2_post_cmd(PS2_PORT_CTRL_CMDREG, PS2_CMD_PORT2_DISABLE, PS2_NO_ARG);