From 5a7cb847f096dacb0bf96b3aa909f79d76ae8204 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 25 Aug 2012 01:17:58 +0000 Subject: 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 Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- en29lv640b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'en29lv640b.c') diff --git a/en29lv640b.c b/en29lv640b.c index 0dff2d1..e79415a 100644 --- a/en29lv640b.c +++ b/en29lv640b.c @@ -81,7 +81,7 @@ int probe_en29lv640b(struct flashctx *flash) 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_en29lv640b(struct flashctx *flash, unsigned int start, 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; } -- cgit v1.1