diff options
| author | Sean Nelson <audiohacked@gmail.com> | 2010-02-27 18:01:15 +0000 |
|---|---|---|
| committer | Sean Nelson <audiohacked@gmail.com> | 2010-02-27 18:01:15 +0000 |
| commit | 36172342c8d3b35b7fbec6289f55305466da1abb (patch) | |
| tree | 273e78887f6dd10e549c774e4e3b610d6dce1aeb | |
| parent | 8c1df280e344ca4bff76b9061db419bb174c2e4a (diff) | |
| download | flashrom-36172342c8d3b35b7fbec6289f55305466da1abb.tar.gz flashrom-36172342c8d3b35b7fbec6289f55305466da1abb.tar.bz2 flashrom-36172342c8d3b35b7fbec6289f55305466da1abb.zip | |
Convert the remaining references to *_49fl00x
Now the only remaining and used function in pm49fl00x.c is unlock_49fl00x.
Also:
- Add missing unlock to AMIC A49LF040A.
- Add lock_49fl00x function.
Corresponding to flashrom svn r917.
Signed-off-by: Sean Nelson <audiohacked@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
| -rw-r--r-- | chipdrivers.h | 4 | ||||
| -rw-r--r-- | flashchips.c | 7 | ||||
| -rw-r--r-- | pm49fl00x.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/chipdrivers.h b/chipdrivers.h index 059100e8..a3788039 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -87,10 +87,8 @@ void write_page_m29f400bt(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); /* pm49fl00x.c */ -int probe_49fl00x(struct flashchip *flash); -int erase_49fl00x(struct flashchip *flash); -int write_49fl00x(struct flashchip *flash, uint8_t *buf); int unlock_49fl00x(struct flashchip *flash); +int lock_49fl00x(struct flashchip *flash); /* sharplhf00l04.c */ int probe_lhf00l04(struct flashchip *flash); diff --git a/flashchips.c b/flashchips.c index 45e67c64..50059972 100644 --- a/flashchips.c +++ b/flashchips.c @@ -1306,7 +1306,8 @@ struct flashchip flashchips[] = { .block_erase = erase_chip_block_jedec, } }, - .write = write_49fl00x, + .unlock = unlock_49fl00x, + .write = write_jedec_1, .read = read_memmapped, }, @@ -3347,7 +3348,7 @@ struct flashchip flashchips[] = { } }, .unlock = unlock_49fl00x, - .write = write_49fl00x, + .write = write_jedec_1, .read = read_memmapped, }, @@ -3377,7 +3378,7 @@ struct flashchip flashchips[] = { } }, .unlock = unlock_49fl00x, - .write = write_49fl00x, + .write = write_jedec_1, .read = read_memmapped, }, diff --git a/pm49fl00x.c b/pm49fl00x.c index 17a49f0a..5e5eec83 100644 --- a/pm49fl00x.c +++ b/pm49fl00x.c @@ -43,6 +43,12 @@ int unlock_49fl00x(struct flashchip *flash) return 0; } +int lock_49fl00x(struct flashchip *flash) +{ + write_lockbits_49fl00x(flash->virtual_registers, flash->total_size * 1024, 1, flash->page_size); + return 0; +} + int erase_49fl00x(struct flashchip *flash) { int i; |