aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2021-12-13 12:44:13 +1100
committerEdward O'Callaghan <quasisec@chromium.org>2022-01-27 04:46:54 +0000
commit103b139cf76f9fb0934335ed49bddd5762f86843 (patch)
treed7812818ad1dd350bbd929e24744813f50828873
parent9413faa7ccc806af931a7fd0437e4dee98990e9a (diff)
downloadflashrom-103b139cf76f9fb0934335ed49bddd5762f86843.tar.gz
flashrom-103b139cf76f9fb0934335ed49bddd5762f86843.tar.bz2
flashrom-103b139cf76f9fb0934335ed49bddd5762f86843.zip
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>
-rw-r--r--flash.h2
-rw-r--r--flashrom.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/flash.h b/flash.h
index 11e63892..932419e8 100644
--- a/flash.h
+++ b/flash.h
@@ -351,7 +351,9 @@ 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 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 257112ff..8287c314 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -931,7 +931,7 @@ out:
* @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 @@ out:
* @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);