From 0472f3d82624dcb19f25746172c6d59532e2463c Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Fri, 6 Mar 2009 22:26:00 +0000 Subject: 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 Acked-by: Idwer Vollering Acked-by: Patrick Georgi --- m29f002.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'm29f002.c') diff --git a/m29f002.c b/m29f002.c index f806a2d..a0fdf55 100644 --- a/m29f002.c +++ b/m29f002.c @@ -22,12 +22,12 @@ int erase_m29f002(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; - writeb(0xaa, bios + 0x555); - writeb(0x55, bios + 0xaaa); - writeb(0x80, bios + 0x555); - writeb(0xaa, bios + 0x555); - writeb(0x55, bios + 0xaaa); - writeb(0x10, bios + 0x555); + chip_writeb(0xaa, bios + 0x555); + chip_writeb(0x55, bios + 0xaaa); + chip_writeb(0x80, bios + 0x555); + chip_writeb(0xaa, bios + 0x555); + chip_writeb(0x55, bios + 0xaaa); + chip_writeb(0x10, bios + 0x555); myusec_delay(10); toggle_ready_jedec(bios); return 0; @@ -35,21 +35,21 @@ int erase_m29f002(struct flashchip *flash) { static void rewrite_block(volatile uint8_t *bios, uint8_t *src, volatile uint8_t *dst, int size) { /* erase */ - writeb(0xaa, bios + 0x555); - writeb(0x55, bios + 0xaaa); - writeb(0x80, bios + 0x555); - writeb(0xaa, bios + 0x555); - writeb(0x55, bios + 0xaaa); - writeb(0x30, dst); + chip_writeb(0xaa, bios + 0x555); + chip_writeb(0x55, bios + 0xaaa); + chip_writeb(0x80, bios + 0x555); + chip_writeb(0xaa, bios + 0x555); + chip_writeb(0x55, bios + 0xaaa); + chip_writeb(0x30, dst); myusec_delay(10); toggle_ready_jedec(bios); /* program */ while (size--) { - writeb(0xaa, bios + 0x555); - writeb(0x55, bios + 0xaaa); - writeb(0xa0, bios + 0x555); - writeb(*src, dst); + chip_writeb(0xaa, bios + 0x555); + chip_writeb(0x55, bios + 0xaaa); + chip_writeb(0xa0, bios + 0x555); + chip_writeb(*src, dst); toggle_ready_jedec(dst); dst++; src++; -- cgit v1.1