Use flashprog_flash_getsize() where possible
Change-Id: I4eab12dc9dcf0c7fdffc5c662081868c6f32e36c
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/493
diff --git a/jedec.c b/jedec.c
index 4ff1040..1cb540a 100644
--- a/jedec.c
+++ b/jedec.c
@@ -646,7 +646,7 @@
unsigned int mask;
mask = getaddrmask(flash);
- if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) {
+ if ((addr != 0) || (blocksize != flashprog_flash_getsize(flash))) {
msg_cerr("%s called with incorrect arguments\n",
__func__);
return -1;
@@ -732,7 +732,7 @@
static int printlock_regspace2_uniform(struct flashctx *flash, unsigned long block_size)
{
- const unsigned int elems = flash->chip->total_size * 1024 / block_size;
+ const unsigned int elems = flashprog_flash_getsize(flash) / block_size;
struct unlockblock blocks[2] = {{.size = block_size, .count = elems}};
return regspace2_walk_unlockblocks(flash, blocks, &printlock_regspace2_block);
}
@@ -830,7 +830,7 @@
static int unlock_regspace2_uniform(struct flashctx *flash, unsigned long block_size)
{
- const unsigned int elems = flash->chip->total_size * 1024 / block_size;
+ const unsigned int elems = flashprog_flash_getsize(flash) / block_size;
struct unlockblock blocks[2] = {{.size = block_size, .count = elems}};
return regspace2_walk_unlockblocks(flash, blocks, &unlock_regspace2_block_generic);
}