From 78ed9468fb817ffa225b8af3cfdd124c8e37d320 Mon Sep 17 00:00:00 2001 From: natrixaeria Date: Tue, 19 Nov 2019 19:16:09 +0100 Subject: Fix apic register address and ordering --- kernel/src/main.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'kernel/src/main.rs') diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 2116838..a0e1e56 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -23,13 +23,22 @@ extern "C" fn _start() -> ! { 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); + apic.set_timer_interrupt_handler(interrupts::apic::TimerDivideConfig::Div16, interrupts::InterruptType::Timer); x86_64::instructions::interrupts::enable(); let mut stdout = OStream::new(); stdout.print(b"apic initialisation complete\n"); + loop { + stdout.set_col(0); + use core::fmt::Write; + //let n = apic.get_timer_value(); + let n = apic.get_error_code(); + write!(&mut stdout, "timer: {} ", n); + //write!(&mut stdout, "timer: {:08x} ", apic.ptr() as usize); + } + if cfg!(test) { qemu::exit_qemu(qemu::QemuExitCode::Success); } -- cgit v1.2.3-54-g00ecf