path: root/wbsio_spi.c
diff options
authorCarl-Daniel Hailfinger <>2009-06-13 12:04:03 +0000
committerCarl-Daniel Hailfinger <>2009-06-13 12:04:03 +0000
commit38a059d6ef1ebb7145a04825fec0ebef1d8a66a7 (patch)
tree66c9108eda2f0f7129f2ba55b9cb757414d9466a /wbsio_spi.c
parent8b2f46b878a952a0ea0869624636cb4d6f5fa8c1 (diff)
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 <>
Diffstat (limited to 'wbsio_spi.c')
1 files changed, 2 insertions, 2 deletions
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 wbsio_spi_read(struct flashchip *flash, uint8_t *buf)
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;
OpenPOWER on IntegriCloud