Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 63 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions framework_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ guid-create = { version = "0.5.0", default-features = false }
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 }
smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }
redox_hwio = { version = "0.1.6", default-features = false }
smbios-lib-no-std = { package = "smbios-lib", git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }

[target.'cfg(windows)'.dependencies]
wmi = "0.15.0"
smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std" }
smbios-lib = "0.9.2"
env_logger = "0.11"
clap = { version = "4.5", features = ["derive", "cargo"] }
clap-num = { version = "1.2.0" }
Expand All @@ -56,13 +56,18 @@ winreg = "0.55.0"
[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" }
smbios-lib = "0.9.2"
env_logger = "0.11"
clap = { version = "4.5", features = ["derive", "cargo"] }
clap-num = { version = "1.2.0" }
clap-verbosity-flag = { version = "2.2.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 = [
Expand Down
4 changes: 3 additions & 1 deletion framework_lib/src/chromium_ec/portio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions framework_lib/src/chromium_ec/portio_mec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 3 additions & 0 deletions framework_lib/src/commandline/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ use crate::util::{self, Config, Platform, PlatformFamily};
use hidapi::HidApi;
use sha2::{Digest, Sha256, Sha384, Sha512};
//use smbioslib::*;
#[cfg(feature = "uefi")]
use smbios_lib_no_std::{DefinedStruct, SMBiosInformation};
#[cfg(not(feature = "uefi"))]
use smbioslib::{DefinedStruct, SMBiosInformation};

use crate::chromium_ec::{CrosEc, CrosEcDriverType, HardwareDeviceType};
Expand Down
3 changes: 3 additions & 0 deletions framework_lib/src/smbios.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ use crate::util::Config;
pub use crate::util::{Platform, PlatformFamily};
use num_derive::FromPrimitive;
use num_traits::FromPrimitive;
#[cfg(feature = "uefi")]
use smbios_lib_no_std::*;
#[cfg(not(feature = "uefi"))]
use smbioslib::*;
#[cfg(feature = "uefi")]
use spin::Mutex;
Expand Down
Loading