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

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

diff --git a/util/flashrom/w39v080fa.c b/util/flashrom/w39v080fa.c
index 6278fbc43e4d22a1f30e982eed89232cfcd83e62..ba32add9f9ac2a5157d6b572379073c33f18efd3 100644 (file)
--- a/util/flashrom/w39v080fa.c
+++ b/util/flashrom/w39v080fa.c
@@ -27,19 +27,19 @@ int probe_winbond_fwhub(struct flashchip *flash)
        uint8_t vid, did;
 
        /* Product Identification Entry */
-       writeb(0xAA, bios + 0x5555);
-       writeb(0x55, bios + 0x2AAA);
-       writeb(0x90, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
+       chip_writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0x90, bios + 0x5555);
        myusec_delay(10);
 
        /* Read product ID */
-       vid = readb(bios);
-       did = readb(bios + 0x01);
+       vid = chip_readb(bios);
+       did = chip_readb(bios + 0x01);
 
        /* Product Identifixation Exit */
-       writeb(0xAA, bios + 0x5555);
-       writeb(0x55, bios + 0x2AAA);
-       writeb(0xF0, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
+       chip_writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0xF0, bios + 0x5555);
        myusec_delay(10);
 
        printf_debug("%s: vid 0x%x, did 0x%x\n", __FUNCTION__, vid, did);
@@ -58,16 +58,16 @@ static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset)
        uint8_t locking;
 
        printf_debug("Trying to unlock block @0x%08x = 0x%02x\n", offset,
-                    readb(wrprotect));
+                    chip_readb(wrprotect));
 
-       locking = readb(wrprotect);
+       locking = chip_readb(wrprotect);
        switch (locking & 0x7) {
        case 0:
                printf_debug("Full Access.\n");
                return 0;
        case 1:
                printf_debug("Write Lock (Default State).\n");
-               writeb(0, wrprotect);
+               chip_writeb(0, wrprotect);
                return 0;
        case 2:
                printf_debug("Locked Open (Full Access, Lock Down).\n");
@@ -77,11 +77,11 @@ static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset)
                return -1;
        case 4:
                printf_debug("Read Lock.\n");
-               writeb(0, wrprotect);
+               chip_writeb(0, wrprotect);
                return 0;
        case 5:
                printf_debug("Read/Write Lock.\n");
-               writeb(0, wrprotect);
+               chip_writeb(0, wrprotect);
                return 0;
        case 6:
                fprintf(stderr, "Error: Read Lock, Locked Down.\n");
@@ -106,18 +106,18 @@ int unlock_winbond_fwhub(struct flashchip *flash)
         */
 
        /* Product Identification Entry */
-       writeb(0xAA, bios + 0x5555);
-       writeb(0x55, bios + 0x2AAA);
-       writeb(0x90, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
+       chip_writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0x90, bios + 0x5555);
        myusec_delay(10);
 
        /* Read Hardware Lock Bits */
-       locking = readb(bios + 0xffff2);
+       locking = chip_readb(bios + 0xffff2);
 
        /* Product Identification Exit */
-       writeb(0xAA, bios + 0x5555);
-       writeb(0x55, bios + 0x2AAA);
-       writeb(0xF0, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
+       chip_writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0xF0, bios + 0x5555);
        myusec_delay(10);
 
        printf_debug("Lockout bits:\n");
@@ -151,13 +151,13 @@ static int erase_sector_winbond_fwhub(volatile uint8_t *bios,
        printf("0x%08x\b\b\b\b\b\b\b\b\b\b", sector);
 
        /* Sector Erase */
-       writeb(0xAA, bios + 0x5555);
-       writeb(0x55, bios + 0x2AAA);
-       writeb(0x80, bios + 0x5555);
+       chip_writeb(0xAA, bios + 0x5555);
+       chip_writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0x80, bios + 0x5555);
 
-       writeb(0xAA, bios + 0x5555);
-       writeb(0x55, bios + 0x2AAA);
-       writeb(0x30, bios + sector);
+       chip_writeb(0xAA, bios + 0x5555);
+       chip_writeb(0x55, bios + 0x2AAA);
+       chip_writeb(0x30, bios + sector);
 
        /* wait for Toggle bit ready */
        toggle_ready_jedec(bios);