openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

cli_classic: Use flashrom_flash_getsize() over raw access

Browse Source 
Use native libflashrom entry-points for getting flash
size over accessing internal struct members within cli
code.

BUG=none
TEST=`sudo ./flashrom -p internal --get-size`.

Change-Id: Iff70a0de1dee517c4e38c45b1540c42326a13340
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/61583
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Edward O'Callaghan 2022-02-03 14:39:29 +11:00 committed by Edward O'Callaghan
parent 8f39fd6054
commit 83c5c50f91
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli_classic.c
View File

@ -158,7 +158,7 @@ static int do_read(struct flashctx *const flash, const char *const filename)
{ {
int ret; int ret;
unsigned long size = flash->chip->total_size * 1024; unsigned long size = flashrom_flash_getsize(flash);
unsigned char *buf = calloc(size, sizeof(unsigned char)); unsigned char *buf = calloc(size, sizeof(unsigned char));
if (!buf) { if (!buf) {
msg_gerr("Memory allocation failed!\n"); msg_gerr("Memory allocation failed!\n");
@ -189,7 +189,7 @@ static int do_extract(struct flashctx *const flash)
static int do_write(struct flashctx *const flash, const char *const filename, const char *const referencefile) static int do_write(struct flashctx *const flash, const char *const filename, const char *const referencefile)
{ {
const size_t flash_size = flash->chip->total_size * 1024; const size_t flash_size = flashrom_flash_getsize(flash);
int ret = 1; int ret = 1;
uint8_t *const newcontents = malloc(flash_size); uint8_t *const newcontents = malloc(flash_size);
@ -225,7 +225,7 @@ _free_ret:
static int do_verify(struct flashctx *const flash, const char *const filename) static int do_verify(struct flashctx *const flash, const char *const filename)
{ {
const size_t flash_size = flash->chip->total_size * 1024; const size_t flash_size = flashrom_flash_getsize(flash);
int ret = 1; int ret = 1;
uint8_t *const newcontents = malloc(flash_size); uint8_t *const newcontents = malloc(flash_size);
@ -809,7 +809,7 @@ int main(int argc, char *argv[])
} }
if (flash_size) { if (flash_size) {
printf("%d\n", fill_flash->chip->total_size * 1024); printf("%ld\n", flashrom_flash_getsize(fill_flash));
goto out_shutdown; goto out_shutdown;
} }
@ -846,7 +846,7 @@ int main(int argc, char *argv[])
} }
free(fmapfile_buffer); free(fmapfile_buffer);
} else if (fmap && (flashrom_layout_read_fmap_from_rom(&layout, fill_flash, 0, } else if (fmap && (flashrom_layout_read_fmap_from_rom(&layout, fill_flash, 0,
fill_flash->chip->total_size * 1024) || process_include_args(layout, include_args))) { flashrom_flash_getsize(fill_flash)) || process_include_args(layout, include_args))) {
ret = 1; ret = 1;
goto out_shutdown; goto out_shutdown;
} }