vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Soller
2023-03-02 12:01:24 -07:00
parent 79a9f447d2
commit 6cd802b9b4
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acpid/Cargo.toml
+4 -1
View File
@@ -16,5 +16,8 @@ redox-daemon = "0.1"
redox-log = "0.1.1"
redox_syscall = "0.3"
thiserror = "1"
aml = "0.16.2"
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"
acpid/src/main.rs
+4
View File
@@ -14,7 +14,9 @@ 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) {
@@ -78,6 +80,7 @@ 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();
@@ -220,5 +223,6 @@ 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");
}