Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/powerpc/include/pio.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/powerpc/include/pio.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2.40.1
retrieving revision 1.3
diff -u -p -r1.2.40.1 -r1.3
--- src/sys/arch/powerpc/include/pio.h	2006/06/21 14:55:03	1.2.40.1
+++ src/sys/arch/powerpc/include/pio.h	2005/12/24 20:07:28	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: pio.h,v 1.2.40.1 2006/06/21 14:55:03 yamt Exp $ */
+/*	$NetBSD: pio.h,v 1.3 2005/12/24 20:07:28 perry Exp $ */
 /*	$OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $ */
 
 /*
@@ -39,129 +39,129 @@
  * I/O macros.
  */
 
-static __inline void __outb __P((volatile u_int8_t *a, u_int8_t v));
-static __inline void __outw __P((volatile u_int16_t *a, u_int16_t v));
-static __inline void __outl __P((volatile u_int32_t *a, u_int32_t v));
-static __inline void __outwrb __P((volatile u_int16_t *a, u_int16_t v));
-static __inline void __outlrb __P((volatile u_int32_t *a, u_int32_t v));
-static __inline u_int8_t __inb __P((volatile u_int8_t *a));
-static __inline u_int16_t __inw __P((volatile u_int16_t *a));
-static __inline u_int32_t __inl __P((volatile u_int32_t *a));
-static __inline u_int16_t __inwrb __P((volatile u_int16_t *a));
-static __inline u_int32_t __inlrb __P((volatile u_int32_t *a));
-static __inline void __outsb __P((volatile u_int8_t *, const u_int8_t *,
+static inline void __outb __P((volatile u_int8_t *a, u_int8_t v));
+static inline void __outw __P((volatile u_int16_t *a, u_int16_t v));
+static inline void __outl __P((volatile u_int32_t *a, u_int32_t v));
+static inline void __outwrb __P((volatile u_int16_t *a, u_int16_t v));
+static inline void __outlrb __P((volatile u_int32_t *a, u_int32_t v));
+static inline u_int8_t __inb __P((volatile u_int8_t *a));
+static inline u_int16_t __inw __P((volatile u_int16_t *a));
+static inline u_int32_t __inl __P((volatile u_int32_t *a));
+static inline u_int16_t __inwrb __P((volatile u_int16_t *a));
+static inline u_int32_t __inlrb __P((volatile u_int32_t *a));
+static inline void __outsb __P((volatile u_int8_t *, const u_int8_t *,
 	size_t));
-static __inline void __outsw __P((volatile u_int16_t *, const u_int16_t *,
+static inline void __outsw __P((volatile u_int16_t *, const u_int16_t *,
 	size_t));
-static __inline void __outsl __P((volatile u_int32_t *, const u_int32_t *,
+static inline void __outsl __P((volatile u_int32_t *, const u_int32_t *,
 	size_t));
-static __inline void __outswrb __P((volatile u_int16_t *, const u_int16_t *,
+static inline void __outswrb __P((volatile u_int16_t *, const u_int16_t *,
 	size_t));
-static __inline void __outslrb __P((volatile u_int32_t *, const u_int32_t *,
+static inline void __outslrb __P((volatile u_int32_t *, const u_int32_t *,
 	size_t));
-static __inline void __insb __P((volatile u_int8_t *, u_int8_t *, size_t));
-static __inline void __insw __P((volatile u_int16_t *, u_int16_t *, size_t));
-static __inline void __insl __P((volatile u_int32_t *, u_int32_t *, size_t));
-static __inline void __inswrb __P((volatile u_int16_t *, u_int16_t *, size_t));
-static __inline void __inslrb __P((volatile u_int32_t *, u_int32_t *, size_t));
+static inline void __insb __P((volatile u_int8_t *, u_int8_t *, size_t));
+static inline void __insw __P((volatile u_int16_t *, u_int16_t *, size_t));
+static inline void __insl __P((volatile u_int32_t *, u_int32_t *, size_t));
+static inline void __inswrb __P((volatile u_int16_t *, u_int16_t *, size_t));
+static inline void __inslrb __P((volatile u_int32_t *, u_int32_t *, size_t));
 
-static __inline void
+static inline void
 __outb(a,v)
 	volatile u_int8_t *a;
 	u_int8_t v;
 {
 	*a = v;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outw(a,v)
 	volatile u_int16_t *a;
 	u_int16_t v;
 {
 	*a = v;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outl(a,v)
 	volatile u_int32_t *a;
 	u_int32_t v;
 {
 	*a = v;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outwrb(a,v)
 	volatile u_int16_t *a;
 	u_int16_t v;
 {
-	__asm volatile("sthbrx %0, 0, %1" :: "r"(v), "r"(a));
-	__asm volatile("eieio; sync");
+	__asm__ volatile("sthbrx %0, 0, %1" :: "r"(v), "r"(a));
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outlrb(a,v)
 	volatile u_int32_t *a;
 	u_int32_t v;
 {
-	__asm volatile("stwbrx %0, 0, %1" :: "r"(v), "r"(a));
-	__asm volatile("eieio; sync");
+	__asm__ volatile("stwbrx %0, 0, %1" :: "r"(v), "r"(a));
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline u_int8_t
+static inline u_int8_t
 __inb(a)
 	volatile u_int8_t *a;
 {
 	u_int8_t _v_;
 
 	_v_ = *a;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 	return _v_;
 }
 
-static __inline u_int16_t
+static inline u_int16_t
 __inw(a)
 	volatile u_int16_t *a;
 {
 	u_int16_t _v_;
 
 	_v_ = *a;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 	return _v_;
 }
 
-static __inline u_int32_t
+static inline u_int32_t
 __inl(a)
 	volatile u_int32_t *a;
 {
 	u_int32_t _v_;
 
 	_v_ = *a;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 	return _v_;
 }
 
-static __inline u_int16_t
+static inline u_int16_t
 __inwrb(a)
 	volatile u_int16_t *a;
 {
 	u_int16_t _v_;
 
-	__asm volatile("lhbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
-	__asm volatile("eieio; sync");
+	__asm__ volatile("lhbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
+	__asm__ volatile("eieio; sync");
 	return _v_;
 }
 
-static __inline u_int32_t
+static inline u_int32_t
 __inlrb(a)
 	volatile u_int32_t *a;
 {
 	u_int32_t _v_;
 
-	__asm volatile("lwbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
-	__asm volatile("eieio; sync");
+	__asm__ volatile("lwbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
+	__asm__ volatile("eieio; sync");
 	return _v_;
 }
 
@@ -190,7 +190,7 @@ __inlrb(a)
 #define	in32rb(a)	inlrb(a)
 
 
-static __inline void
+static inline void
 __outsb(a,s,c)
 	volatile u_int8_t *a;
 	const u_int8_t *s;
@@ -198,10 +198,10 @@ __outsb(a,s,c)
 {
 	while (c--)
 		*a = *s++;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outsw(a,s,c)
 	volatile u_int16_t *a;
 	const u_int16_t *s;
@@ -209,10 +209,10 @@ __outsw(a,s,c)
 {
 	while (c--)
 		*a = *s++;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outsl(a,s,c)
 	volatile u_int32_t *a;
 	const u_int32_t *s;
@@ -220,32 +220,32 @@ __outsl(a,s,c)
 {
 	while (c--)
 		*a = *s++;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outswrb(a,s,c)
 	volatile u_int16_t *a;
 	const u_int16_t *s;
 	size_t c;
 {
 	while (c--)
-		__asm volatile("sthbrx %0, 0, %1" :: "r"(*s++), "r"(a));
-	__asm volatile("eieio; sync");
+		__asm__ volatile("sthbrx %0, 0, %1" :: "r"(*s++), "r"(a));
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __outslrb(a,s,c)
 	volatile u_int32_t *a;
 	const u_int32_t *s;
 	size_t c;
 {
 	while (c--)
-		__asm volatile("stwbrx %0, 0, %1" :: "r"(*s++), "r"(a));
-	__asm volatile("eieio; sync");
+		__asm__ volatile("stwbrx %0, 0, %1" :: "r"(*s++), "r"(a));
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __insb(a,d,c)
 	volatile u_int8_t *a;
 	u_int8_t *d;
@@ -253,10 +253,10 @@ __insb(a,d,c)
 {
 	while (c--)
 		*d++ = *a;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __insw(a,d,c)
 	volatile u_int16_t *a;
 	u_int16_t *d;
@@ -264,10 +264,10 @@ __insw(a,d,c)
 {
 	while (c--)
 		*d++ = *a;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __insl(a,d,c)
 	volatile u_int32_t *a;
 	u_int32_t *d;
@@ -275,29 +275,29 @@ __insl(a,d,c)
 {
 	while (c--)
 		*d++ = *a;
-	__asm volatile("eieio; sync");
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __inswrb(a,d,c)
 	volatile u_int16_t *a;
 	u_int16_t *d;
 	size_t c;
 {
 	while (c--)
-		__asm volatile("lhbrx %0, 0, %1" : "=r"(*d++) : "r"(a));
-	__asm volatile("eieio; sync");
+		__asm__ volatile("lhbrx %0, 0, %1" : "=r"(*d++) : "r"(a));
+	__asm__ volatile("eieio; sync");
 }
 
-static __inline void
+static inline void
 __inslrb(a,d,c)
 	volatile u_int32_t *a;
 	u_int32_t *d;
 	size_t c;
 {
 	while (c--)
-		__asm volatile("lwbrx %0, 0, %1" : "=r"(*d++) : "r"(a));
-	__asm volatile("eieio; sync");
+		__asm__ volatile("lwbrx %0, 0, %1" : "=r"(*d++) : "r"(a));
+	__asm__ volatile("eieio; sync");
 }
 
 #define	outsb(a,s,c)	(__outsb((volatile u_int8_t *)(a), s, c))