Use struct flashctx instead of struct flashchip for flash chip access
Struct flashchip is used only for the flashchips array and for
operations which do not access hardware, e.g. printing a list of
supported flash chips.
struct flashctx (flash context) contains all data available in
struct flashchip, but it also contains runtime information like
mapping addresses. struct flashctx is expected to grow additional
members over time, a prime candidate being programmer info.
struct flashctx contains all of struct flashchip with identical
member layout, but struct flashctx has additional members at the end.
The separation between struct flashchip/flashctx shrinks the memory
requirement of the big flashchips array and allows future extension
of flashctx without having to worry about bloat.
Corresponding to flashrom svn r1473.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
diff --git a/opaque.c b/opaque.c
index 1c31612..43ddb07 100644
--- a/opaque.c
+++ b/opaque.c
@@ -41,7 +41,7 @@
const struct opaque_programmer *opaque_programmer = &opaque_programmer_none;
-int probe_opaque(struct flashchip *flash)
+int probe_opaque(struct flashctx *flash)
{
if (!opaque_programmer->probe) {
msg_perr("%s called before register_opaque_programmer. "
@@ -53,7 +53,7 @@
return opaque_programmer->probe(flash);
}
-int read_opaque(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len)
+int read_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len)
{
if (!opaque_programmer->read) {
msg_perr("%s called before register_opaque_programmer. "
@@ -64,7 +64,7 @@
return opaque_programmer->read(flash, buf, start, len);
}
-int write_opaque(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len)
+int write_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len)
{
if (!opaque_programmer->write) {
msg_perr("%s called before register_opaque_programmer. "
@@ -75,7 +75,7 @@
return opaque_programmer->write(flash, buf, start, len);
}
-int erase_opaque(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen)
+int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen)
{
if (!opaque_programmer->erase) {
msg_perr("%s called before register_opaque_programmer. "