From 4953b122d995696bc0b656b1c70c57ba5e96bcfd Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Fri, 15 Nov 2019 20:02:48 +0100 Subject: Implement timer interrupt handler --- kernel/src/interrupts/idt.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'kernel/src/interrupts/idt.rs') diff --git a/kernel/src/interrupts/idt.rs b/kernel/src/interrupts/idt.rs index e85ef5a..87f16c0 100644 --- a/kernel/src/interrupts/idt.rs +++ b/kernel/src/interrupts/idt.rs @@ -1,3 +1,4 @@ +use super::{exceptions, gdt, interrupts, Interrupts}; use lazy_static::lazy_static; use x86_64::structures::idt::InterruptDescriptorTable; @@ -5,19 +6,20 @@ lazy_static! { static ref IDT: InterruptDescriptorTable = { let mut idt = InterruptDescriptorTable::new(); idt.breakpoint - .set_handler_fn(super::exceptions::breakpoint_handler); + .set_handler_fn(exceptions::breakpoint_handler); idt.segment_not_present - .set_handler_fn(super::exceptions::segment_not_present_handler); + .set_handler_fn(exceptions::segment_not_present_handler); idt.general_protection_fault - .set_handler_fn(super::exceptions::general_protection_fault_handler); + .set_handler_fn(exceptions::general_protection_fault_handler); unsafe { idt.double_fault - .set_handler_fn(super::exceptions::double_fault_handler) - .set_stack_index(super::gdt::DOUBLE_FAULT_IST_INDEX); + .set_handler_fn(exceptions::double_fault_handler) + .set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX); idt.page_fault - .set_handler_fn(super::exceptions::page_fault_handler) - .set_stack_index(super::gdt::PAGE_FAULT_IST_INDEX); + .set_handler_fn(exceptions::page_fault_handler) + .set_stack_index(gdt::PAGE_FAULT_IST_INDEX); } + idt[Interrupts::Timer.as_usize()].set_handler_fn(interrupts::timer_handler); idt }; -- cgit v1.2.3-54-g00ecf