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/sharplhf00l04.c b/sharplhf00l04.c
index d572e96..5767b4a 100644
--- a/sharplhf00l04.c
+++ b/sharplhf00l04.c
@@ -26,25 +26,26 @@
* FIXME: This file is unused.
*/
-int erase_lhf00l04_block(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen)
+int erase_lhf00l04_block(struct flashctx *flash, unsigned int blockaddr,
+ unsigned int blocklen)
{
chipaddr bios = flash->virtual_memory + blockaddr;
chipaddr wrprotect = flash->virtual_registers + blockaddr + 2;
uint8_t status;
// clear status register
- chip_writeb(0x50, bios);
+ chip_writeb(flash, 0x50, bios);
status = wait_82802ab(flash);
print_status_82802ab(status);
// clear write protect
msg_cspew("write protect is at 0x%lx\n", (wrprotect));
- msg_cspew("write protect is 0x%x\n", chip_readb(wrprotect));
- chip_writeb(0, wrprotect);
- msg_cspew("write protect is 0x%x\n", chip_readb(wrprotect));
+ msg_cspew("write protect is 0x%x\n", chip_readb(flash, wrprotect));
+ chip_writeb(flash, 0, wrprotect);
+ msg_cspew("write protect is 0x%x\n", chip_readb(flash, wrprotect));
// now start it
- chip_writeb(0x20, bios);
- chip_writeb(0xd0, bios);
+ chip_writeb(flash, 0x20, bios);
+ chip_writeb(flash, 0xd0, bios);
programmer_delay(10);
// now let's see what the register is
status = wait_82802ab(flash);