diff options
| author | Sean Nelson <audiohacked@gmail.com> | 2010-03-16 03:09:10 +0000 |
|---|---|---|
| committer | Sean Nelson <audiohacked@gmail.com> | 2010-03-16 03:09:10 +0000 |
| commit | ccf7a2a231a213fe987a675ca6869456dbbd37da (patch) | |
| tree | d9264e9d63564e55fcaa38d819e69d6ae3715087 /flashchips.c | |
| parent | b3289c904c0242333d1283e85d88e61ee2d3e923 (diff) | |
| download | ast2050-flashrom-ccf7a2a231a213fe987a675ca6869456dbbd37da.zip ast2050-flashrom-ccf7a2a231a213fe987a675ca6869456dbbd37da.tar.gz | |
Further cleanup after JEDEC refactorings
Convert _sst_fwhub functions to jedec.
Corresponding to flashrom svn r943.
kill unused sst_fwhub.c functions
make unlock_* check if unlock was successful and only return 0 when fully successful
Signed-off-by: Sean Nelson <audiohacked@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'flashchips.c')
| -rw-r--r-- | flashchips.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/flashchips.c b/flashchips.c index 727d69d..bc9b295 100644 --- a/flashchips.c +++ b/flashchips.c @@ -4084,17 +4084,19 @@ struct flashchip flashchips[] = { { { .eraseblocks = { {4 * 1024, 64} }, - .block_erase = erase_sst_fwhub_sector, + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {16 * 1024, 16} }, - .block_erase = erase_sst_fwhub_block, + .block_erase = erase_block_jedec, }, { .eraseblocks = { {256 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, @@ -4114,17 +4116,19 @@ struct flashchip flashchips[] = { { { .eraseblocks = { {4 * 1024, 96} }, - .block_erase = erase_sst_fwhub_sector, + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {64 * 1024, 6} }, - .block_erase = erase_sst_fwhub_block, + .block_erase = erase_block_jedec, }, { .eraseblocks = { {384 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, @@ -4147,17 +4151,19 @@ struct flashchip flashchips[] = { { { .eraseblocks = { {4 * 1024, 128} }, - .block_erase = erase_sector_jedec, /* missing unlock */ + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {64 * 1024, 8} }, - .block_erase = erase_sst_fwhub_block, /* same as erase_block_jedec, but with unlock */ + .block_erase = erase_block_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ }, }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, @@ -4208,17 +4214,19 @@ struct flashchip flashchips[] = { { { .eraseblocks = { {4 * 1024, 256} }, - .block_erase = erase_sst_fwhub_sector, + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {64 * 1024, 16} }, - .block_erase = erase_sst_fwhub_block, + .block_erase = erase_block_jedec, }, { .eraseblocks = { {1024 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, |
