diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-08-12 11:24:11 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-08-25 00:21:53 +0000 |
| commit | eb1b1f6f7dc27bb978a8e4577c83b722f770af1e (patch) | |
| tree | c9635f4f4b3ba91560e6ad382e446b24f4eb9fcc | |
| parent | ac7f0c20b816784fca6b21e2a931f55b4089e219 (diff) | |
| download | flashrom-eb1b1f6f7dc27bb978a8e4577c83b722f770af1e.tar.gz flashrom-eb1b1f6f7dc27bb978a8e4577c83b722f770af1e.tar.bz2 flashrom-eb1b1f6f7dc27bb978a8e4577c83b722f770af1e.zip | |
flashrom.c: flatten out write_buf_to_include_args()
write_buf_to_include_args() does not need the whole flashctx,
rather it works with a fix layout and buffer. Just pass what
state is actually required.
BUG=b:242246291
TEST=builds
Change-Id: I885c4395356eef27746c66300233f07f4718ccdf
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66644
Reviewed-by: Evan Benn <evanbenn@google.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-by: Sam McNally <sammc@google.com>
Reviewed-by: Thomas Heijligen <src@posteo.de>
| -rw-r--r-- | cli_classic.c | 2 | ||||
| -rw-r--r-- | flashrom.c | 6 | ||||
| -rw-r--r-- | include/flash.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/cli_classic.c b/cli_classic.c index d0712926f..81299210d 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -373,7 +373,7 @@ static int do_read(struct flashctx *const flash, const char *const filename) if (ret > 0) goto free_out; - if (write_buf_to_include_args(flash, buf)) { + if (write_buf_to_include_args(get_layout(flash), buf)) { ret = 1; goto free_out; } diff --git a/flashrom.c b/flashrom.c index 35fdc7da7..5a6f4e661 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1021,14 +1021,12 @@ out: * then this will write files using data from the corresponding region in the * supplied buffer. * - * @param flashctx Flash context to be used. + * @param layout The layout to be used. * @param buf Chip-sized buffer to read data from * @return 0 on success */ -int write_buf_to_include_args(const struct flashctx *const flash, - unsigned char *buf) +int write_buf_to_include_args(const struct flashrom_layout *const layout, unsigned char *buf) { - const struct flashrom_layout *const layout = get_layout(flash); const struct romentry *entry = NULL; while ((entry = layout_next_included(layout, entry))) { diff --git a/include/flash.h b/include/flash.h index 3fedb2b67..d5001c1d5 100644 --- a/include/flash.h +++ b/include/flash.h @@ -425,7 +425,7 @@ int selfcheck(void); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int read_buf_from_include_args(const struct flashrom_layout *const layout, unsigned char *buf); int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); -int write_buf_to_include_args(const struct flashctx *const flash, unsigned char *buf); +int write_buf_to_include_args(const struct flashrom_layout *const layout, unsigned char *buf); int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it); void finalize_flash_access(struct flashctx *); int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, uint8_t status); |