diff options
author | Dennis Kobert <dennis@kobert.dev> | 2019-11-17 20:11:50 +0100 |
---|---|---|
committer | Dennis Kobert <dennis@kobert.dev> | 2019-11-17 20:11:50 +0100 |
commit | 8609aa594e61e8789471cc8f540ee4787024509a (patch) | |
tree | ecdb02115e0d558ca506cd231e2e8069e65f5069 /kernel/src/main.rs | |
parent | ed8c588f0a6ffa62d35c735daac517902da8788a (diff) | |
parent | ddb4f151c8e49b9e3108d2dfe7685d8fe83c42c5 (diff) |
Merge branch 'master' of https://git.kobert.dev/uff-os
Diffstat (limited to 'kernel/src/main.rs')
-rw-r--r-- | kernel/src/main.rs | 7 |
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); } |