summaryrefslogtreecommitdiff
path: root/kernel/src/main.rs
diff options
context:
space:
mode:
authorNatrixAeria <upezu@student.kit.edu>2021-03-22 20:36:15 +0100
committerNatrixAeria <upezu@student.kit.edu>2021-03-22 20:36:15 +0100
commit861073d07b0fd70c5017fa96aa67dd7df4de9443 (patch)
tree726dd42c9d9fe4e01d59f24d7f55f1e3cf142532 /kernel/src/main.rs
parent2701fe07b4c8c9b6a36112c98fbfc900acbd6cf3 (diff)
Refresh rust version
Diffstat (limited to 'kernel/src/main.rs')
-rw-r--r--kernel/src/main.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
index 8b21eef..50b281f 100644
--- a/kernel/src/main.rs
+++ b/kernel/src/main.rs
@@ -10,17 +10,17 @@ pub mod interrupts;
pub mod io;
pub mod testing;
-use core::fmt::Write;
pub use io::qemu::{exit_qemu, QemuExitCode};
pub use io::vga_text::OStream;
pub use io::{qemu, serial, vga_text};
#[no_mangle]
extern "C" fn _start() -> ! {
- kernel::init();
+ interrupts::gdt::init();
+ interrupts::idt::init();
let apic = interrupts::apic::Apic::new().expect("no APIC support");
- let mut apic = unsafe { interrupts::apic::set_local_apic(apic) };
+ let apic = unsafe { interrupts::apic::set_local_apic(apic) };
apic.set_timer_interrupt_handler(
interrupts::apic::TimerDivideConfig::Div16,