Make struct flashchip a field in struct flashctx instead of a complete copy
All the driver conversion work and cleanup has been done by Stefan.
flashrom.c and cli_classic.c are a joint work of Stefan and Carl-Daniel.
Corresponding to flashrom svn r1579.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
diff --git a/en29lv640b.c b/en29lv640b.c
index 0dff2d1..e79415a 100644
--- a/en29lv640b.c
+++ b/en29lv640b.c
@@ -81,7 +81,7 @@
msg_cdbg("%s: id1 0x%04x, id2 0x%04x\n", __func__, id1, id2);
- if (id1 == flash->manufacture_id && id2 == flash->model_id)
+ if (id1 == flash->chip->manufacture_id && id2 == flash->chip->model_id)
return 1;
return 0;
@@ -130,7 +130,7 @@
int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int address,
unsigned int blocklen)
{
- if ((address != 0) || (blocklen != flash->total_size * 1024)) {
+ if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n", __func__);
return -1;
}