Merge branch 'master' of https://git.kobert.dev/uff-os

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/src/main.rs b/kernel/src/main.rs
index 7cfbbe3..2116838 100644
--- a/kernel/src/main.rs
+++ b/kernel/src/main.rs
@@ -19,12 +19,17 @@ pub use io::{qemu, serial, vga_text};
 #[no_mangle]
 extern "C" fn _start() -> ! {
     kernel::init();
-    x86_64::instructions::interrupts::enable();
 
     let apic = interrupts::apic::Apic::new().expect("no APIC support");
     let mut apic = unsafe { interrupts::apic::set_local_apic(apic) };
+
     apic.set_timer_interrupt_handler(interrupts::apic::TimerDivideConfig::Div32, interrupts::InterruptType::Timer);
 
+    x86_64::instructions::interrupts::enable();
+
+    let mut stdout = OStream::new();
+    stdout.print(b"apic initialisation complete\n");
+
     if cfg!(test) {
         qemu::exit_qemu(qemu::QemuExitCode::Success);
     }