From 40334044aaba267935aec1db8fded0b63d2f36a5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 2 Mar 2023 17:54:36 -0700 Subject: [PATCH] Revert "Make acpid a no-op on i686 until aml crate issue is fixed" This reverts commit 6cd802b9b4e53468ad1855a78fb73726cb74f0e8. --- acpid/Cargo.toml | 5 +---- acpid/src/main.rs | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/acpid/Cargo.toml b/acpid/Cargo.toml index a7facd3c43..451f0daeec 100644 --- a/acpid/Cargo.toml +++ b/acpid/Cargo.toml @@ -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" diff --git a/acpid/src/main.rs b/acpid/src/main.rs index 50d59b06bb..34bb3b0626 100644 --- a/acpid/src/main.rs +++ b/acpid/src/main.rs @@ -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"); }