summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Watson <jarrah@users.sourceforge.net>2003-11-02 17:04:49 +0000
committerGreg Watson <jarrah@users.sourceforge.net>2003-11-02 17:04:49 +0000
commit1abd667fdf56ec17b736648c3f6d9a290c400b29 (patch)
treef2fb129025e5eaa823e67330b78e3fac34e395a4
parent68a040dfa1595d2adbe5bd9a6d7a9ca72cdd5f82 (diff)
cant be extern unless defined in a library somewhere
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1244 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/arch/ppc/include/arch/io.h25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/arch/ppc/include/arch/io.h b/src/arch/ppc/include/arch/io.h
index ec98a21677..271482b9bc 100644
--- a/src/arch/ppc/include/arch/io.h
+++ b/src/arch/ppc/include/arch/io.h
@@ -70,7 +70,6 @@ extern void _insw(volatile uint16_t *port, void *buf, int ns);
extern void _outsw(volatile uint16_t *port, const void *buf, int ns);
extern void _insl(volatile uint32_t *port, void *buf, int nl);
extern void _outsl(volatile uint32_t *port, const void *buf, int nl);
-extern void _insw_ns(volatile uint16_t *port, void *buf, int ns);
extern void _outsw_ns(volatile uint16_t *port, const void *buf, int ns);
extern void _insl_ns(volatile uint32_t *port, void *buf, int nl);
extern void _outsl_ns(volatile uint32_t *port, const void *buf, int nl);
@@ -97,7 +96,7 @@ extern void _outsl_ns(volatile uint32_t *port, const void *buf, int nl);
* Acts as a barrier to ensure all previous I/O accesses have
* completed before any further ones are issued.
*/
-extern inline void eieio(void)
+static inline void eieio(void)
{
__asm__ __volatile__ ("eieio" : : : "memory");
}
@@ -112,7 +111,7 @@ extern inline void eieio(void)
/*
* 8, 16 and 32 bit, big and little endian I/O operations, with barrier.
*/
-extern inline int in_8(volatile unsigned char *addr)
+static inline int in_8(volatile unsigned char *addr)
{
int ret;
@@ -120,12 +119,12 @@ extern inline int in_8(volatile unsigned char *addr)
return ret;
}
-extern inline void out_8(volatile unsigned char *addr, int val)
+static inline void out_8(volatile unsigned char *addr, int val)
{
__asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
}
-extern inline int in_le16(volatile unsigned short *addr)
+static inline int in_le16(volatile unsigned short *addr)
{
int ret;
@@ -134,7 +133,7 @@ extern inline int in_le16(volatile unsigned short *addr)
return ret;
}
-extern inline int in_be16(volatile unsigned short *addr)
+static inline int in_be16(volatile unsigned short *addr)
{
int ret;
@@ -142,18 +141,18 @@ extern inline int in_be16(volatile unsigned short *addr)
return ret;
}
-extern inline void out_le16(volatile unsigned short *addr, int val)
+static inline void out_le16(volatile unsigned short *addr, int val)
{
__asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) :
"r" (val), "r" (addr));
}
-extern inline void out_be16(volatile unsigned short *addr, int val)
+static inline void out_be16(volatile unsigned short *addr, int val)
{
__asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
}
-extern inline unsigned in_le32(volatile unsigned *addr)
+static inline unsigned in_le32(volatile unsigned *addr)
{
unsigned ret;
@@ -162,7 +161,7 @@ extern inline unsigned in_le32(volatile unsigned *addr)
return ret;
}
-extern inline unsigned in_be32(volatile unsigned *addr)
+static inline unsigned in_be32(volatile unsigned *addr)
{
unsigned ret;
@@ -170,18 +169,18 @@ extern inline unsigned in_be32(volatile unsigned *addr)
return ret;
}
-extern inline void out_le32(volatile unsigned *addr, int val)
+static inline void out_le32(volatile unsigned *addr, int val)
{
__asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) :
"r" (val), "r" (addr));
}
-extern inline void out_be32(volatile unsigned *addr, int val)
+static inline void out_be32(volatile unsigned *addr, int val)
{
__asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
}
-extern inline void _insw_ns(volatile uint16_t *port, void *buf, int ns)
+static inline void _insw_ns(volatile uint16_t *port, void *buf, int ns)
{
uint16_t * b = (uint16_t *)buf;