diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2023-05-15 23:02:56 +1000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-17 05:36:47 +0000 |
| commit | 56eff1e773f02c25c0b0f08ff307fef5c0f7c511 (patch) | |
| tree | 186ddd75b4401552195525e957f1bb64d6b9e9a2 | |
| parent | 723cb4517c9ff7291f2f446ac2042b8bc10f761d (diff) | |
| download | vboot-56eff1e773f02c25c0b0f08ff307fef5c0f7c511.tar.gz | |
futility/updater_utils.c: Inline {read,write}_flash()
Avoid indirection.
BUG=b:282585789
BRANCH=none
TEST=`cros_run_unit_tests --host --packages vboot_reference`.
Change-Id: I2ad99a61b801b856f53743c0ed4e00289ede5deb
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4541780
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
| -rw-r--r-- | futility/updater_utils.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/futility/updater_utils.c b/futility/updater_utils.c index 09686120..f5b160e1 100644 --- a/futility/updater_utils.c +++ b/futility/updater_utils.c @@ -583,26 +583,6 @@ static char *get_flashrom_command(enum flash_command flash_cmd, return cmd; } -static int read_flash(struct flashrom_params *params) -{ - return flashrom_read_image(params->image, NULL, params->verbose); -} - -static int write_flash(struct flashrom_params *params) -{ - int r = flashrom_write_image(params->image, - params->regions, - params->flash_contents, - !params->noverify, - params->verbose); - /* - * Force a newline to flush stdout in case if - * flashrom_write_image left some messages in the buffer. - */ - fprintf(stdout, "\n"); - return r; -} - int load_system_firmware(struct updater_config *cfg, struct firmware_image *image) { @@ -621,7 +601,7 @@ int load_system_firmware(struct updater_config *cfg, for (i = 1, r = -1; i <= tries && r != 0; i++, params.verbose++) { if (i > 1) WARN("Retry reading firmware (%d/%d)...\n", i, tries); - r = read_flash(¶ms); + r = flashrom_read_image(image, NULL, params.verbose); } if (!r) r = parse_firmware_image(image); @@ -662,7 +642,16 @@ int write_system_firmware(struct updater_config *cfg, for (i = 1, r = -1; i <= tries && r != 0; i++, params.verbose++) { if (i > 1) WARN("Retry writing firmware (%d/%d)...\n", i, tries); - r = write_flash(¶ms); + r = flashrom_write_image(image, sections, + flash_contents, + !params.noverify, + params.verbose); + /* + * Force a newline to flush stdout in case if + * flashrom_write_image left some messages in the buffer. + */ + fprintf(stdout, "\n"); + } return r; } |