From 038867921e18403af2171350b78336a66d9ba4d7 Mon Sep 17 00:00:00 2001
From: WangRunji <wangrunji0408@163.com>
Date: Tue, 17 Apr 2018 15:32:53 +0800
Subject: [PATCH] Move device init to arch mod

---
 src/arch/x86_64/driver/mod.rs | 27 ++++++++++++++++++++++++++-
 src/lib.rs                    | 24 +++++-------------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/arch/x86_64/driver/mod.rs b/src/arch/x86_64/driver/mod.rs
index 5a93241..5322417 100644
--- a/src/arch/x86_64/driver/mod.rs
+++ b/src/arch/x86_64/driver/mod.rs
@@ -4,4 +4,29 @@ pub mod apic;
 pub mod mp;
 pub mod serial;
 pub mod pic;
-pub mod console;
\ No newline at end of file
+pub mod console;
+
+pub fn init<F>(mut page_map: F)
+    where F: FnMut(usize) {
+    // TODO Handle this temp page map.
+    page_map(0); // EBDA
+    for addr in (0xE0000 .. 0x100000).step_by(0x1000) {
+        page_map(addr);
+    }
+    page_map(0x7fe1000); // RSDT
+
+    let acpi = acpi::init().expect("Failed to init ACPI");
+    debug!("{:?}", acpi);
+
+    if cfg!(feature = "use_apic") {
+        pic::disable();
+
+        page_map(acpi.lapic_addr as usize);  // LAPIC
+        page_map(0xFEC00000);  // IOAPIC
+
+        apic::init(acpi.lapic_addr, acpi.ioapic_id);
+    } else {
+        pic::init();
+    }
+    console::init();
+}
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 666b7b3..cec60c3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,7 @@
 #![feature(global_allocator)]
 #![feature(abi_x86_interrupt)]
 #![feature(iterator_step_by)]
+#![feature(unboxed_closures)]
 #![no_std]
 
 
@@ -68,26 +69,11 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) {
     test!(guard_page);
     test!(find_mp);
 
-    // TODO Handle this temp page map.
-    memory_controller.map_page_identity(0); // EBDA
-    for addr in (0xE0000 .. 0x100000).step_by(0x1000) {
-        memory_controller.map_page_identity(addr);
-    }
-    memory_controller.map_page_identity(0x7fe1000); // RSDT
-    memory_controller.print_page_table();
-    let acpi = arch::driver::acpi::init().expect("Failed to init ACPI");
-    debug!("{:?}", acpi);
-
-    if cfg!(feature = "use_apic") {
-        arch::driver::pic::disable(); 
-
-        memory_controller.map_page_identity(acpi.lapic_addr as usize);  // LAPIC
-        memory_controller.map_page_identity(0xFEC00000);  // IOAPIC
-        arch::driver::apic::init(acpi.lapic_addr, acpi.ioapic_id);
-    } else {
-        arch::driver::pic::init();
-    }
+    arch::driver::init(|addr: usize| memory_controller.map_page_identity(addr));
+    // memory_controller.print_page_table();
+
     unsafe{ arch::interrupt::enable(); }
+    loop{}
 
     test_end!();
 }