From 38a059d6ef1ebb7145a04825fec0ebef1d8a66a7 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 13 Jun 2009 12:04:03 +0000 Subject: Every SPI host controller implemented its own way to read flash chips This was partly due to a design problem in the abstraction layer. There should be exactly two different functions for reading SPI chips: - memory mapped reads - SPI command reads. Each of them should be contained in a separate function, optionally taking parameters where needed. This patch solves the problems mentioned above, shortens the code and makes the code logic a lot more obvious. Since open-coding the min() function leads to errors, include it in this patch as well. Corresponding to flashrom svn r589. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Ronald G. Minnich --- it87spi.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'it87spi.c') diff --git a/it87spi.c b/it87spi.c index e90cf8de..ecc1ad88 100644 --- a/it87spi.c +++ b/it87spi.c @@ -260,18 +260,12 @@ int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf) int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf) { int total_size = 1024 * flash->total_size; - int i; fast_spi = 0; if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { - for (i = 0; i < total_size; i += 3) { - int toread = 3; - if (total_size - i < toread) - toread = total_size - i; - spi_nbyte_read(i, buf + i, toread); - } + spi_read_chunked(flash, buf, 3); } else { - memcpy(buf, (const char *)flash->virtual_memory, total_size); + read_memmapped(flash, buf); } return 0; -- cgit v1.2.3