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

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

diff --git a/util/flashrom/w29ee011.c b/util/flashrom/w29ee011.c
index 80a4e66ad9317bb84dcc1514bc8a87c9abbd8784..37b908256c3aa62177b697275d98f7224e4def73 100644 (file)
--- a/util/flashrom/w29ee011.c
+++ b/util/flashrom/w29ee011.c
@@ -37,29 +37,29 @@ int probe_w29ee011(struct flashchip *flash)
        }
 
        /* Issue JEDEC Product ID Entry command */
-       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(0x80, bios + 0x5555);
+       chip_writeb(0x80, bios + 0x5555);
        myusec_delay(10);
-       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(0x60, bios + 0x5555);
+       chip_writeb(0x60, bios + 0x5555);
        myusec_delay(10);
 
        /* Read product ID */
-       id1 = readb(bios);
-       id2 = readb(bios + 0x01);
+       id1 = chip_readb(bios);
+       id2 = chip_readb(bios + 0x01);
 
        /* Issue JEDEC Product ID Exit command */
-       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(10);
 
        printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);