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>
diff --git a/chipdrivers.h b/chipdrivers.h
index 059100e..a378803 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -87,10 +87,8 @@
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 45e67c6..5005997 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1306,7 +1306,8 @@
.block_erase = erase_chip_block_jedec,
}
},
- .write = write_49fl00x,
+ .unlock = unlock_49fl00x,
+ .write = write_jedec_1,
.read = read_memmapped,
},
@@ -3347,7 +3348,7 @@
}
},
.unlock = unlock_49fl00x,
- .write = write_49fl00x,
+ .write = write_jedec_1,
.read = read_memmapped,
},
@@ -3377,7 +3378,7 @@
}
},
.unlock = unlock_49fl00x,
- .write = write_49fl00x,
+ .write = write_jedec_1,
.read = read_memmapped,
},
diff --git a/pm49fl00x.c b/pm49fl00x.c
index 17a49f0..5e5eec8 100644
--- a/pm49fl00x.c
+++ b/pm49fl00x.c
@@ -43,6 +43,12 @@
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;