summaryrefslogtreecommitdiff
path: root/util/flashrom/flash.h
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
commit3b1a955ccef1c980ccea5af06349c0ea74a28d5a (patch)
tree31a0512760fdfb56c0a102aa8fbbfc9a900c4741 /util/flashrom/flash.h
parent45cc550c3ab24e6c68fd0f9dd5ea2f96cf9afc38 (diff)
downloadcoreboot-3b1a955ccef1c980ccea5af06349c0ea74a28d5a.tar.xz
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
Diffstat (limited to 'util/flashrom/flash.h')
-rw-r--r--util/flashrom/flash.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/util/flashrom/flash.h b/util/flashrom/flash.h
index b33e1330c4..38f3bcba99 100644
--- a/util/flashrom/flash.h
+++ b/util/flashrom/flash.h
@@ -58,32 +58,32 @@
#define INL inl
#endif
-static inline void writeb(uint8_t b, volatile void *addr)
+static inline void chip_writeb(uint8_t b, volatile void *addr)
{
*(volatile uint8_t *) addr = b;
}
-static inline void writew(uint16_t b, volatile void *addr)
+static inline void chip_writew(uint16_t b, volatile void *addr)
{
*(volatile uint16_t *) addr = b;
}
-static inline void writel(uint32_t b, volatile void *addr)
+static inline void chip_writel(uint32_t b, volatile void *addr)
{
*(volatile uint32_t *) addr = b;
}
-static inline uint8_t readb(const volatile void *addr)
+static inline uint8_t chip_readb(const volatile void *addr)
{
return *(volatile uint8_t *) addr;
}
-static inline uint16_t readw(const volatile void *addr)
+static inline uint16_t chip_readw(const volatile void *addr)
{
return *(volatile uint16_t *) addr;
}
-static inline uint32_t readl(const volatile void *addr)
+static inline uint32_t chip_readl(const volatile void *addr)
{
return *(volatile uint32_t *) addr;
}