FreeBSD definitions of (read|write)[bwl] collide with our own. Before we

[coreboot.git] / util / flashrom / w39v040c.c

diff --git a/util/flashrom/w39v040c.c b/util/flashrom/w39v040c.c
index 3a0f430295315fdf6aaa9b6f7231a5739af4fda1..f631d33f938e8d8238b338bc3e15662055c74be4 100644 (file)
--- a/util/flashrom/w39v040c.c
+++ b/util/flashrom/w39v040c.c
@@ -26,22 +26,22 @@ int probe_w39v040c(struct flashchip *flash)
        volatile uint8_t *bios = flash->virtual_memory;
        uint8_t id1, id2, lock;
 
-       writeb(0xAA, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
        myusec_delay(10);
-       writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0x55, bios + 0x2AAA);
        myusec_delay(10);
-       writeb(0x90, bios + 0x5555);
+       chip_writeb(0x90, bios + 0x5555);
        myusec_delay(10);
 
-       id1 = readb(bios);
-       id2 = readb(bios + 1);
-       lock = readb(bios + 0xfff2);
+       id1 = chip_readb(bios);
+       id2 = chip_readb(bios + 1);
+       lock = chip_readb(bios + 0xfff2);
 
-       writeb(0xAA, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
        myusec_delay(10);
-       writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0x55, bios + 0x2AAA);
        myusec_delay(10);
-       writeb(0xF0, bios + 0x5555);
+       chip_writeb(0xF0, bios + 0x5555);
        myusec_delay(40);
 
        printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2);