Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
1 parent
5e41662c09
commit
8e0fbfe263
5 files changed
+47
-8
No files matched your search
+10
-1
@@ -3,7 +3,14 @@ use crate::hlt_loop;
|
||||
use crate::memory::gdt;
|
||||
use crate::println;
|
||||
use lazy_static::lazy_static;
|
||||
use pic::{init_pic, keyboard_interrupt_handler, timer_interrupt_handler, InterruptIndex};
|
||||
use pic::{
|
||||
init_pic,
|
||||
keyboard_interrupt_handler,
|
||||
timer_interrupt_handler,
|
||||
disk1_interrupt_handler,
|
||||
disk2_interrupt_handler,
|
||||
InterruptIndex
|
||||
};
|
||||
use x86_64::structures::idt::PageFaultErrorCode;
|
||||
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
|
||||
|
||||
@@ -21,6 +28,8 @@ lazy_static! {
|
||||
}
|
||||
idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
|
||||
idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
|
||||
idt[InterruptIndex::HardDisk1.as_usize()].set_handler_fn(disk1_interrupt_handler);
|
||||
idt[InterruptIndex::HardDisk2.as_usize()].set_handler_fn(disk2_interrupt_handler);
|
||||
idt
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
use crate::println;
|
||||
|
||||
use super::{InterruptIndex, PICS};
|
||||
use x86_64::structures::idt::InterruptStackFrame;
|
||||
|
||||
fn disk_interrupt_handler(disk: u16) {
|
||||
println!("Received disk {} interrupt", disk);
|
||||
}
|
||||
|
||||
pub extern "x86-interrupt" fn disk1_interrupt_handler(_stack_frame: InterruptStackFrame) {
|
||||
disk_interrupt_handler(1);
|
||||
unsafe {
|
||||
PICS.lock()
|
||||
.notify_end_of_interrupt(InterruptIndex::HardDisk1.as_u8());
|
||||
}
|
||||
}
|
||||
|
||||
pub extern "x86-interrupt" fn disk2_interrupt_handler(_stack_frame: InterruptStackFrame) {
|
||||
disk_interrupt_handler(2);
|
||||
unsafe {
|
||||
PICS.lock()
|
||||
.notify_end_of_interrupt(InterruptIndex::HardDisk2.as_u8());
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,11 @@ use crate::println;
|
||||
pub use keyboard::keyboard_interrupt_handler;
|
||||
use pic8259::ChainedPics;
|
||||
pub use pit::timer_interrupt_handler;
|
||||
pub use disk::{disk1_interrupt_handler, disk2_interrupt_handler};
|
||||
|
||||
pub mod keyboard;
|
||||
pub mod pit;
|
||||
pub mod disk;
|
||||
|
||||
pub const PIC_1_OFFSET: u8 = 32;
|
||||
pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
|
||||
@@ -14,6 +16,8 @@ pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
|
||||
pub enum InterruptIndex {
|
||||
Timer = PIC_1_OFFSET,
|
||||
Keyboard,
|
||||
HardDisk1 = PIC_1_OFFSET + 14,
|
||||
HardDisk2 = PIC_1_OFFSET + 15,
|
||||
}
|
||||
|
||||
impl InterruptIndex {
|
||||
|
||||