Jika/redox-kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation without ACPI feature

Browse Source
This commit is contained in:
Jeremy Soller
2022-11-16 13:53:04 -07:00
parent 111606ccdc
commit 1e81c9d78b
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/arch/x86/time.rs
View File

@@ -1,8 +1,10 @@
use crate::acpi::ACPI_TABLE;
use super::device::{hpet, pit};
#[cfg(feature = "acpi")]
use super::device::hpet;
use super::device::pit;
pub fn counter() -> u128 {
if let Some(ref hpet) = *ACPI_TABLE.hpet.read() {
#[cfg(feature = "acpi")]
if let Some(ref hpet) = *crate::acpi::ACPI_TABLE.hpet.read() {
//TODO: handle rollover?
//TODO: improve performance
@@ -20,11 +22,11 @@ pub fn counter() -> u128 {
// Calculate ticks since last interrupt
let elapsed = counter.saturating_sub(last_interrupt);
// Calculate nanoseconds since last interrupt
(elapsed as u128 * period_fs as u128) / 1_000_000
} else {
// Read ticks since last interrupt
let elapsed = unsafe { pit::read() };
// Calculate nanoseconds since last interrupt
(elapsed as u128 * pit::PERIOD_FS) / 1_000_000
return (elapsed as u128 * period_fs as u128) / 1_000_000;
}
// Read ticks since last interrupt
let elapsed = unsafe { pit::read() };
// Calculate nanoseconds since last interrupt
(elapsed as u128 * pit::PERIOD_FS) / 1_000_000
}

20
src/arch/x86_64/time.rs
View File

@@ -1,8 +1,10 @@
use crate::acpi::ACPI_TABLE;
use super::device::{hpet, pit};
#[cfg(feature = "acpi")]
use super::device::hpet;
use super::device::pit;
pub fn counter() -> u128 {
if let Some(ref hpet) = *ACPI_TABLE.hpet.read() {
#[cfg(feature = "acpi")]
if let Some(ref hpet) = *crate::acpi::ACPI_TABLE.hpet.read() {
//TODO: handle rollover?
//TODO: improve performance
@@ -20,11 +22,11 @@ pub fn counter() -> u128 {
// Calculate ticks since last interrupt
let elapsed = counter.saturating_sub(last_interrupt);
// Calculate nanoseconds since last interrupt
(elapsed as u128 * period_fs as u128) / 1_000_000
} else {
// Read ticks since last interrupt
let elapsed = unsafe { pit::read() };
// Calculate nanoseconds since last interrupt
(elapsed as u128 * pit::PERIOD_FS) / 1_000_000
return (elapsed as u128 * period_fs as u128) / 1_000_000;
}
// Read ticks since last interrupt
let elapsed = unsafe { pit::read() };
// Calculate nanoseconds since last interrupt
(elapsed as u128 * pit::PERIOD_FS) / 1_000_000
}