Unify chip write functions
The currently used write functions (wrappers) all use helpers which
perform the actual write (inner functions).
The signature of the write wrappers is: int write_chip(struct flashchip
*flash, uint8_t * buf);
The signature of the inner write functions varied a lot. This patch
changes them to: int write_part(struct flashchip *flash, uint8_t *src,
int start, int len);
Did you know that flashrom has only 8 inner write functions for all
flash chips? write_page_write_jedec_common write_sector_jedec_common
write_sector_28sf040 spi_chip_write_256_new spi_chip_write_1_new
spi_aai_write_new write_page_82802ab write_page_m29f400bt
Export all inner write functions.
Change the function signature of wait_82802ab to eliminate single-use
variables.
Remove an error message in write_page_m29f400bt which was printed for
every byte written regardless of success.
Add sharplhf00l04.c to the list of flash chip drivers in the Makefile.
While the functions in there are unused, I suspect we will need them
later, and by hooking the file up we ensure that compilation won't
break.
Corresponding to flashrom svn r1208.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
diff --git a/82802ab.c b/82802ab.c
index 3fec376..ac42bb9 100644
--- a/82802ab.c
+++ b/82802ab.c
@@ -88,9 +88,10 @@
return 1;
}
-uint8_t wait_82802ab(chipaddr bios)
+uint8_t wait_82802ab(struct flashchip *flash)
{
uint8_t status;
+ chipaddr bios = flash->virtual_memory;
chip_writeb(0x70, bios);
if ((chip_readb(bios) & 0x80) == 0) { // it's busy
@@ -132,7 +133,7 @@
programmer_delay(10);
// now let's see what the register is
- status = wait_82802ab(bios);
+ status = wait_82802ab(flash);
print_status_82802ab(status);
if (check_erased_range(flash, page, pagesize)) {
@@ -143,26 +144,28 @@
return 0;
}
-void write_page_82802ab(chipaddr bios, uint8_t *src,
- chipaddr dst, int page_size)
+int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len)
{
int i;
+ chipaddr dst = flash->virtual_memory + start;
- for (i = 0; i < page_size; i++) {
+ for (i = 0; i < len; i++) {
/* transfer data from source to destination */
chip_writeb(0x40, dst);
chip_writeb(*src++, dst++);
- wait_82802ab(bios);
+ wait_82802ab(flash);
}
+
+ /* FIXME: Ignore errors for now. */
+ return 0;
}
int write_82802ab(struct flashchip *flash, uint8_t *buf)
{
int i;
- chipaddr bios = flash->virtual_memory;
for (i = 0; i < flash->total_size; i++) {
- write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024);
+ write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024);
}
return 0;