Skip to content

Commit

Permalink
refactor(x86_64/interrupts): use idt::HandlerFunc alias from x86_64
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Kröning <[email protected]>
  • Loading branch information
mkroening committed May 2, 2024
1 parent 9bbf71b commit 7a27cd7
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/arch/x86_64/kernel/interrupts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use hermit_sync::{InterruptSpinMutex, InterruptTicketMutex};
pub use x86_64::instructions::interrupts::{disable, enable, enable_and_hlt as enable_and_wait};
use x86_64::set_general_handler;
pub use x86_64::structures::idt::InterruptStackFrame as ExceptionStackFrame;
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
use x86_64::structures::idt::{self, InterruptDescriptorTable};

use crate::arch::x86_64::kernel::core_local::{core_scheduler, increment_irq_counter};
use crate::arch::x86_64::kernel::{apic, processor};
Expand Down Expand Up @@ -109,10 +109,7 @@ pub(crate) fn install() {
}

#[no_mangle]
pub extern "C" fn irq_install_handler(
irq_number: u8,
handler: extern "x86-interrupt" fn(InterruptStackFrame),
) {
pub extern "C" fn irq_install_handler(irq_number: u8, handler: idt::HandlerFunc) {
debug!("Install handler for interrupt {}", irq_number);

let mut idt = IDT.lock();
Expand Down

0 comments on commit 7a27cd7

Please sign in to comment.