From d82019d632a4e68c46af04c084fb6da558f7098e Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nbishop@nbishop.net>
Date: Mon, 1 May 2023 22:26:08 -0400
Subject: [PATCH] Add PhysicalAddress/VirtualAddress to uefi-raw and use them
 from uefi

---
 uefi-raw/src/lib.rs        |  8 ++++++++
 uefi/src/data_types/mod.rs | 10 ++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/uefi-raw/src/lib.rs b/uefi-raw/src/lib.rs
index 03b3cf891..04726ef3a 100644
--- a/uefi-raw/src/lib.rs
+++ b/uefi-raw/src/lib.rs
@@ -24,3 +24,11 @@ mod status;
 
 pub use status::Status;
 pub use uguid::{guid, Guid};
+
+/// Physical memory address. This is always a 64-bit value, regardless
+/// of target platform.
+pub type PhysicalAddress = u64;
+
+/// Virtual memory address. This is always a 64-bit value, regardless
+/// of target platform.
+pub type VirtualAddress = u64;
diff --git a/uefi/src/data_types/mod.rs b/uefi/src/data_types/mod.rs
index 779d691bd..9646f51f3 100644
--- a/uefi/src/data_types/mod.rs
+++ b/uefi/src/data_types/mod.rs
@@ -113,14 +113,6 @@ pub trait Align {
     }
 }
 
-/// Physical memory address. This is always a 64-bit value, regardless
-/// of target platform.
-pub type PhysicalAddress = u64;
-
-/// Virtual memory address. This is always a 64-bit value, regardless
-/// of target platform.
-pub type VirtualAddress = u64;
-
 mod guid;
 pub use self::guid::{Guid, Identify};
 
@@ -143,6 +135,8 @@ pub use self::owned_strs::{CString16, FromStrError};
 mod unaligned_slice;
 pub use unaligned_slice::UnalignedSlice;
 
+pub use uefi_raw::{PhysicalAddress, VirtualAddress};
+
 #[cfg(test)]
 mod tests {
     use super::*;