From ac7f0c20b816784fca6b21e2a931f55b4089e219 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 11 Aug 2022 22:02:26 +1000 Subject: flashrom.c: flatten out read_buf_from_include_args() read_buf_from_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: Ieadd68895c7ba05cc3d770d304351b02622f14d7 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66633 Reviewed-by: Evan Benn Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Nikolai Artemiev Reviewed-by: Sam McNally Reviewed-by: Thomas Heijligen --- cli_classic.c | 4 ++-- flashrom.c | 6 ++---- include/flash.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 991804d1..d0712926 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -411,7 +411,7 @@ static int do_write(struct flashctx *const flash, const char *const filename, co * ... then update newcontents with contents from files provided to '-i' * args if needed. */ - if (read_buf_from_include_args(flash, newcontents)) + if (read_buf_from_include_args(get_layout(flash), newcontents)) goto _free_ret; if (referencefile) { @@ -445,7 +445,7 @@ static int do_verify(struct flashctx *const flash, const char *const filename) * ... then update newcontents with contents from files provided to '-i' * args if needed. */ - if (read_buf_from_include_args(flash, newcontents)) + if (read_buf_from_include_args(get_layout(flash), newcontents)) goto _free_ret; ret = flashrom_image_verify(flash, newcontents, flash_size); diff --git a/flashrom.c b/flashrom.c index 229a4744..35fdc7da 100644 --- a/flashrom.c +++ b/flashrom.c @@ -926,14 +926,12 @@ out: * then this will read file data into 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 write data to * @return 0 on success */ -int read_buf_from_include_args(const struct flashctx *const flash, - unsigned char *buf) +int read_buf_from_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; /* diff --git a/include/flash.h b/include/flash.h index 449ed9d1..3fedb2b6 100644 --- a/include/flash.h +++ b/include/flash.h @@ -423,7 +423,7 @@ void print_banner(void); void list_programmers_linebreak(int startcol, int cols, int paren); 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 flashctx *const flash, unsigned char *buf); +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 prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it); -- cgit v1.2.3