Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved
flashrom.c: Make {read,write}_buf_from_include_args() public

This allows for moving all the do_*() helper functions
use for the cli from flashrom.c within static local functions
in cli_classic.c

BUG=b:208132085
TEST=`make`

Change-Id: Ia0abec655a682ca449d0e8ba620886a2d616b86d
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/60069
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
---
M flash.h
M flashrom.c
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/flash.h b/flash.h
index 11e6389..932419e 100644
--- a/flash.h
+++ b/flash.h
@@ -351,7 +351,9 @@
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 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);
void finalize_flash_access(struct flashctx *);
int do_read(struct flashctx *, const char *filename);
diff --git a/flashrom.c b/flashrom.c
index 257112f..8287c31 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -931,7 +931,7 @@
* @param buf Chip-sized buffer to write data to
* @return 0 on success
*/
-static int read_buf_from_include_args(const struct flashctx *const flash,
+int read_buf_from_include_args(const struct flashctx *const flash,
unsigned char *buf)
{
const struct flashrom_layout *const layout = get_layout(flash);
@@ -1028,7 +1028,7 @@
* @param buf Chip-sized buffer to read data from
* @return 0 on success
*/
-static int write_buf_to_include_args(const struct flashctx *const flash,
+int write_buf_to_include_args(const struct flashctx *const flash,
unsigned char *buf)
{
const struct flashrom_layout *const layout = get_layout(flash);

To view, visit change 60069. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ia0abec655a682ca449d0e8ba620886a2d616b86d
Gerrit-Change-Number: 60069
Gerrit-PatchSet: 6
Gerrit-Owner: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Daniel Campello <campello@chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-CC: Thomas Heijligen <src@posteo.de>
Gerrit-MessageType: merged