[src/trunk]: src/sys/arch/powerpc/include Switch to using ANSI prototypes.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d23b851a0ac8
branches:  trunk
changeset: 773327:d23b851a0ac8
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jan 30 23:34:58 2012 +0000

description:
Switch to using ANSI prototypes.

diffstat:

 sys/arch/powerpc/include/pio.h |  206 +++++++++++++++-------------------------
 1 files changed, 78 insertions(+), 128 deletions(-)

diffs (truncated from 376 to 300 lines):

diff -r 2dc6766ced14 -r d23b851a0ac8 sys/arch/powerpc/include/pio.h
--- a/sys/arch/powerpc/include/pio.h    Mon Jan 30 23:34:15 2012 +0000
+++ b/sys/arch/powerpc/include/pio.h    Mon Jan 30 23:34:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pio.h,v 1.6 2009/03/14 14:46:05 dsl Exp $ */
+/*     $NetBSD: pio.h,v 1.7 2012/01/30 23:34:58 matt Exp $ */
 /*     $OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $ */
 
 /*
@@ -39,162 +39,139 @@
  * I/O macros.
  */
 
-static __inline void __outb(volatile u_int8_t *a, u_int8_t v);
-static __inline void __outw(volatile u_int16_t *a, u_int16_t v);
-static __inline void __outl(volatile u_int32_t *a, u_int32_t v);
-static __inline void __outwrb(volatile u_int16_t *a, u_int16_t v);
-static __inline void __outlrb(volatile u_int32_t *a, u_int32_t v);
-static __inline u_int8_t __inb(volatile u_int8_t *a);
-static __inline u_int16_t __inw(volatile u_int16_t *a);
-static __inline u_int32_t __inl(volatile u_int32_t *a);
-static __inline u_int16_t __inwrb(volatile u_int16_t *a);
-static __inline u_int32_t __inlrb(volatile u_int32_t *a);
-static __inline void __outsb(volatile u_int8_t *, const u_int8_t *,
-       size_t);
-static __inline void __outsw(volatile u_int16_t *, const u_int16_t *,
-       size_t);
-static __inline void __outsl(volatile u_int32_t *, const u_int32_t *,
-       size_t);
-static __inline void __outswrb(volatile u_int16_t *, const u_int16_t *,
-       size_t);
-static __inline void __outslrb(volatile u_int32_t *, const u_int32_t *,
-       size_t);
-static __inline void __insb(volatile u_int8_t *, u_int8_t *, size_t);
-static __inline void __insw(volatile u_int16_t *, u_int16_t *, size_t);
-static __inline void __insl(volatile u_int32_t *, u_int32_t *, size_t);
-static __inline void __inswrb(volatile u_int16_t *, u_int16_t *, size_t);
-static __inline void __inslrb(volatile u_int32_t *, u_int32_t *, size_t);
+static __inline void __outb(volatile uint8_t *a, uint8_t v);
+static __inline void __outw(volatile uint16_t *a, uint16_t v);
+static __inline void __outl(volatile uint32_t *a, uint32_t v);
+static __inline void __outwrb(volatile uint16_t *a, uint16_t v);
+static __inline void __outlrb(volatile uint32_t *a, uint32_t v);
+static __inline uint8_t __inb(volatile uint8_t *a);
+static __inline uint16_t __inw(volatile uint16_t *a);
+static __inline uint32_t __inl(volatile uint32_t *a);
+static __inline uint16_t __inwrb(volatile uint16_t *a);
+static __inline uint32_t __inlrb(volatile uint32_t *a);
+static __inline void __outsb(volatile uint8_t *, const uint8_t *, size_t);
+static __inline void __outsw(volatile uint16_t *, const uint16_t *, size_t);
+static __inline void __outsl(volatile uint32_t *, const uint32_t *, size_t);
+static __inline void __outswrb(volatile uint16_t *, const uint16_t *, size_t);
+static __inline void __outslrb(volatile uint32_t *, const uint32_t *, size_t);
+static __inline void __insb(volatile uint8_t *, uint8_t *, size_t);
+static __inline void __insw(volatile uint16_t *, uint16_t *, size_t);
+static __inline void __insl(volatile uint32_t *, uint32_t *, size_t);
+static __inline void __inswrb(volatile uint16_t *, uint16_t *, size_t);
+static __inline void __inslrb(volatile uint32_t *, uint32_t *, size_t);
 
 static __inline void
