Add struct flashctx * parameter to all functions accessing flash chips
All programmer access function prototypes except init have been made
static and moved to the respective file.
A few internal functions in flash chip drivers had chipaddr parameters
which are no longer needed.
The lines touched by flashctx changes have been adjusted to 80 columns
except in header files.
Corresponding to flashrom svn r1474.
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/stm50flw0x0x.c b/stm50flw0x0x.c
index 65d520d..9b6443e 100644
--- a/stm50flw0x0x.c
+++ b/stm50flw0x0x.c
@@ -60,8 +60,10 @@
// unlock each 4k-sector
for (j = 0; j < 0x10000; j += 0x1000) {
msg_cdbg("unlocking at 0x%x\n", offset + j);
- chip_writeb(unlock_sector, wrprotect + offset + j);
- if (chip_readb(wrprotect + offset + j) != unlock_sector) {
+ chip_writeb(flash, unlock_sector,
+ wrprotect + offset + j);
+ if (chip_readb(flash, wrprotect + offset + j) !=
+ unlock_sector) {
msg_cerr("Cannot unlock sector @ 0x%x\n",
offset + j);
return -1;
@@ -69,8 +71,8 @@
}
} else {
msg_cdbg("unlocking at 0x%x\n", offset);
- chip_writeb(unlock_sector, wrprotect + offset);
- if (chip_readb(wrprotect + offset) != unlock_sector) {
+ chip_writeb(flash, unlock_sector, wrprotect + offset);
+ if (chip_readb(flash, wrprotect + offset) != unlock_sector) {
msg_cerr("Cannot unlock sector @ 0x%x\n", offset);
return -1;
}
@@ -94,15 +96,16 @@
}
/* This function is unused. */
-int erase_sector_stm50flw0x0x(struct flashctx *flash, unsigned int sector, unsigned int sectorsize)
+int erase_sector_stm50flw0x0x(struct flashctx *flash, unsigned int sector,
+ unsigned int sectorsize)
{
chipaddr bios = flash->virtual_memory + sector;
// clear status register
- chip_writeb(0x50, bios);
+ chip_writeb(flash, 0x50, bios);
// now start it
- chip_writeb(0x32, bios);
- chip_writeb(0xd0, bios);
+ chip_writeb(flash, 0x32, bios);
+ chip_writeb(flash, 0xd0, bios);
programmer_delay(10);
wait_82802ab(flash);