refactor: move none and uefi modules into os module

Signed-off-by: Martin Kröning <[email protected]>
hermit-os · Apr 9, 2024 · 95224fb · 95224fb
1 parent 32e5356
commit 95224fb
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 
 [dependencies]
 align-address = "0.1"
+cfg-if = "1"
 hermit-entry = { version = "0.9", features = ["loader"] }
 log = "0.4"
 one-shot-mutex = "0.1"

diff --git a/src/arch/riscv64/start.rs b/src/arch/riscv64/start.rs
@@ -52,7 +52,7 @@ extern "C" fn start(hart_id: usize, fdt: *const u8) -> ! {
 	HART_ID.store(hart_id, Ordering::Relaxed);
 	FDT.store(fdt.cast_mut(), Ordering::Relaxed);
 
-	unsafe { crate::none::loader_main() }
+	unsafe { crate::os::loader_main() }
 }
 
 // Align to page size

diff --git a/src/main.rs b/src/main.rs
@@ -14,10 +14,7 @@ mod arch;
 mod console;
 #[cfg(target_os = "none")]
 mod log;
-#[cfg(target_os = "none")]
-mod none;
-#[cfg(target_os = "uefi")]
-mod uefi;
+mod os;
 
 #[cfg(any(
 	target_os = "uefi",

diff --git a/src/os/mod.rs b/src/os/mod.rs
@@ -0,0 +1,11 @@
+#![allow(unused_imports)]
+
+cfg_if::cfg_if! {
+	if #[cfg(target_os = "none")] {
+		mod none;
+		pub use self::none::*;
+	} else if #[cfg(target_os = "uefi")] {
+		mod uefi;
+		pub use self::uefi::*;
+	}
+}
diff --git a/src/none.rs → src/os/none.rs b/src/none.rs → src/os/none.rs
diff --git a/src/uefi.rs → src/os/uefi.rs b/src/uefi.rs → src/os/uefi.rs