Skip to content
Merged
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
5 changes: 5 additions & 0 deletions framework_lib/src/commandline/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ use crate::touchpad::print_touchpad_fw_ver;
use crate::touchscreen;
#[cfg(feature = "uefi")]
use crate::uefi::enable_page_break;
#[cfg(feature = "rusb")]
use crate::usbhub::check_usbhub_version;
use crate::util::{self, Config, Platform, PlatformFamily};
#[cfg(feature = "hidapi")]
use hidapi::HidApi;
Expand Down Expand Up @@ -705,6 +707,9 @@ fn print_versions(ec: &CrosEc) {
#[cfg(feature = "rusb")]
let _ignore_err = check_camera_version();

#[cfg(feature = "rusb")]
let _ignore_err = check_usbhub_version();

#[cfg(feature = "rusb")]
let _ignore_err = check_inputmodule_version();

Expand Down
2 changes: 2 additions & 0 deletions framework_lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ pub mod touchpad;
pub mod touchscreen;
#[cfg(all(feature = "hidapi", windows))]
pub mod touchscreen_win;
#[cfg(feature = "rusb")]
pub mod usbhub;

#[cfg(feature = "uefi")]
#[macro_use]
Expand Down
26 changes: 26 additions & 0 deletions framework_lib/src/usbhub.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
pub const REALTEK_VID: u16 = 0x0BDA;
pub const RTL5432_PID: u16 = 0x5432;
pub const RTL5424_PID: u16 = 0x5424;

/// Get and print the firmware version of the usbhub
pub fn check_usbhub_version() -> Result<(), rusb::Error> {
for dev in rusb::devices().unwrap().iter() {
let dev_descriptor = dev.device_descriptor().unwrap();
if dev_descriptor.vendor_id() != REALTEK_VID
|| (dev_descriptor.product_id() != RTL5432_PID
&& dev_descriptor.product_id() != RTL5424_PID)
{
debug!(
"Skipping {:04X}:{:04X}",
dev_descriptor.vendor_id(),
dev_descriptor.product_id()
);
continue;
}

let dev_descriptor = dev.device_descriptor()?;
println!("USB Hub RTL{:04X}", dev_descriptor.product_id());
println!(" Firmware Version: {}", dev_descriptor.device_version());
}
Ok(())
}
Loading