merge

kernel/src/arch/x86_64/interrupts.rs

@@ -1,6 +1,6 @@
 use libk::drivers::apic::enable_apic;
-use libk::drivers::pic::ChainedPics;
 use libk::prelude::*;
+use pic8259::ChainedPics;
 use x86_64::registers::control::Cr2;
 use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
 
@@ -22,8 +22,8 @@ static IDT: Lazy<InterruptDescriptorTable> = Lazy::new(|| {
         .set_handler_fn(general_protection_fault_handler);
     idt.page_fault.set_handler_fn(page_fault_handler);
 
-    // idt[InterruptIndex::Timer.as_u8()].set_handler_fn(timer_interrupt_handler);
-    // idt[InterruptIndex::Keyboard.as_u8()].set_handler_fn(keyboard_interrupt_handler);
+    idt[InterruptIndex::Timer.as_u8()].set_handler_fn(timer_interrupt_handler);
+    idt[InterruptIndex::Keyboard.as_u8()].set_handler_fn(keyboard_interrupt_handler);
     idt
 });
 

kernel/src/main.rs

@@ -5,8 +5,8 @@ extern crate alloc;
 
 use libk::{
     drivers::{
+        async_io::task::{Executor, Task},
         io,
-        scheduling::task::{Executor, Task},
     },
     prelude::*,
     util::shell::shell,