summaryrefslogtreecommitdiff
path: root/kernel/src/interrupts
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src/interrupts')
-rw-r--r--kernel/src/interrupts/apic.rs3
-rw-r--r--kernel/src/interrupts/exception_handlers.rs8
-rw-r--r--kernel/src/interrupts/idt.rs2
-rw-r--r--kernel/src/interrupts/interrupt_handlers.rs12
-rw-r--r--kernel/src/interrupts/mod.rs2
5 files changed, 12 insertions, 15 deletions
diff --git a/kernel/src/interrupts/apic.rs b/kernel/src/interrupts/apic.rs
index 2761fb9..0e89943 100644
--- a/kernel/src/interrupts/apic.rs
+++ b/kernel/src/interrupts/apic.rs
@@ -7,7 +7,6 @@ const APIC_BASE_MSR: u32 = 0x001b;
// APIC constant register values
const APIC_DISABLE: u32 = 0x0001_0000;
const APIC_NMI: u32 = 0x0000_0400;
-const APIC_SW_ENABLE: u32 = 0x0000_0100;
pub fn is_x2apic() -> bool {
let info: u32;
@@ -98,7 +97,7 @@ impl Apic {
return None;
}
Self::disable_pic();
- let mut base_apic = unsafe { Msr::new(APIC_BASE_MSR).read() };
+ let base_apic = unsafe { Msr::new(APIC_BASE_MSR).read() };
let mut apic = Self::from_base_apic(base_apic);
apic.set(ApicRegister::LogicalDst, 0);
diff --git a/kernel/src/interrupts/exception_handlers.rs b/kernel/src/interrupts/exception_handlers.rs
index c689501..ce8f6c0 100644
--- a/kernel/src/interrupts/exception_handlers.rs
+++ b/kernel/src/interrupts/exception_handlers.rs
@@ -13,16 +13,16 @@ macro_rules! exception_default {
};
}
-static mut expected_fault: InterruptType = InterruptType::None;
+static mut EXPECTED_FAULT: InterruptType = InterruptType::None;
pub unsafe fn expect_fault(int: InterruptType) {
- if expected_fault == InterruptType::None {
- expected_fault = int;
+ if EXPECTED_FAULT == InterruptType::None {
+ EXPECTED_FAULT = int;
}
}
fn get_expected_fault() -> InterruptType {
- unsafe { expected_fault }
+ unsafe { EXPECTED_FAULT }
}
pub extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
diff --git a/kernel/src/interrupts/idt.rs b/kernel/src/interrupts/idt.rs
index 641e44e..4e5dd77 100644
--- a/kernel/src/interrupts/idt.rs
+++ b/kernel/src/interrupts/idt.rs
@@ -34,7 +34,7 @@ lazy_static! {
}
pub extern "x86-interrupt" fn dummy_handler(
- stack_frame: &mut x86_64::structures::idt::InterruptStackFrame,
+ _stack_frame: &mut x86_64::structures::idt::InterruptStackFrame,
) {
panic!("unhandled interrupt recieved");
}
diff --git a/kernel/src/interrupts/interrupt_handlers.rs b/kernel/src/interrupts/interrupt_handlers.rs
index e7af0e1..831211b 100644
--- a/kernel/src/interrupts/interrupt_handlers.rs
+++ b/kernel/src/interrupts/interrupt_handlers.rs
@@ -1,20 +1,18 @@
-use super::InterruptType;
-use crate::io::qemu;
use core::fmt::Write;
-use x86_64::structures::idt::{InterruptStackFrame, PageFaultErrorCode};
+use x86_64::structures::idt::InterruptStackFrame;
use x86_64::structures::port;
-pub extern "x86-interrupt" fn timer_handler(stack_frame: &mut InterruptStackFrame) {
- write!(crate::io::vga_text::OStream::new(), "Timer");
+pub extern "x86-interrupt" fn timer_handler(_stack_frame: &mut InterruptStackFrame) {
+ crate::io::vga_text::OStream::new().print(b"Timer");
if let Some(apic) = unsafe { super::apic::get_local_apic() } {
apic.end_of_interrupt()
}
}
-pub extern "x86-interrupt" fn keyboard_handler(stack_frame: &mut InterruptStackFrame) {
+pub extern "x86-interrupt" fn keyboard_handler(_stack_frame: &mut InterruptStackFrame) {
let code: u8 = unsafe { port::PortRead::read_from_port(0x60) };
- write!(crate::io::vga_text::OStream::new(), "{}", code);
+ let _ = write!(crate::io::vga_text::OStream::new(), "{}", code);
if let Some(apic) = unsafe { super::apic::get_local_apic() } {
apic.end_of_interrupt()
}
diff --git a/kernel/src/interrupts/mod.rs b/kernel/src/interrupts/mod.rs
index 6a92c3f..3f5e09a 100644
--- a/kernel/src/interrupts/mod.rs
+++ b/kernel/src/interrupts/mod.rs
@@ -24,7 +24,7 @@ pub enum InterruptType {
StackSegmentFault,
GeneralProtectionFault,
PageFault,
- x87Floating = 16,
+ X87Floating = 16,
AlignmentCheck,
MachineCheck,
SIMD,