Revert "Make acpid a no-op on i686 until aml crate issue is fixed"

This reverts commit 6cd802b9b4.
This commit is contained in:
Jeremy Soller
2023-03-02 17:54:36 -07:00
parent 6cd802b9b4
commit 40334044aa
2 changed files with 1 additions and 8 deletions
+1 -4
View File
@@ -16,8 +16,5 @@ redox-daemon = "0.1"
redox-log = "0.1.1"
redox_syscall = "0.3"
thiserror = "1"
rustc-hash = "1.1.0"
#TODO: https://github.com/rust-osdev/acpi/issues/146
[target.'cfg(target_arch = "x86_64")'.dependencies]
aml = "0.16.2"
rustc-hash = "1.1.0"
-4
View File
@@ -14,9 +14,7 @@ use syscall::scheme::SchemeMut;
use syscall::data::{Event, Packet};
use syscall::flag::{EventFlags, O_NONBLOCK};
#[cfg(target_arch = "x86_64")] // TODO: https://github.com/rust-osdev/acpi/issues/146
mod acpi;
#[cfg(target_arch = "x86_64")] // TODO: https://github.com/rust-osdev/acpi/issues/146
mod scheme;
fn monotonic() -> (u64, u64) {
@@ -80,7 +78,6 @@ fn setup_logging() -> Option<&'static RedoxLogger> {
}
}
#[cfg(target_arch = "x86_64")] // TODO: https://github.com/rust-osdev/acpi/issues/146
fn daemon(daemon: redox_daemon::Daemon) -> ! {
setup_logging();
@@ -223,6 +220,5 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
}
fn main() {
#[cfg(target_arch = "x86_64")] // TODO: https://github.com/rust-osdev/acpi/issues/146
redox_daemon::Daemon::new(daemon).expect("acpid: failed to daemonize");
}