Allow building without hidapi

Useful for FreeBSD crossbuild, but we also don't have support for it in
UEFI right now.

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

framework_lib/Cargo.toml

@@ -9,12 +9,14 @@ build = "build.rs"
 default = ["linux"]
 # Linux/FreeBSD
 unix = ["std", "raw_pio", "smbios", "dep:nix", "dep:libc"]
-linux = ["unix", "linux_pio", "cros_ec_driver"]
-freebsd = ["unix", "freebsd_pio"]
+linux = ["unix", "linux_pio", "cros_ec_driver", "hidapi"]
+freebsd = ["unix", "freebsd_pio", "hidapi"]
+cross_freebsd = ["unix", "freebsd_pio"]
 # Windows does not have the cros_ec driver nor raw port I/O access to userspace
-windows = ["std", "smbios", "dep:windows", "win_driver", "raw_pio"]
+windows = ["std", "smbios", "dep:windows", "win_driver", "raw_pio", "hidapi"]
 smbios = ["dep:smbios-lib"]
-std = ["dep:clap", "dep:clap-verbosity-flag", "dep:env_logger", "smbios-lib?/std", "dep:hidapi", "dep:rusb"]
+std = ["dep:clap", "dep:clap-verbosity-flag", "dep:env_logger", "smbios-lib?/std", "dep:rusb"]
+hidapi = ["dep:hidapi"]
 uefi = [
     "dep:plain", "raw_pio", "smbios", "lazy_static/spin_no_std", "dep:uefi", "dep:uefi-services",
     # Otherwise I get: `LLVM ERROR: Do not know how to split the result of this operator!`

framework_lib/src/ccgx/mod.rs

@@ -11,7 +11,7 @@ use self::device::{PdController, PdPort};
 
 pub mod binary;
 pub mod device;
-#[cfg(not(feature = "uefi"))]
+#[cfg(feature = "hidapi")]
 pub mod hid;
 
 const FW1_METADATA_ROW: u32 = 0x1FE;

framework_lib/src/commandline/mod.rs

@@ -27,7 +27,7 @@ use crate::capsule_content::{
     find_bios_version, find_ec_in_bios_cap, find_pd_in_bios_cap, find_retimer_version,
 };
 use crate::ccgx::device::{PdController, PdPort};
-#[cfg(not(feature = "uefi"))]
+#[cfg(feature = "hidapi")]
 use crate::ccgx::hid::{check_ccg_fw_version, find_devices, DP_CARD_PID, HDMI_CARD_PID};
 use crate::ccgx::{self, SiliconId::*};
 use crate::chromium_ec;
@@ -48,7 +48,7 @@ use crate::smbios::{dmidecode_string_val, get_smbios, is_framework};
 use crate::uefi::enable_page_break;
 use crate::util;
 use crate::util::Config;
-#[cfg(not(feature = "uefi"))]
+#[cfg(feature = "hidapi")]
 use hidapi::HidApi;
 use sha2::{Digest, Sha256, Sha384, Sha512};
 //use smbioslib::*;
@@ -197,15 +197,15 @@ fn print_pd_details(ec: &CrosEc) {
     print_single_pd_details(&pd_23);
 }
 
-#[cfg(not(feature = "uefi"))]
+#[cfg(feature = "hidapi")]
 const NOT_SET: &str = "NOT SET";
 
 #[cfg(not(feature = "uefi"))]
 fn print_audio_card_details() {
     check_synaptics_fw_version();
 }
 
-#[cfg(not(feature = "uefi"))]
+#[cfg(feature = "hidapi")]
 fn print_dp_hdmi_details() {
     match HidApi::new() {
         Ok(api) => {
@@ -270,7 +270,7 @@ fn print_tool_version() {
 }
 
 // TODO: Check if HDMI card is same
-#[cfg(not(feature = "uefi"))]
+#[cfg(feature = "hidapi")]
 fn flash_dp_hdmi_card(pd_bin_path: &str) {
     let data = match fs::read(pd_bin_path) {
         Ok(data) => Some(data),
@@ -616,12 +616,12 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
     } else if args.pd_info {
         print_pd_details(&ec);
     } else if args.dp_hdmi_info {
-        #[cfg(not(feature = "uefi"))]
+        #[cfg(feature = "hidapi")]
         print_dp_hdmi_details();
     } else if let Some(pd_bin_path) = &args.dp_hdmi_update {
-        #[cfg(not(feature = "uefi"))]
+        #[cfg(feature = "hidapi")]
         flash_dp_hdmi_card(pd_bin_path);
-        #[cfg(feature = "uefi")]
+        #[cfg(not(feature = "hidapi"))]
         let _ = pd_bin_path;
     } else if args.audio_card_info {
         #[cfg(not(feature = "uefi"))]