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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 554bf2a..dce6631 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -177,12 +177,12 @@
{
int size = flash->total_size * 1024;
- if (flash->total_size > 1024) {
+ if (size > 1024 * 1024) {
fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__);
return 1;
}
- memcpy(buf, (const char *)flash->virtual_memory, size);
+ read_memmapped(flash, buf);
return 0;
}