-__outb(a,v)
-       volatile u_int8_t *a;
-       u_int8_t v;
+__outb(volatile uint8_t *a, uint8_t v)
 {
        *a = v;
        __asm volatile("eieio; sync");
 }
 
 static __inline void
-__outw(a,v)
-       volatile u_int16_t *a;
-       u_int16_t v;
+__outw(volatile uint16_t *a, uint16_t v)
 {
        *a = v;
        __asm volatile("eieio; sync");
 }
 
 static __inline void
-__outl(a,v)
-       volatile u_int32_t *a;
-       u_int32_t v;
+__outl(volatile uint32_t *a, uint32_t v)
 {
        *a = v;
        __asm volatile("eieio; sync");
 }
 
 static __inline void
-__outwrb(a,v)
-       volatile u_int16_t *a;
-       u_int16_t v;
+__outwrb(volatile uint16_t *a, uint16_t v)
 {
        __asm volatile("sthbrx %0, 0, %1" :: "r"(v), "r"(a));
        __asm volatile("eieio; sync");
 }
 
 static __inline void
-__outlrb(a,v)
-       volatile u_int32_t *a;
-       u_int32_t v;
+__outlrb(volatile uint32_t *a, uint32_t v)
 {
        __asm volatile("stwbrx %0, 0, %1" :: "r"(v), "r"(a));
        __asm volatile("eieio; sync");
 }
 
-static __inline u_int8_t
-__inb(a)
-       volatile u_int8_t *a;
+static __inline uint8_t
+__inb(volatile uint8_t *a)
 {
-       u_int8_t _v_;
+       uint8_t _v_;
 
        _v_ = *a;
        __asm volatile("eieio; sync");
        return _v_;
 }
 
-static __inline u_int16_t
-__inw(a)
-       volatile u_int16_t *a;
+static __inline uint16_t
+__inw(volatile uint16_t *a)
 {
-       u_int16_t _v_;
+       uint16_t _v_;
 
        _v_ = *a;
        __asm volatile("eieio; sync");
        return _v_;
 }
 
-static __inline u_int32_t
-__inl(a)
-       volatile u_int32_t *a;
+static __inline uint32_t
+__inl(volatile uint32_t *a)
 {
-       u_int32_t _v_;
+       uint32_t _v_;
 
        _v_ = *a;
        __asm volatile("eieio; sync");
        return _v_;
 }
 
