diff --git a/Cargo.lock b/Cargo.lock index 6697871..6afea4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,12 +61,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - [[package]] name = "core2" version = "0.3.3" @@ -139,7 +133,6 @@ version = "0.3.1" dependencies = [ "acid_alloc", "acpi", - "cfg-if", "enumflags2", "fdt", "flagset", diff --git a/Cargo.toml b/Cargo.toml index f06f7c7..1389d92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,22 +6,22 @@ license = "MIT" [dependencies] acid_alloc = { version = "0.1.0", features = ["alloc"] } -acpi = { version = "6.0.1", optional = true } -cfg-if = "1.0.4" enumflags2 = "0.7.12" -fdt = { git = "https://github.com/repnop/fdt", version = "0.2.0-alpha1", optional = true } flagset = "0.4.7" free-list = { version = "0.3.1", features = ["x86_64"] } intbits = "0.2.0" lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] } limine = "0.5.0" -lzma-rs = { git = "https://github.com/glaeqen/lzma-no-std-rs/", version = "0.2.0", default-features = false, optional = true } num-derive = "0.4.2" num-traits = { version = "0.2.19", default-features = false } once_cell = { version = "1.21.3", default-features = false, features = ["alloc", "critical-section"] } spin = "0.10.0" talc = "4.4.3" +# Optional Dependencies for Features tar-no-std = "0.4.2" +fdt = { git = "https://github.com/repnop/fdt", version = "0.2.0-alpha1", optional = true } +acpi = { version = "6.0.1", optional = true } +lzma-rs = { git = "https://github.com/glaeqen/lzma-no-std-rs/", version = "0.2.0", default-features = false, optional = true } [target.'cfg(target_arch = "x86_64")'.dependencies] x86_64 = "0.15.2" diff --git a/src/kernel/arch/x86_64/paging.rs b/src/kernel/arch/x86_64/paging.rs index 771fc59..5d3abaf 100644 --- a/src/kernel/arch/x86_64/paging.rs +++ b/src/kernel/arch/x86_64/paging.rs @@ -4,7 +4,7 @@ #![allow(dead_code)] use crate::constants::KERNEL_BUILD_PROFILE; -use crate::{LOGGER, LogLevel, format, log_info, memory::HHDM_RESPONSE}; +use crate::{LOGGER, LogLevel, format, log_info, log_trace, memory::HHDM_RESPONSE}; use x86_64::{ PhysAddr, VirtAddr, registers::control::*, @@ -60,7 +60,7 @@ 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!( + log_trace!( "Page entry: 0x{:x}, flags: {:?}", page_entry.addr(), page_entry.flags()