diff options
Diffstat (limited to 'src/arch/x86_64')
| -rw-r--r-- | src/arch/x86_64/interrupt/pic_8259.rs | 4 | ||||
| -rw-r--r-- | src/arch/x86_64/mem.rs | 4 | ||||
| -rw-r--r-- | src/arch/x86_64/mod.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/x86_64/interrupt/pic_8259.rs b/src/arch/x86_64/interrupt/pic_8259.rs index 43a102c..894697c 100644 --- a/src/arch/x86_64/interrupt/pic_8259.rs +++ b/src/arch/x86_64/interrupt/pic_8259.rs @@ -38,9 +38,9 @@ pub fn forbid(interrupt: u8) { pub fn is_masked(interrupt: u8) -> bool { if interrupt < 8 { let val = inb(IMR1); - return val & (interrupt) != 0; + val & (interrupt) != 0 } else { let val = inb(IMR2); - return val & (interrupt - 8) != 0; + val & (interrupt - 8) != 0 } } diff --git a/src/arch/x86_64/mem.rs b/src/arch/x86_64/mem.rs index 52ccdec..bce0c82 100644 --- a/src/arch/x86_64/mem.rs +++ b/src/arch/x86_64/mem.rs @@ -1,14 +1,14 @@ // to detect available memory to initialize PMA // https://wiki.osdev.org/Detecting_Memory_(x86) -use core::arch::asm; use crate::io::*; +use core::arch::asm; extern "C" { fn do_e820(start: usize) -> u32; } // Getting an E820 Memory Map -- osdev wiki -pub fn prob_mem_bios(){ +pub fn prob_mem_bios() { unsafe { let res = do_e820(0x8000); println!("res is {}", res) diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs index c3b226e..715c19f 100644 --- a/src/arch/x86_64/mod.rs +++ b/src/arch/x86_64/mod.rs @@ -1,5 +1,5 @@ pub mod cpu; pub mod interrupt; pub mod io_port; -pub mod misc; pub mod mem; +pub mod misc; |