From 890bac538171d231d1dccfb4b28091d016ec6118 Mon Sep 17 00:00:00 2001 From: Tianhao Wang Date: Wed, 29 May 2024 04:35:57 +0200 Subject: multiboot: get memory info from MB info Signed-off-by: Tianhao Wang --- src/lib.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 3651a81..25a8768 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -28,9 +28,12 @@ pub extern "C" fn _entry() -> ! { // init code io::set_attr(0x1f); io::clear_screen(); - assert!(multiboot::check_magic(), "bad multiboot magic!"); + assert!(multiboot::check(), "bad multiboot info from grub!"); let mbi = multiboot::get_mb_info().expect("bad multiboot info flags"); - println!("MB INFO: {:#X?}", mbi); + let mem = unsafe { mbi.get_mem() }.unwrap(); + let mmap = unsafe { mbi.get_mmap() }.unwrap(); + println!("memory: {:#X?}", mem); + println!("mmap (start): {:#X?}", mmap); interrupt::init(); pic_8259::allow(PicDeviceInt::KEYBOARD); interrupt::interrupt_enable(); -- cgit v1.2.3-70-g09d2