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. 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> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3984 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user