jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove log

Browse source
This commit is contained in:
wescande 2018-03-08 15:10:32 +01:00
parent 11c3614060
commit 0d8ecdf191
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kernel-rs/src/acpi/rsdp.rs
View file

@ -30,7 +30,6 @@ pub fn load(addr: u32) -> Result <bool, &'static str> {
let ptr_tmp = addr as *const RSDP20; let ptr_tmp = addr as *const RSDP20;
let revision = unsafe {(*ptr_tmp).rsdp.revision}; let revision = unsafe {(*ptr_tmp).rsdp.revision};
if (revision == 0 && check_checksum(addr, mem::size_of::<RSDP>())) || (revision == 2 && check_checksum(addr, mem::size_of::<RSDP20>())) { if (revision == 0 && check_checksum(addr, mem::size_of::<RSDP>())) || (revision == 2 && check_checksum(addr, mem::size_of::<RSDP20>())) {
println!("REAL FOUND AT {:x}", addr);
unsafe {RSDPTR = Some(ptr_tmp)}; unsafe {RSDPTR = Some(ptr_tmp)};
return Ok(revision == 2); return Ok(revision == 2);
} }

2
kernel-rs/src/lib.rs
View file

@ -28,10 +28,8 @@ fn init_kernel(multiboot_information_address: usize) -> Result <(), &'static str
unsafe { CONTEXT.boot_info_addr = multiboot_information_address }; unsafe { CONTEXT.boot_info_addr = multiboot_information_address };
let mtboot = unsafe { multiboot2::load(multiboot_information_address)}; let mtboot = unsafe { multiboot2::load(multiboot_information_address)};
if let Some(rsdp) = mtboot.rsdp_v2_tag() { if let Some(rsdp) = mtboot.rsdp_v2_tag() {
println!("rsdp at {:x}", rsdp);
acpi::load(rsdp)?; acpi::load(rsdp)?;
} else if let Some(rsdp) = mtboot.rsdp_tag() { } else if let Some(rsdp) = mtboot.rsdp_tag() {
println!("rsdp2 at {:x}", rsdp);
acpi::load(rsdp)?; acpi::load(rsdp)?;
} }
else { else {