summaryrefslogtreecommitdiffstats
path: root/flashchips.c
diff options
context:
space:
mode:
authorSean Nelson <audiohacked@gmail.com>2010-02-19 00:52:10 +0000
committerSean Nelson <audiohacked@gmail.com>2010-02-19 00:52:10 +0000
commit6e0b912f469a5595c138b3f7ddad77d691330e2f (patch)
tree1a47f0ac8bfdb814720ae28cbd96678e7424894b /flashchips.c
parentce5fad038d2802e6caec11da1bfc7dc9780e7ee5 (diff)
downloadflashrom-6e0b912f469a5595c138b3f7ddad77d691330e2f.tar.gz
flashrom-6e0b912f469a5595c138b3f7ddad77d691330e2f.tar.bz2
flashrom-6e0b912f469a5595c138b3f7ddad77d691330e2f.zip
Here's a very quick patch to fix the missing unlock code
Fixes missing unlock for certain chips: * unlock_49lf00x * Pm49fl002 * Pm49fl004 * unlock_49flxxxc * SST49LF160C * unlock_winbond_fwhub * W39V080FA * W39V080FA (dual mode) Fixes missing printlock for certain chip: * printlock_w39v040c * W39V040C Corresponding to flashrom svn r907. Signed-off-by: Sean Nelson <audiohacked@gmail.com> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'flashchips.c')
-rw-r--r--flashchips.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/flashchips.c b/flashchips.c
index cfe9dbafa..875d5b3a6 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -49,6 +49,8 @@ struct flashchip flashchips[] = {
* .eraseblocks[] = Array of { blocksize, blockcount }
* .block_erase = Block erase function
* }
+ * .printlock = Chip lock status function
+ * .unlock = Chip unlock function
* .write = Chip write function
* .read = Chip read function
*/
@@ -3330,7 +3332,6 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED,
.probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */
- /* .erase = NULL, Was: erase_49fl00x */
.block_erasers =
{
{
@@ -3344,6 +3345,7 @@ struct flashchip flashchips[] = {
.block_erase = erase_chip_block_jedec,
}
},
+ .unlock = unlock_49fl00x,
.write = write_49fl00x,
.read = read_memmapped,
},
@@ -3360,7 +3362,6 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED,
.probe = probe_jedec,
.probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */
- /* .erase = NULL, Was: erase_49fl00x */
.block_erasers =
{
{
@@ -3374,6 +3375,7 @@ struct flashchip flashchips[] = {
.block_erase = erase_chip_block_jedec,
}
},
+ .unlock = unlock_49fl00x,
.write = write_49fl00x,
.read = read_memmapped,
},
@@ -4406,7 +4408,6 @@ struct flashchip flashchips[] = {
.tested = TEST_OK_PRW,
.probe = probe_49lfxxxc,
.probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */
- /* .erase = NULL, Was: erase_49flxxxc */
.block_erasers =
{
{
@@ -4422,6 +4423,7 @@ struct flashchip flashchips[] = {
.block_erase = erase_block_49lfxxxc,
}
},
+ .unlock = unlock_49lfxxxc,
.write = write_49lfxxxc,
.read = read_memmapped,
},
@@ -5740,7 +5742,6 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED,
.probe = probe_jedec,
.probe_timing = TIMING_FIXME,
- /* .erase = NULL, Was erase_w39v040c */
.block_erasers =
{
{
@@ -5751,6 +5752,7 @@ struct flashchip flashchips[] = {
.block_erase = erase_chip_block_jedec,
}
},
+ .printlock = printlock_w39v040c,
.write = write_jedec_1,
.read = read_memmapped,
},
@@ -5915,7 +5917,6 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED,
.probe = probe_jedec,
.probe_timing = TIMING_FIXME,
- /* .erase = NULL, Was erase_winbond_fwhub */
.block_erasers =
{
{
@@ -5926,6 +5927,7 @@ struct flashchip flashchips[] = {
.block_erase = erase_chip_block_jedec,
}
},
+ .unlock = unlock_winbond_fwhub,
.write = write_jedec_1,
.read = read_memmapped,
},
@@ -5942,7 +5944,6 @@ struct flashchip flashchips[] = {
.tested = TEST_UNTESTED,
.probe = probe_jedec,
.probe_timing = TIMING_FIXME,
- /* .erase = NULL, Was erase_winbond_fwhub */
.block_erasers =
{
{
@@ -5953,6 +5954,7 @@ struct flashchip flashchips[] = {
.block_erase = erase_chip_block_jedec,
}
},
+ .unlock = unlock_winbond_fwhub,
.write = write_jedec_1,
.read = read_memmapped,
},