From 1cb95b5c393b41fc0696c5c5e77c5697820a6276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Thu, 2 May 2024 16:10:11 +0200 Subject: [PATCH] refactor(x86_64/interrupts): use idt::HandlerFunc alias from x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- src/arch/x86_64/kernel/interrupts.rs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/arch/x86_64/kernel/interrupts.rs b/src/arch/x86_64/kernel/interrupts.rs index 1e24bf7656..c0495869bb 100644 --- a/src/arch/x86_64/kernel/interrupts.rs +++ b/src/arch/x86_64/kernel/interrupts.rs @@ -11,10 +11,6 @@ use x86_64::set_general_handler; use x86_64::structures::idt; use x86_64::structures::idt::InterruptDescriptorTable; pub use x86_64::structures::idt::InterruptStackFrame as ExceptionStackFrame; -<<<<<<< HEAD -use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame}; -======= ->>>>>>> 657edb5c (feat(newlib): remove lwIP support) use crate::arch::x86_64::kernel::core_local::{core_scheduler, increment_irq_counter}; use crate::arch::x86_64::kernel::{apic, processor}; @@ -114,16 +110,8 @@ pub(crate) fn install() { IRQ_NAMES.lock().insert(7, "FPU"); } -<<<<<<< HEAD -#[no_mangle] -pub extern "C" fn irq_install_handler( - irq_number: u8, - handler: extern "x86-interrupt" fn(InterruptStackFrame), -) { -======= #[cfg(any(feature = "fuse", feature = "tcp", feature = "udp"))] pub fn irq_install_handler(irq_number: u8, handler: idt::HandlerFunc) { ->>>>>>> 657edb5c (feat(newlib): remove lwIP support) debug!("Install handler for interrupt {}", irq_number); let mut idt = IDT.lock();