From 4c7dec80c02db70d9592bbe91f00145c0eb7a40e Mon Sep 17 00:00:00 2001
From: Tianhao Wang <shrik3@mailbox.org>
Date: Thu, 18 Apr 2024 02:29:44 +0200
Subject: interrupt: add rust binding for idt

---
 src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 9ceb409..00b8ee1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,11 +8,11 @@ mod ds;
 mod io;
 mod machine;
 mod mm;
+use arch::x86_64::interrupt;
 use arch::x86_64::interrupt::pic_8259;
 use arch::x86_64::interrupt::pic_8259::PicDeviceInt;
 use core::panic::PanicInfo;
 use machine::cgascr::CGAScreen;
-use machine::interrupt;
 
 use crate::machine::key::Modifiers;
 
@@ -26,11 +26,11 @@ fn panic(info: &PanicInfo) -> ! {
 #[no_mangle]
 pub extern "C" fn _entry() -> ! {
 	// init code
-	pic_8259::init();
-	pic_8259::allow(PicDeviceInt::KEYBOARD);
-	interrupt::interrupt_enable();
 	io::set_attr(0x1f);
 	io::clear();
+	interrupt::init();
+	pic_8259::allow(PicDeviceInt::KEYBOARD);
+	interrupt::interrupt_enable();
 	println!("--RuStuBs--");
 	println!("    _._     _,-'\"\"`-._     ~Meow");
 	println!("   (,-.`._,'(       |\\`-/|");
-- 
cgit v1.2.3-70-g09d2