diff options
author | natrixaeria <upezu@student.kit.edu> | 2019-11-19 19:16:09 +0100 |
---|---|---|
committer | natrixaeria <upezu@student.kit.edu> | 2019-11-19 19:16:09 +0100 |
commit | 78ed9468fb817ffa225b8af3cfdd124c8e37d320 (patch) | |
tree | eb1905b2874888ffd1793c005a33769384ac75a1 /kernel/src/main.rs | |
parent | 8609aa594e61e8789471cc8f540ee4787024509a (diff) |
Fix apic register address and ordering
Diffstat (limited to 'kernel/src/main.rs')
-rw-r--r-- | kernel/src/main.rs | 11 |
1 files changed, 10 insertions, 1 deletions
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); } |