openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-03 15:03:22 +02:00
Code Issues Releases Wiki Activity

flashrom_tester: Add _into_file to function names

Browse Source 
Rename Flashrom trait function names to reflect that the data is read
to/from a file provided as an argument.

BUG=None
BRANCH=None
TEST=cargo test; cargo check

Change-Id: I0015c9bf64349a5512dbdb0ef6f3dad38aa2fd8e
Signed-off-by: Evan Benn <evanbenn@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66956
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Evan Benn
2022-08-23 12:43:47 +10:00
committed by Edward O'Callaghan
parent 1acef16895
commit b41bb5622c
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
util/flashrom_tester/flashrom/src/cmd.rs
View File

@ -227,7 +227,7 @@ impl crate::Flashrom for FlashromCmd {
}
}
fn read(&self, path: &str) -> Result<(), FlashromError> {
fn read_into_file(&self, path: &str) -> Result<(), FlashromError> {
let opts = FlashromOpt {
io_opt: IOOpt {
read: Some(path),
@ -236,11 +236,11 @@ impl crate::Flashrom for FlashromCmd {
..Default::default()
};
self.dispatch(opts, "read")?;
self.dispatch(opts, "read_into_file")?;
Ok(())
}
fn read_region(&self, path: &str, region: &str) -> Result<(), FlashromError> {
fn read_region_into_file(&self, path: &str, region: &str) -> Result<(), FlashromError> {
let opts = FlashromOpt {
io_opt: IOOpt {
region: Some((region, path)),
@ -249,11 +249,11 @@ impl crate::Flashrom for FlashromCmd {
..Default::default()
};
let (stdout, _) = self.dispatch(opts, "read_region")?;
let (stdout, _) = self.dispatch(opts, "read_region_into_file")?;
Ok(())
}
fn write(&self, path: &str) -> Result<(), FlashromError> {
fn write_from_file(&self, path: &str) -> Result<(), FlashromError> {
let opts = FlashromOpt {
io_opt: IOOpt {
write: Some(path),
@ -262,11 +262,11 @@ impl crate::Flashrom for FlashromCmd {
..Default::default()
};
self.dispatch(opts, "write")?;
self.dispatch(opts, "write_from_file")?;
Ok(())
}
fn verify(&self, path: &str) -> Result<(), FlashromError> {
fn verify_from_file(&self, path: &str) -> Result<(), FlashromError> {
let opts = FlashromOpt {
io_opt: IOOpt {
verify: Some(path),
@ -275,7 +275,7 @@ impl crate::Flashrom for FlashromCmd {
..Default::default()
};
self.dispatch(opts, "verify")?;
self.dispatch(opts, "verify_from_file")?;
Ok(())
}

8
util/flashrom_tester/flashrom/src/lib.rs
View File

@ -134,16 +134,16 @@ pub trait Flashrom {
fn wp_toggle(&self, en: bool) -> Result<bool, FlashromError>;
/// Read the whole flash to the file specified by `path`.
fn read(&self, path: &str) -> Result<(), FlashromError>;
fn read_into_file(&self, path: &str) -> Result<(), FlashromError>;
/// Read only a region of the flash.
fn read_region(&self, path: &str, region: &str) -> Result<(), FlashromError>;
fn read_region_into_file(&self, path: &str, region: &str) -> Result<(), FlashromError>;
/// Write the whole flash to the file specified by `path`.
fn write(&self, path: &str) -> Result<(), FlashromError>;
fn write_from_file(&self, path: &str) -> Result<(), FlashromError>;
/// Verify the whole flash against the file specified by `path`.
fn verify(&self, path: &str) -> Result<(), FlashromError>;
fn verify_from_file(&self, path: &str) -> Result<(), FlashromError>;
/// Erase the whole flash.
fn erase(&self) -> Result<(), FlashromError>;