Draw struct flashchip into struct flashprog_flashctx
We used to have a reference to a dynamically allocated struct flashchip
inside the flash context. But now that we only ever allocate both in one
go, we can let go of the reference and make it a single structure.
Change-Id: I857acb1def6d133a5cbc28fc7a99b7b1a22b55e0
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/494
diff --git a/ichspi.c b/ichspi.c
index c12bc1c..7109a43 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -1262,9 +1262,9 @@
else
msg_cdbg(" with a");
msg_cdbg(" density of %d kB.\n", total_size / 1024);
- flash->chip->total_size = total_size / 1024;
+ flash->chip.total_size = total_size / 1024;
- eraser = &(flash->chip->block_erasers[0]);
+ eraser = &(flash->chip.block_erasers[0]);
if (!hwseq_data.only_4k)
boundary = (REGREAD32(ICH9_REG_FPB) & FPB_FPBA) << 12;
else
@@ -1300,7 +1300,7 @@
msg_cdbg("In that range are %d erase blocks with %d B each.\n",
size_high / erase_size_high, erase_size_high);
}
- flash->chip->tested = TEST_OK_PREW;
+ flash->chip.tested = TEST_OK_PREW;
return 1;
}