diff --git a/hwaccess.c b/hwaccess.c
index 0efcb6d..571edd7 100644
--- a/hwaccess.c
+++ b/hwaccess.c
@@ -169,6 +169,12 @@
 	return *(volatile uint32_t *) addr;
 }
 
+void mmio_readn(void *addr, uint8_t *buf, size_t len)
+{
+	memcpy(buf, addr, len);
+	return;
+}
+
 void mmio_le_writeb(uint8_t val, void *addr)
 {
 	mmio_writeb(cpu_to_le8(val), addr);
diff --git a/internal.c b/internal.c
index 5716e64..479cbf7 100644
--- a/internal.c
+++ b/internal.c
@@ -387,6 +387,6 @@
 static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf,
 				const chipaddr addr, size_t len)
 {
-	memcpy(buf, (void *)addr, len);
+	mmio_readn((void *)addr, buf, len);
 	return;
 }
diff --git a/it87spi.c b/it87spi.c
index f089d78..fa37d52 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -330,7 +330,7 @@
 	OUTB(0x06, it8716f_flashport + 1);
 	OUTB(((2 + (fast_spi ? 1 : 0)) << 4), it8716f_flashport);
 	for (i = 0; i < flash->page_size; i++)
-		chip_writeb(flash, buf[i], bios + start + i);
+		mmio_writeb(buf[i], (void *)(bios + start + i));
 	OUTB(0, it8716f_flashport);
 	/* Wait until the Write-In-Progress bit is cleared.
 	 * This usually takes 1-10 ms, so wait in 1 ms steps.
@@ -356,7 +356,7 @@
 	if ((flash->total_size * 1024 > 512 * 1024)) {
 		spi_read_chunked(flash, buf, start, len, 3);
 	} else {
-		read_memmapped(flash, buf, start, len);
+		mmio_readn((void *)(flash->virtual_memory + start), buf, len);
 	}
 
 	return 0;
diff --git a/programmer.h b/programmer.h
index 240e1af..c99e37f 100644
--- a/programmer.h
+++ b/programmer.h
@@ -312,6 +312,7 @@
 uint8_t mmio_readb(void *addr);
 uint16_t mmio_readw(void *addr);
 uint32_t mmio_readl(void *addr);
+void mmio_readn(void *addr, uint8_t *buf, size_t len);
 void mmio_le_writeb(uint8_t val, void *addr);
 void mmio_le_writew(uint16_t val, void *addr);
 void mmio_le_writel(uint32_t val, void *addr);
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 740a48c..774890e 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -202,7 +202,8 @@
 static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf,
 			  unsigned int start, unsigned int len)
 {
-	return read_memmapped(flash, buf, start, len);
+	mmio_readn((void *)(flash->virtual_memory + start), buf, len);
+	return 0;
 }
 
 #endif