From ca42c45c5e5e9db94db27e59cb5370e55832d6ca Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Thu, 12 Nov 2015 17:06:07 +0100
Subject: [PATCH] Switch to new multiboot2 crate

---
 Cargo.toml        | 2 +-
 src/lib.rs        | 7 ++-----
 src/memory/mod.rs | 8 ++++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8bf89e50..cae65141 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ git = "https://github.com/phil-opp/bitflags.git"
 branch = "no_std"
 
 [dependencies.multiboot2]
-path = "../multiboot2"
+git = "https://github.com/phil-opp/multiboot2-elf64"
 
 [dependencies.allocator]
 path = "src/memory/alloc/allocator"
diff --git a/src/lib.rs b/src/lib.rs
index 6e6c7c22..3917bd6e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,11 +40,8 @@ pub extern fn rust_main(multiboot_address: usize) {
     use alloc::boxed::Box;
 
     vga_buffer::clear_screen();
-    if let Some(multiboot) = unsafe{multiboot2::load(multiboot_address)} {
-        memory::init(multiboot);
-    } else {
-        println!("MULTIBOOT INOFORMATION STRUCTURE INVALID");
-    }
+    let multiboot = unsafe{multiboot2::load(multiboot_address)};
+    memory::init(multiboot);
 
     let mut writer = Writer::new(Color::Blue, Color::LightGreen);
     writer.write_byte(b'H');
diff --git a/src/memory/mod.rs b/src/memory/mod.rs
index 2cb35f47..77310c87 100644
--- a/src/memory/mod.rs
+++ b/src/memory/mod.rs
@@ -14,7 +14,7 @@ pub fn init(multiboot: &Multiboot) {
     use core::cmp::max;
     use self::frame_allocator::FrameAllocator;
 
-    let kernel_end = multiboot.elf_tag().unwrap().sections().map(|s| s.addr + s.size).max()
+    let kernel_end = multiboot.elf_sections_tag().unwrap().sections().map(|s| s.addr + s.size).max()
         .unwrap() as usize;
     let multiboot_end = multiboot as *const _ as usize + multiboot.total_size as usize;
     let mut bump_pointer = BumpPointer::new(max(kernel_end, multiboot_end));
@@ -29,7 +29,7 @@ pub fn init(multiboot: &Multiboot) {
 
     let frame_stack = init_core_map(multiboot, &mut lock, bump_pointer);
 
-    let maximal_memory = multiboot.memory_area_tag().unwrap().areas().map(
+    let maximal_memory = multiboot.memory_area_tag().unwrap().memory_areas().map(
         |area| area.base_addr + area.length).max().unwrap();
     println!("maximal_memory: 0x{:x}", maximal_memory);
     alloc::init(lock, frame_stack);
@@ -41,7 +41,7 @@ fn identity_map_kernel_sections<T>(multiboot: &Multiboot, mut mapper: paging::Ma
 {
     use core::iter::range_inclusive;
 
-    for section in multiboot.elf_tag().expect("no section tag").sections() {
+    for section in multiboot.elf_sections_tag().expect("no section tag").sections() {
         let in_memory = section.flags & 0x2 != 0;
         let writable = section.flags & 0x1 != 0;
         let executable = section.flags & 0x4 != 0;
@@ -84,7 +84,7 @@ fn init_core_map(multiboot: &Multiboot, lock: &mut paging::Lock,
     lock.mapper(&mut bump_pointer).map(CORE_MAP_PAGE, true, false);
     let mut frame_stack = DynamicFrameStack::new(CORE_MAP_PAGE);
 
-    for area in multiboot.memory_area_tag().expect("no memory tag").areas() {
+    for area in multiboot.memory_area_tag().expect("no memory tag").memory_areas() {
         println!("area start {:x} length {:x}", area.base_addr, area.length);
         let start_frame = Frame::containing_address(area.base_addr as usize);
         let end_frame = Frame::containing_address((area.base_addr + area.length) as usize);