summaryrefslogtreecommitdiff
path: root/kernel/src/interrupts/interrupt_handlers.rs
diff options
context:
space:
mode:
authorDennis Kobert <dennis@kobert.dev>2021-04-18 19:01:54 +0200
committerDennis Kobert <dennis@kobert.dev>2021-04-18 19:01:54 +0200
commit496ccaaf750a4ec1c537c463eff56108e1cc0bb4 (patch)
treef0ccffc3fd823cc4016c29d45408c033c973e5d5 /kernel/src/interrupts/interrupt_handlers.rs
parent8b810a009f8d29ba61a3c377fdeac06a3bbb151d (diff)
Further cleanupfurther-cleanup
* Bump x86_64 dep to version 0.1.14 * Rewrite LOCAL_APIC handling * Remove warnings
Diffstat (limited to 'kernel/src/interrupts/interrupt_handlers.rs')
-rw-r--r--kernel/src/interrupts/interrupt_handlers.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/src/interrupts/interrupt_handlers.rs b/kernel/src/interrupts/interrupt_handlers.rs
index 831211b..8b3a7eb 100644
--- a/kernel/src/interrupts/interrupt_handlers.rs
+++ b/kernel/src/interrupts/interrupt_handlers.rs
@@ -2,18 +2,18 @@ use core::fmt::Write;
use x86_64::structures::idt::InterruptStackFrame;
use x86_64::structures::port;
-pub extern "x86-interrupt" fn timer_handler(_stack_frame: &mut InterruptStackFrame) {
+pub extern "x86-interrupt" fn timer_handler(_stack_frame: InterruptStackFrame) {
crate::io::vga_text::OStream::new().print(b"Timer");
- if let Some(apic) = unsafe { super::apic::get_local_apic() } {
+ if let Some(apic) = 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: InterruptStackFrame) {
let code: u8 = unsafe { port::PortRead::read_from_port(0x60) };
let _ = write!(crate::io::vga_text::OStream::new(), "{}", code);
- if let Some(apic) = unsafe { super::apic::get_local_apic() } {
+ if let Some(apic) = super::apic::get_local_apic() {
apic.end_of_interrupt()
}
}