summaryrefslogtreecommitdiffstats
path: root/w39v040c.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-03-06 22:26:00 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-03-06 22:26:00 +0000
commit0472f3d82624dcb19f25746172c6d59532e2463c (patch)
treea396b47eb0133b6a7543d69216933227a2c26b5c /w39v040c.c
parentb88556979b65914d8b0fc85861efeaa9ad9a1d3c (diff)
downloadast2050-flashrom-0472f3d82624dcb19f25746172c6d59532e2463c.zip
ast2050-flashrom-0472f3d82624dcb19f25746172c6d59532e2463c.tar.gz
FreeBSD definitions of (read|write)[bwl] collide with our own
Before we attempt trickery, we can simply rename the accessor functions. Patch created with the help of Coccinelle. Corresponding to flashrom svn r420 and coreboot v2 svn r3984. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Idwer Vollering <idwer_v@hotmail.com> Acked-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'w39v040c.c')
-rw-r--r--w39v040c.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/w39v040c.c b/w39v040c.c
index 3a0f430..f631d33 100644
--- a/w39v040c.c
+++ b/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);
OpenPOWER on IntegriCloud