redox_hwio: Build from crates.io on non-FreeBSD

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

Cargo.lock

@@ -39,7 +39,7 @@ rusb = { version = "0.9.4", optional = true }
 uefi = { version = "0.20", features = ["alloc"] }
 uefi-services = "0.17"
 plain = "0.2.3"
-redox_hwio = { git = "https://github.com/FrameworkComputer/rust-hwio", branch = "freebsd", default-features = false }
+redox_hwio = { version = "0.1.6", default-features = false }
 smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }
 guid-create-no-std = { package = "guid-create", git = "https://github.com/FrameworkComputer/guid-create", branch = "no_std", default-features = false }
 
@@ -56,14 +56,19 @@ guid-create = "0.4.1"
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.155"
 nix = { version = "0.29.0", features = ["ioctl", "user"] }
-redox_hwio = { git = "https://github.com/FrameworkComputer/rust-hwio", branch = "freebsd" }
 smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std" }
 env_logger = "0.11"
 clap = { version = "4.5", features = ["derive", "cargo"] }
 clap-num = { version = "1.2.0" }
 clap-verbosity-flag = { version = "2.2.1" }
 guid-create = "0.4.1"
 
+[target.'cfg(target_os="linux")'.dependencies]
+redox_hwio = "0.1.6"
+
+[target.'cfg(target_os="freebsd")'.dependencies]
+redox_hwio_freebsd = { package = "redox_hwio", git = "https://github.com/FrameworkComputer/rust-hwio", branch = "freebsd" }
+
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.59.0"
 features = [

framework_lib/Cargo.toml

@@ -4,8 +4,10 @@ use alloc::string::ToString;
 use alloc::vec;
 use alloc::vec::Vec;
 use core::convert::TryInto;
-#[cfg(not(windows))]
+#[cfg(all(not(windows), not(target_os = "freebsd")))]
 use hwio::{Io, Pio};
+#[cfg(target_os = "freebsd")]
+use hwio_freebsd::{Io, Pio};
 #[cfg(target_os = "linux")]
 use libc::ioperm;
 use log::Level;

framework_lib/src/chromium_ec/portio.rs

@@ -4,7 +4,10 @@ use alloc::vec::Vec;
 
 use log::Level;
 
+#[cfg(all(not(windows), not(target_os = "freebsd")))]
 use hwio::{Io, Pio};
+#[cfg(target_os = "freebsd")]
+use hwio_freebsd::{Io, Pio};
 #[cfg(target_os = "linux")]
 use libc::ioperm;