Skip to content

GetCmdVersion: Don't fall back to v0 if >0xFF #250

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 1 commit into from
Jan 17, 2026
Merged

GetCmdVersion: Don't fall back to v0 if >0xFF #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions framework_lib/src/chromium_ec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,16 @@ impl CrosEc {
}
}

pub fn cmd_version_supported(&self, cmd: u16, version: u8) -> EcResult<bool> {
let res = EcRequestGetCmdVersionsV1 { cmd: cmd.into() }.send_command(self);
pub fn cmd_version_supported(&self, cmd: u32, version: u8) -> EcResult<bool> {
let res = EcRequestGetCmdVersionsV1 { cmd }.send_command(self);
let mask = if let Ok(res) = res {
res.version_mask
} else {
let res = EcRequestGetCmdVersionsV0 { cmd: cmd as u8 }.send_command(self)?;
} else if let Ok(cmd) = u8::try_from(cmd) {
// V0 only supports 8-bit command IDs, so only fall back for commands <= 255
let res = EcRequestGetCmdVersionsV0 { cmd }.send_command(self)?;
res.version_mask
} else {
return Ok(false);
};

Ok(mask & (1 << version) > 0)
Expand Down