Commit 5db374a

authored

Merge pull request #789 from nicholasbishop/bishop-raw-addr-types

Add PhysicalAddress/VirtualAddress to uefi-raw and use them from uefi

2 parents 17e5aa0 + d82019d commit 5db374aCopy full SHA for 5db374a

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,11 @@ mod status;`
`24`	`24`
`25`	`25`	`pub use status::Status;`
`26`	`26`	`pub use uguid::{guid, Guid};`
	`27`	`+`
	`28`	`+/// Physical memory address. This is always a 64-bit value, regardless`
	`29`	`+/// of target platform.`
	`30`	`+pub type PhysicalAddress = u64;`
	`31`	`+`
	`32`	`+/// Virtual memory address. This is always a 64-bit value, regardless`
	`33`	`+/// of target platform.`
	`34`	`+pub type VirtualAddress = u64;`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,14 +113,6 @@ pub trait Align {`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`-/// Physical memory address. This is always a 64-bit value, regardless`
`117`		`-/// of target platform.`
`118`		`-pub type PhysicalAddress = u64;`
`119`		`-`
`120`		`-/// Virtual memory address. This is always a 64-bit value, regardless`
`121`		`-/// of target platform.`
`122`		`-pub type VirtualAddress = u64;`
`123`		`-`
`124`	`116`	`mod guid;`
`125`	`117`	`pub use self::guid::{Guid, Identify};`
`126`	`118`
`@@ -143,6 +135,8 @@ pub use self::owned_strs::{CString16, FromStrError};`
`143`	`135`	`mod unaligned_slice;`
`144`	`136`	`pub use unaligned_slice::UnalignedSlice;`
`145`	`137`
	`138`	`+pub use uefi_raw::{PhysicalAddress, VirtualAddress};`
	`139`	`+`
`146`	`140`	`#[cfg(test)]`
`147`	`141`	`mod tests {`
`148`	`142`	`use super::*;`

Comments

(0)