diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-08-25 01:17:58 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-08-25 01:17:58 +0000 |
commit | 7f0bcba9833ca056a66b6081613a693ee36f78e9 (patch) | |
tree | da511e990c1fdded61ee5dcefae38314c3a5a6cc /m29f400bt.c | |
parent | d9119f712612e8e6f508a3e6a839d41a365c2793 (diff) | |
download | flashrom-7f0bcba9833ca056a66b6081613a693ee36f78e9.zip flashrom-7f0bcba9833ca056a66b6081613a693ee36f78e9.tar.gz |
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>
Diffstat (limited to 'm29f400bt.c')
-rw-r--r-- | m29f400bt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m29f400bt.c b/m29f400bt.c index c9d8a40..8f0329e 100644 --- a/m29f400bt.c +++ b/m29f400bt.c @@ -81,7 +81,7 @@ int probe_m29f400bt(struct flashctx *flash) msg_cdbg("%s: id1 0x%02x, id2 0x%02x\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_m29f400bt(struct flashctx *flash, unsigned int start, int block_erase_chip_m29f400bt(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; |