Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
1 parent
b2ffbc34b5
commit
43eec9621c
17 files changed
+112
-132
No files matched your search
@@ -4,12 +4,8 @@ use crate::memory::gdt;
|
||||
use crate::println;
|
||||
use lazy_static::lazy_static;
|
||||
use pic::{
|
||||
init_pic,
|
||||
keyboard_interrupt_handler,
|
||||
timer_interrupt_handler,
|
||||
disk1_interrupt_handler,
|
||||
disk2_interrupt_handler,
|
||||
InterruptIndex
|
||||
disk1_interrupt_handler, disk2_interrupt_handler, init_pic, keyboard_interrupt_handler,
|
||||
timer_interrupt_handler, InterruptIndex,
|
||||
};
|
||||
use x86_64::structures::idt::PageFaultErrorCode;
|
||||
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use crate::println;
|
||||
pub use disk::{disk1_interrupt_handler, disk2_interrupt_handler};
|
||||
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 disk;
|
||||
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;
|
||||
@@ -35,7 +35,7 @@ pub static PICS: spin::Mutex<ChainedPics> =
|
||||
|
||||
pub fn init_pic() {
|
||||
println!("Initializing PIC");
|
||||
unsafe {
|
||||
unsafe {
|
||||
PICS.lock().initialize();
|
||||
PICS.lock().write_masks(0b10111000, 0b00001110);
|
||||
};
|
||||
|
||||