diff --git a/src/kernel/arch/x86_64/paging.rs b/src/kernel/arch/x86_64/paging.rs index 00c4362..ae4ef9f 100644 --- a/src/kernel/arch/x86_64/paging.rs +++ b/src/kernel/arch/x86_64/paging.rs @@ -3,8 +3,12 @@ #![allow(dead_code)] -use crate::{format, log_info, memory::HHDM_RESPONSE, LogLevel, LOGGER}; -use x86_64::{registers::control::*, structures::paging::{Page, PageTable, PageTableFlags}, PhysAddr, VirtAddr}; +use crate::{LOGGER, LogLevel, format, log_info, memory::HHDM_RESPONSE}; +use x86_64::{ + PhysAddr, VirtAddr, + registers::control::*, + structures::paging::{PageTable, PageTableFlags}, +}; pub fn get_mappings() { log_info!("Paging: {}", Cr0::read().contains(Cr0Flags::PAGING)); @@ -53,15 +57,23 @@ fn iter_table(table: &'static mut PageTable, level: usize) { if level == 1 { for page_entry in table.iter() { if page_entry.flags().contains(PageTableFlags::PRESENT) { - log_info!("Page entry: 0x{:x}, flags: {:?}", page_entry.addr(), page_entry.flags()); + log_info!( + "Page entry: 0x{:x}, flags: {:?}", + page_entry.addr(), + page_entry.flags() + ); } } } else { for table_entry in table.iter() { if table_entry.flags().contains(PageTableFlags::PRESENT) { - log_info!("Table entry: 0x{:x}, flags: {:?}", table_entry.addr(), table_entry.flags()); + log_info!( + "Table entry: 0x{:x}, flags: {:?}", + table_entry.addr(), + table_entry.flags() + ); iter_table(table_from_phys_addr(table_entry.addr()), level - 1); } } } -} \ No newline at end of file +} diff --git a/src/kernel/arch/x86_64/serial.rs b/src/kernel/arch/x86_64/serial.rs index 126979b..b4ea02e 100644 --- a/src/kernel/arch/x86_64/serial.rs +++ b/src/kernel/arch/x86_64/serial.rs @@ -138,7 +138,6 @@ impl SerialPort { self.write_char(c); } } - } pub fn is_transmit_empty(&mut self) -> bool { diff --git a/src/kernel/main.rs b/src/kernel/main.rs index 1ba9978..a5d0e2f 100644 --- a/src/kernel/main.rs +++ b/src/kernel/main.rs @@ -34,7 +34,7 @@ use lazy_static::lazy_static; use limine::firmware_type::FirmwareType; use spin::mutex::Mutex; -use crate::{arch::x86_64::cpuid::{CPUID, virt_supported}, panic::panic}; +use crate::arch::x86_64::cpuid::{CPUID, virt_supported}; lazy_static! { pub static ref SERIAL_3F8: Mutex =