diff options
author | Dennis Kobert <dennis@kobert.dev> | 2019-11-15 20:21:25 +0100 |
---|---|---|
committer | Dennis Kobert <dennis@kobert.dev> | 2019-11-15 20:21:25 +0100 |
commit | 6590a5acfee33bae3ca0431c8af09768248fe405 (patch) | |
tree | 8aeb110464ac6b6f715118ea1d14edf3d04b83a4 /kernel/src/interrupts/idt.rs | |
parent | c6e0e13db0ba0442018645a1184be50e1ec968e0 (diff) |
Rename interrupt and exception handlers
Diffstat (limited to 'kernel/src/interrupts/idt.rs')
-rw-r--r-- | kernel/src/interrupts/idt.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/src/interrupts/idt.rs b/kernel/src/interrupts/idt.rs index 87f16c0..4978755 100644 --- a/kernel/src/interrupts/idt.rs +++ b/kernel/src/interrupts/idt.rs @@ -1,4 +1,4 @@ -use super::{exceptions, gdt, interrupts, Interrupts}; +use super::{exception_handlers, gdt, interrupt_handlers, Interrupts}; use lazy_static::lazy_static; use x86_64::structures::idt::InterruptDescriptorTable; @@ -6,20 +6,20 @@ lazy_static! { static ref IDT: InterruptDescriptorTable = { let mut idt = InterruptDescriptorTable::new(); idt.breakpoint - .set_handler_fn(exceptions::breakpoint_handler); + .set_handler_fn(exception_handlers::breakpoint_handler); idt.segment_not_present - .set_handler_fn(exceptions::segment_not_present_handler); + .set_handler_fn(exception_handlers::segment_not_present_handler); idt.general_protection_fault - .set_handler_fn(exceptions::general_protection_fault_handler); + .set_handler_fn(exception_handlers::general_protection_fault_handler); unsafe { idt.double_fault - .set_handler_fn(exceptions::double_fault_handler) + .set_handler_fn(exception_handlers::double_fault_handler) .set_stack_index(gdt::DOUBLE_FAULT_IST_INDEX); idt.page_fault - .set_handler_fn(exceptions::page_fault_handler) + .set_handler_fn(exception_handlers::page_fault_handler) .set_stack_index(gdt::PAGE_FAULT_IST_INDEX); } - idt[Interrupts::Timer.as_usize()].set_handler_fn(interrupts::timer_handler); + idt[Interrupts::Timer.as_usize()].set_handler_fn(interrupt_handlers::timer_handler); idt }; |