Skip to content

openocd: strip leading '0x' from hex numbers returned by openocd #561

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

openocd: strip leading '0x' from hex numbers returned by openocd #561

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
18 changes: 16 additions & 2 deletions humility-probes-core/src/openocd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@ impl Core for OpenOCDCore {

fn read_word_32(&mut self, addr: u32) -> Result<u32> {
let result = self.sendcmd(&format!("mrw 0x{:x}", addr))?;
Ok(result.parse::<u32>()?)
let rval = if let Some(hex_val) =
result.strip_prefix("0x").or(result.strip_prefix("0X"))
{
u32::from_str_radix(hex_val, 16)?
} else {
result.parse::<u32>()?
};
Ok(rval)
}

fn read_8(&mut self, addr: u32, data: &mut [u8]) -> Result<()> {
Expand Down Expand Up @@ -136,7 +143,14 @@ impl Core for OpenOCDCore {
}

Some(idx) => {
data[idx] = val.parse::<u8>()?;
let dval = if let Some(hex_val) =
val.strip_prefix("0x").or(val.strip_prefix("0X"))
{
u8::from_str_radix(hex_val, 16)?
} else {
val.parse::<u8>()?
};
data[idx] = dval;
index = None;
}
}
Expand Down