From acfdf929adf20568464a30b5e0ca54153abdc6cd Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Thu, 25 Apr 2019 18:38:16 +0200
Subject: [PATCH] Move PIC initialization and interrupt::enable to
 blog_os::init

---
 src/lib.rs  | 2 ++
 src/main.rs | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 22505b92..510d97ae 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,6 +15,8 @@ pub mod vga_buffer;
 pub fn init() {
     gdt::init();
     interrupts::init_idt();
+    unsafe { interrupts::PICS.lock().initialize() };
+    x86_64::instructions::interrupts::enable();
 }
 
 pub fn test_runner(tests: &[&dyn Fn()]) {
diff --git a/src/main.rs b/src/main.rs
index 075daeda..f6bc790e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,13 +9,9 @@ use core::panic::PanicInfo;
 
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
-    use blog_os::interrupts::PICS;
-
     println!("Hello World{}", "!");
 
     blog_os::init();
-    unsafe { PICS.lock().initialize() };
-    x86_64::instructions::interrupts::enable();
 
     #[cfg(test)]
     test_main();