Skip to content

Don't show retimer as unknown if none present #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnAZoidberg merged 2 commits into from
Apr 23, 2025
Merged

Don't show retimer as unknown if none present #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7ab2e
Don't show retimer as unknown if none present
JohnAZoidberg Apr 20, 2025
343f0f0
touchscreen: Only try to get version on Framework 12
JohnAZoidberg Apr 23, 2025
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
54 changes: 26 additions & 28 deletions framework_lib/src/commandline/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,50 +420,46 @@ fn print_versions(ec: &CrosEc) {
println!(" Unknown")
}

println!("Retimers");
let mut found_retimer = false;
let has_retimer = matches!(
smbios::get_platform(),
Some(Platform::IntelGen11)
| Some(Platform::IntelGen12)
| Some(Platform::IntelGen13)
| Some(Platform::IntelCoreUltra1)
);
let mut left_retimer: Option<u32> = None;
let mut right_retimer: Option<u32> = None;
if let Some(esrt) = esrt::get_esrt() {
for entry in &esrt.entries {
match entry.fw_class {
esrt::TGL_RETIMER01_GUID
| esrt::TGL_RETIMER23_GUID
| esrt::ADL_RETIMER01_GUID
| esrt::ADL_RETIMER23_GUID
| esrt::RPL_RETIMER01_GUID
| esrt::RPL_RETIMER23_GUID
| esrt::MTL_RETIMER01_GUID
| esrt::MTL_RETIMER23_GUID => {
if !found_retimer {
found_retimer = true;
}
}
_ => {}
}
match entry.fw_class {
esrt::TGL_RETIMER01_GUID
| esrt::ADL_RETIMER01_GUID
| esrt::RPL_RETIMER01_GUID
| esrt::MTL_RETIMER01_GUID => {
println!(
" Left: 0x{:X} ({})",
entry.fw_version, entry.fw_version
);
left_retimer = Some(entry.fw_version);
}
esrt::TGL_RETIMER23_GUID
| esrt::ADL_RETIMER23_GUID
| esrt::RPL_RETIMER23_GUID
| esrt::MTL_RETIMER23_GUID => {
println!(
" Right: 0x{:X} ({})",
entry.fw_version, entry.fw_version
);
right_retimer = Some(entry.fw_version);
}
_ => {}
}
}
}
if !found_retimer {
println!(" Unknown");
if has_retimer {
println!("Retimers");
if let Some(fw_version) = left_retimer {
println!(" Left: 0x{:X} ({})", fw_version, fw_version);
}
if let Some(fw_version) = right_retimer {
println!(" Right: 0x{:X} ({})", fw_version, fw_version);
}
if left_retimer.is_none() && right_retimer.is_none() {
// This means there's a bug, we should've found one but didn't
println!(" Unknown");
}
}

#[cfg(feature = "linux")]
Expand All @@ -485,7 +481,9 @@ fn print_versions(ec: &CrosEc) {
let _ignore_err = print_touchpad_fw_ver();

#[cfg(feature = "hidapi")]
let _ignore_err = touchscreen::print_fw_ver();
if let Some(Platform::Framework12IntelGen13) = smbios::get_platform() {
let _ignore_err = touchscreen::print_fw_ver();
}
}

fn print_esrt() {
Expand Down
Loading