Load keyboard module after memory module

vinc · Oct 18, 2024 · e40526f · e40526f
1 parent cd9a708
commit e40526f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/lib.rs b/src/lib.rs
@@ -23,18 +23,21 @@ use bootloader::BootInfo;
 const KERNEL_SIZE: usize = 4 << 20; // 4 MB
 
 pub fn init(boot_info: &'static BootInfo) {
+    use x86_64::instructions::read_rip;
+    let virt_addr = read_rip();
+
     sys::vga::init();
     sys::gdt::init();
     sys::idt::init();
     sys::pic::init(); // Enable interrupts
     sys::serial::init();
-    sys::keyboard::init();
     sys::time::init();
 
     let v = option_env!("MOROS_VERSION").unwrap_or(env!("CARGO_PKG_VERSION"));
     log!("SYS MOROS v{}", v);
 
     sys::mem::init(boot_info);
+    sys::keyboard::init(); // Must not run before MEM
     sys::acpi::init(); // Require MEM
     sys::cpu::init();
     sys::rng::init();