-static __inline u_int16_t
-__inwrb(a)
-       volatile u_int16_t *a;
+static __inline uint16_t
+__inwrb(volatile uint16_t *a)
 {
-       u_int16_t _v_;
+       uint16_t _v_;
 
        __asm volatile("lhbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
        __asm volatile("eieio; sync");
        return _v_;
 }
 
-static __inline u_int32_t
-__inlrb(a)
-       volatile u_int32_t *a;
+static __inline uint32_t
+__inlrb(volatile uint32_t *a)
 {
-       u_int32_t _v_;
+       uint32_t _v_;
 
        __asm volatile("lwbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
        __asm volatile("eieio; sync");
        return _v_;
 }
 
-#define        outb(a,v)       (__outb((volatile u_int8_t *)(a), v))
+#define        outb(a,v)       (__outb((volatile uint8_t *)(a), v))
 #define        out8(a,v)       outb(a,v)
-#define        outw(a,v)       (__outw((volatile u_int16_t *)(a), v))
+#define        outw(a,v)       (__outw((volatile uint16_t *)(a), v))
 #define        out16(a,v)      outw(a,v)
-#define        outl(a,v)       (__outl((volatile u_int32_t *)(a), v))
+#define        outl(a,v)       (__outl((volatile uint32_t *)(a), v))
 #define        out32(a,v)      outl(a,v)
-#define        inb(a)          (__inb((volatile u_int8_t *)(a)))
+#define        inb(a)          (__inb((volatile uint8_t *)(a)))
 #define        in8(a)          inb(a)
-#define        inw(a)          (__inw((volatile u_int16_t *)(a)))
+#define        inw(a)          (__inw((volatile uint16_t *)(a)))
 #define        in16(a)         inw(a)
-#define        inl(a)          (__inl((volatile u_int32_t *)(a)))
+#define        inl(a)          (__inl((volatile uint32_t *)(a)))
 #define        in32(a)         inl(a)
 
 #define        out8rb(a,v)     outb(a,v)
-#define        outwrb(a,v)     (__outwrb((volatile u_int16_t *)(a), v))
+#define        outwrb(a,v)     (__outwrb((volatile uint16_t *)(a), v))
 #define        out16rb(a,v)    outwrb(a,v)
-#define        outlrb(a,v)     (__outlrb((volatile u_int32_t *)(a), v))
+#define        outlrb(a,v)     (__outlrb((volatile uint32_t *)(a), v))
 #define        out32rb(a,v)    outlrb(a,v)
 #define        in8rb(a)        inb(a)
-#define        inwrb(a)        (__inwrb((volatile u_int16_t *)(a)))
+#define        inwrb(a)        (__inwrb((volatile uint16_t *)(a)))
 #define        in16rb(a)       inwrb(a)
-#define        inlrb(a)        (__inlrb((volatile u_int32_t *)(a)))
+#define        inlrb(a)        (__inlrb((volatile uint32_t *)(a)))
 #define        in32rb(a)       inlrb(a)
 
 
 static __inline void
-__outsb(a,s,c)
-       volatile u_int8_t *a;
-       const u_int8_t *s;
-       size_t c;
+__outsb(volatile uint8_t *a, const uint8_t *s, size_t c)
 {
        while (c--)
                *a = *s++;
@@ -202,10 +179,7 @@
 }
 
 static __inline void
-__outsw(a,s,c)
-       volatile u_int16_t *a;
-       const u_int16_t *s;
-       size_t c;
+__outsw(volatile uint16_t *a, const uint16_t *s, size_t c)
 {
        while (c--)
                *a = *s++;
@@ -213,10 +187,7 @@
 }
 
 static __inline void
-__outsl(a,s,c)
-       volatile u_int32_t *a;
-       const u_int32_t *s;
-       size_t c;
+__outsl(volatile uint32_t *a, const uint32_t *s, size_t c)
 {
        while (c--)
                *a = *s++;
@@ -224,10 +195,7 @@
 }
 
 static __inline void
-__outswrb(a,s,c)
-       volatile u_int16_t *a;
-       const u_int16_t *s;
-       size_t c;
+__outswrb(volatile uint16_t *a, const uint16_t *s, size_t c)
 {
        while (c--)
                __asm volatile("sthbrx %0, 0, %1" :: "r"(*s++), "r"(a));
@@ -235,10 +203,7 @@
 }
 
 static __inline void
-__outslrb(a,s,c)
-       volatile u_int32_t *a;
-       const u_int32_t *s;
-       size_t c;
+__outslrb(volatile uint32_t *a, const uint32_t *s, size_t c)
 {
        while (c--)
                __asm volatile("stwbrx %0, 0, %1" :: "r"(*s++), "r"(a));
@@ -246,10 +211,15 @@
 }
 
 static __inline void
-__insb(a,d,c)
-       volatile u_int8_t *a;
-       u_int8_t *d;
-       size_t c;
+__insb(volatile uint8_t *a, uint8_t *d, size_t c)
+{
+       while (c--)
+               *d++ = *a;
+       __asm volatile("eieio; sync");
+}
+
+static __inline void
+__insw(volatile uint16_t *a, uint16_t *d, size_t c)
 {
        while (c--)
                *d++ = *a;
@@ -257,10 +227,7 @@
 }
 
 static __inline void
-__insw(a,d,c)
-       volatile u_int16_t *a;
-       u_int16_t *d;
-       size_t c;
+__insl(volatile uint32_t *a, uint32_t *d, size_t c)