From 2ab9afcbc478d0d6a2f8153883d875a60e737b43 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 8 Feb 2022 12:27:48 -0700
Subject: [PATCH] Move disk to OS abstraction
---
src/lib.rs | 4 ++--
src/{ => os/bios}/disk.rs | 0
src/os/bios/mod.rs | 3 +++
src/os/mod.rs | 11 +++++++++++
src/os/uefi/mod.rs | 0
5 files changed, 16 insertions(+), 2 deletions(-)
rename src/{ => os/bios}/disk.rs (100%)
create mode 100644 src/os/bios/mod.rs
create mode 100644 src/os/mod.rs
create mode 100644 src/os/uefi/mod.rs
diff --git a/src/lib.rs b/src/lib.rs
index a9f0cc3..87a5cc4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,7 +22,7 @@ use linked_list_allocator::LockedHeap;
use log::error;
use spin::Mutex;
-use self::disk::DiskBios;
+use self::os::DiskBios;
use self::logger::LOGGER;
use self::memory_map::memory_map;
use self::thunk::ThunkData;
@@ -32,9 +32,9 @@ use self::vga::{VgaTextBlock, VgaTextColor, Vga};
#[macro_use]
mod macros;
-mod disk;
mod logger;
mod memory_map;
+mod os;
mod paging;
mod panic;
mod thunk;
diff --git a/src/disk.rs b/src/os/bios/disk.rs
similarity index 100%
rename from src/disk.rs
rename to src/os/bios/disk.rs
diff --git a/src/os/bios/mod.rs b/src/os/bios/mod.rs
new file mode 100644
index 0000000..8ba7499
--- /dev/null
+++ b/src/os/bios/mod.rs
@@ -0,0 +1,3 @@
+pub use self::disk::DiskBios;
+
+mod disk;
diff --git a/src/os/mod.rs b/src/os/mod.rs
new file mode 100644
index 0000000..8eee9ad
--- /dev/null
+++ b/src/os/mod.rs
@@ -0,0 +1,11 @@
+#[cfg(all(target_arch = "x86", target_os = "none"))]
+pub use self::bios::*;
+
+#[cfg(all(target_arch = "x86", target_os = "none"))]
+mod bios;
+
+#[cfg(target_os = "uefi")]
+pub use self::uefi::*;
+
+#[cfg(target_os = "uefi")]
+mod uefi;
diff --git a/src/os/uefi/mod.rs b/src/os/uefi/mod.rs
new file mode 100644
index 0000000..e69de29
--
GitLab