From 8b810a009f8d29ba61a3c377fdeac06a3bbb151d Mon Sep 17 00:00:00 2001 From: NatrixAeria Date: Thu, 15 Apr 2021 00:05:07 +0200 Subject: Fix most warnings and tidy up --- kernel/src/interrupts/interrupt_handlers.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'kernel/src/interrupts/interrupt_handlers.rs') 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() } -- cgit v1.2.3-54-g00ecf