aboutsummaryrefslogtreecommitdiff
path: root/src/shared/mod.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/mod.rs')
-rw-r--r--src/shared/mod.rs13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/shared/mod.rs b/src/shared/mod.rs
index 167d7d3..6613f54 100644
--- a/src/shared/mod.rs
+++ b/src/shared/mod.rs
@@ -5,6 +5,7 @@ pub mod descriptor;
pub mod dtables;
pub mod io;
pub mod irq;
+pub mod msr;
pub mod paging;
pub mod flags;
pub mod segmentation;
@@ -75,11 +76,6 @@ bitflags!(
}
);
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum Msr {
- ApicBase = 0x1B
-}
-
#[inline(always)]
pub fn cpuid(function: u32) -> (u32, u32, u32, u32) {
unsafe {
@@ -97,13 +93,6 @@ pub fn supports() -> Features {
}
}
-#[inline(always)]
-pub unsafe fn read_msr(msr: Msr) -> u64 {
- let (r1, r2): (u32, u32);
- asm!("rdmsr" : "={eax}"(r1), "={edx}"(r2) : "{ecx}"(msr as u32) :: "intel");
- r1 as u64 | ((r2 as u64) << 32)
-}
-
#[derive(Copy, Clone, PartialEq, Eq)]
#[repr(u8)]
pub enum PrivilegeLevel {