diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-03-06 22:26:00 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-03-06 22:26:00 +0000 |
| commit | 0472f3d82624dcb19f25746172c6d59532e2463c (patch) | |
| tree | a396b47eb0133b6a7543d69216933227a2c26b5c /en29f002a.c | |
| parent | b88556979b65914d8b0fc85861efeaa9ad9a1d3c (diff) | |
| download | ast2050-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 'en29f002a.c')
| -rw-r--r-- | en29f002a.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/en29f002a.c b/en29f002a.c index 41dac7f..7a8c7f7 100644 --- a/en29f002a.c +++ b/en29f002a.c @@ -35,19 +35,19 @@ int probe_en29f512(struct flashchip *flash) volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; - writeb(0xAA, bios + 0x555); - writeb(0x55, bios + 0x2AA); - writeb(0x90, bios + 0x555); + chip_writeb(0xAA, bios + 0x555); + chip_writeb(0x55, bios + 0x2AA); + chip_writeb(0x90, bios + 0x555); myusec_delay(10); - id1 = readb(bios + 0x100); - id2 = readb(bios + 0x101); + id1 = chip_readb(bios + 0x100); + id2 = chip_readb(bios + 0x101); /* exit by writing F0 anywhere? or the code below */ - writeb(0xAA, bios + 0x555); - writeb(0x55, bios + 0x2AA); - writeb(0xF0, bios + 0x555); + chip_writeb(0xAA, bios + 0x555); + chip_writeb(0x55, bios + 0x2AA); + chip_writeb(0xF0, bios + 0x555); printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); @@ -68,19 +68,19 @@ int probe_en29f002a(struct flashchip *flash) volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; - writeb(0xAA, bios + 0x555); - writeb(0x55, bios + 0xAAA); - writeb(0x90, bios + 0x555); + chip_writeb(0xAA, bios + 0x555); + chip_writeb(0x55, bios + 0xAAA); + chip_writeb(0x90, bios + 0x555); myusec_delay(10); - id1 = readb(bios + 0x100); - id2 = readb(bios + 0x101); + id1 = chip_readb(bios + 0x100); + id2 = chip_readb(bios + 0x101); /* exit by writing F0 anywhere? or the code below */ - writeb(0xAA, bios + 0x555); - writeb(0x55, bios + 0xAAA); - writeb(0xF0, bios + 0x555); + chip_writeb(0xAA, bios + 0x555); + chip_writeb(0x55, bios + 0xAAA); + chip_writeb(0xF0, bios + 0x555); printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); @@ -107,10 +107,10 @@ int write_en29f002a(struct flashchip *flash, uint8_t *buf) /* write to the sector */ if ((i & 0xfff) == 0) printf("address: 0x%08lx", (unsigned long)i); - writeb(0xAA, bios + 0x5555); - writeb(0x55, bios + 0x2AAA); - writeb(0xA0, bios + 0x5555); - writeb(*buf++, dst++); + chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0xA0, bios + 0x5555); + chip_writeb(*buf++, dst++); /* wait for Toggle bit ready */ toggle_ready_jedec(dst); |
