From 7f2ac0c4c6c40f475e790cc29c01f5427bd0c511 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Sun, 10 Oct 2010 14:02:27 +0000 Subject: 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. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1208 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- jedec.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'jedec.c') diff --git a/jedec.c b/jedec.c index fea17b6..7e956e2 100644 --- a/jedec.c +++ b/jedec.c @@ -317,14 +317,14 @@ retry: return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, - chipaddr dst, unsigned int page_size, unsigned int mask) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask) { int i, failed = 0; + chipaddr dst = flash->virtual_memory + start; chipaddr olddst; olddst = dst; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { if (write_byte_program_jedec_common(flash, src, dst, mask)) failed = 1; dst++, src++; @@ -335,8 +335,7 @@ int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, return failed; } -static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, - int start, int page_size, unsigned int mask) +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask) { int i, tried = 0, failed; uint8_t *s = src; @@ -403,8 +402,7 @@ int write_jedec(struct flashchip *flash, uint8_t *buf) mask = getaddrmask(flash); for (i = 0; i < total_size / page_size; i++) { - if (write_page_write_jedec_common(flash, buf + i * page_size, - i * page_size, page_size, mask)) + if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; } @@ -414,14 +412,12 @@ int write_jedec(struct flashchip *flash, uint8_t *buf) int write_jedec_1(struct flashchip *flash, uint8_t * buf) { int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; int mask; mask = getaddrmask(flash); for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); + write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); } return 0; -- cgit v1.2.1