vserver 1.9.5.x5

[linux-2.6.git] / arch / m32r / kernel / io_mappi.c

diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/kernel/io_mappi.c
index 74aeca6..85688ff 100644 (file)
--- a/arch/m32r/kernel/io_mappi.c
+++ b/arch/m32r/kernel/io_mappi.c
@@ -7,15 +7,13 @@
  *                            Hitoshi Yamamoto
  */
 
-/* $Id: io_mappi.c,v 1.9 2003/12/02 07:18:08 fujiwara Exp $ */
-
 #include <linux/config.h>
 #include <asm/m32r.h>
 #include <asm/page.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
 #include <linux/types.h>
 
 #define M32R_PCC_IOMAP_SIZE 0x1000
@@ -27,21 +25,21 @@
 
 extern void pcc_ioread(int, unsigned long, void *, size_t, size_t, int);
 extern void pcc_iowrite(int, unsigned long, void *, size_t, size_t, int);
-#endif /* CONFIG_PCMCIA && CONFIG_M32RPCC */
+#endif /* CONFIG_PCMCIA && CONFIG_M32R_PCC */
 
 #define PORT2ADDR(port)  _port2addr(port)
 
-static __inline__ void *_port2addr(unsigned long port)
+static inline void *_port2addr(unsigned long port)
 {
        return (void *)(port + NONCACHE_OFFSET);
 }
 
-static __inline__ void *_port2addr_ne(unsigned long port)
+static inline void *_port2addr_ne(unsigned long port)
 {
        return (void *)((port<<1) + NONCACHE_OFFSET + 0x0C000000);
 }
 
-static __inline__ void delay(void)
+static inline void delay(void)
 {
        __asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
 }
@@ -52,12 +50,12 @@ static __inline__ void delay(void)
 
 #define PORT2ADDR_NE(port)  _port2addr_ne(port)
 
-static __inline__ unsigned char _ne_inb(void *portp)
+static inline unsigned char _ne_inb(void *portp)
 {
        return (unsigned char) *(volatile unsigned short *)portp;
 }
 
-static __inline__ unsigned short _ne_inw(void *portp)
+static inline unsigned short _ne_inw(void *portp)
 {
        unsigned short tmp;
 
@@ -65,12 +63,12 @@ static __inline__ unsigned short _ne_inw(void *portp)
        return le16_to_cpu(tmp);
 }
 
-static __inline__ void _ne_outb(unsigned char b, void *portp)
+static inline void _ne_outb(unsigned char b, void *portp)
 {
        *(volatile unsigned short *)portp = (unsigned short)b;
 }
 
-static __inline__ void _ne_outw(unsigned short w, void *portp)
+static inline void _ne_outw(unsigned short w, void *portp)
 {
        *(volatile unsigned short *)portp = cpu_to_le16(w);
 }
@@ -80,15 +78,15 @@ unsigned char _inb(unsigned long port)
        if (port >= 0x300 && port < 0x320)
                return _ne_inb(PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
         if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          unsigned char b;
-          pcc_ioread(0, port, &b, sizeof(b), 1, 0);
-          return b;
+               unsigned char b;
+               pcc_ioread(0, port, &b, sizeof(b), 1, 0);
+               return b;
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-         unsigned char b;
-          pcc_ioread(1, port, &b, sizeof(b), 1, 0);
-          return b;
+               unsigned char b;
+               pcc_ioread(1, port, &b, sizeof(b), 1, 0);
+               return b;
        } else
 #endif
 
@@ -100,15 +98,15 @@ unsigned short _inw(unsigned long port)
        if (port >= 0x300 && port < 0x320)
                return _ne_inw(PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          unsigned short w;
-          pcc_ioread(0, port, &w, sizeof(w), 1, 0);
-          return w;
+               unsigned short w;
+               pcc_ioread(0, port, &w, sizeof(w), 1, 0);
+               return w;
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          unsigned short w;
-          pcc_ioread(1, port, &w, sizeof(w), 1, 0);
-          return w;
+               unsigned short w;
+               pcc_ioread(1, port, &w, sizeof(w), 1, 0);
+               return w;
        } else
 #endif
        return *(volatile unsigned short *)PORT2ADDR(port);
@@ -116,15 +114,15 @@ unsigned short _inw(unsigned long port)
 
 unsigned long _inl(unsigned long port)
 {
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          unsigned long l;
-          pcc_ioread(0, port, &l, sizeof(l), 1, 0);
-          return l;
+               unsigned long l;
+               pcc_ioread(0, port, &l, sizeof(l), 1, 0);
+               return l;
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          unsigned short l;
-          pcc_ioread(1, port, &l, sizeof(l), 1, 0);
-          return l;
+               unsigned short l;
+               pcc_ioread(1, port, &l, sizeof(l), 1, 0);
+               return l;
        } else
 #endif
        return *(volatile unsigned long *)PORT2ADDR(port);
@@ -137,15 +135,15 @@ unsigned char _inb_p(unsigned long port)
        if (port >= 0x300 && port < 0x320)
                v = _ne_inb(PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          unsigned char b;
-          pcc_ioread(0, port, &b, sizeof(b), 1, 0);
-          return b;
+               unsigned char b;
+               pcc_ioread(0, port, &b, sizeof(b), 1, 0);
+               return b;
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-         unsigned char b;
-          pcc_ioread(1, port, &b, sizeof(b), 1, 0);
-          return b;
+               unsigned char b;
+               pcc_ioread(1, port, &b, sizeof(b), 1, 0);
+               return b;
        } else
 #endif
                v = *(volatile unsigned char *)PORT2ADDR(port);
@@ -161,15 +159,15 @@ unsigned short _inw_p(unsigned long port)
        if (port >= 0x300 && port < 0x320)
                v = _ne_inw(PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          unsigned short w;
-          pcc_ioread(0, port, &w, sizeof(w), 1, 0);
-          return w;
+               unsigned short w;
+               pcc_ioread(0, port, &w, sizeof(w), 1, 0);
+               return w;
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          unsigned short w;
-          pcc_ioread(1, port, &w, sizeof(w), 1, 0);
-          return w;
+               unsigned short w;
+               pcc_ioread(1, port, &w, sizeof(w), 1, 0);
+               return w;
        } else
 #endif
                v = *(volatile unsigned short *)PORT2ADDR(port);
@@ -192,11 +190,11 @@ void _outb(unsigned char b, unsigned long port)
        if (port >= 0x300 && port < 0x320)
                _ne_outb(b, PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
+               pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, &b, sizeof(b), 1, 0);
+               pcc_iowrite(1, port, &b, sizeof(b), 1, 0);
        } else
 #endif
                *(volatile unsigned char *)PORT2ADDR(port) = b;
@@ -207,11 +205,11 @@ void _outw(unsigned short w, unsigned long port)
        if (port >= 0x300 && port < 0x320)
                _ne_outw(w, PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
+               pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, &w, sizeof(w), 1, 0);
+               pcc_iowrite(1, port, &w, sizeof(w), 1, 0);
        } else
 #endif
                *(volatile unsigned short *)PORT2ADDR(port) = w;
@@ -219,11 +217,11 @@ void _outw(unsigned short w, unsigned long port)
 
 void _outl(unsigned long l, unsigned long port)
 {
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, &l, sizeof(l), 1, 0);
+               pcc_iowrite(0, port, &l, sizeof(l), 1, 0);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, &l, sizeof(l), 1, 0);
+               pcc_iowrite(1, port, &l, sizeof(l), 1, 0);
        } else
 #endif
        *(volatile unsigned long *)PORT2ADDR(port) = l;
@@ -234,11 +232,11 @@ void _outb_p(unsigned char b, unsigned long port)
        if (port >= 0x300 && port < 0x320)
                _ne_outb(b, PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
+               pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, &b, sizeof(b), 1, 0);
+               pcc_iowrite(1, port, &b, sizeof(b), 1, 0);
        } else
 #endif
                *(volatile unsigned char *)PORT2ADDR(port) = b;
@@ -251,11 +249,11 @@ void _outw_p(unsigned short w, unsigned long port)
        if (port >= 0x300 && port < 0x320)
                _ne_outw(w, PORT2ADDR_NE(port));
        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
+               pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, &w, sizeof(w), 1, 0);
+               pcc_iowrite(1, port, &w, sizeof(w), 1, 0);
        } else
 #endif
                *(volatile unsigned short *)PORT2ADDR(port) = w;
@@ -269,100 +267,118 @@ void _outl_p(unsigned long l, unsigned long port)
        delay();
 }
 
-void _insb(unsigned int port, void * addr, unsigned long count)
+void _insb(unsigned int port, void *addr, unsigned long count)
 {
        unsigned short *buf = addr;
        unsigned short *portp;
 
        if (port >= 0x300 && port < 0x320){
                portp = PORT2ADDR_NE(port);
-               while(count--) *buf++ = *(volatile unsigned char *)portp;
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+               while (count--)
+                       *buf++ = *(volatile unsigned char *)portp;
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_ioread(0, port, (void *)addr, sizeof(unsigned char), count, 1);
+               pcc_ioread(0, port, (void *)addr, sizeof(unsigned char),
+                          count, 1);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_ioread(1, port, (void *)addr, sizeof(unsigned char), count, 1);
+               pcc_ioread(1, port, (void *)addr, sizeof(unsigned char),
+                          count, 1);
 #endif
        } else {
                portp = PORT2ADDR(port);
-               while(count--) *buf++ = *(volatile unsigned char *)portp;
+               while (count--)
+                       *buf++ = *(volatile unsigned char *)portp;
        }
 }
 
-void _insw(unsigned int port, void * addr, unsigned long count)
+void _insw(unsigned int port, void *addr, unsigned long count)
 {
        unsigned short *buf = addr;
        unsigned short *portp;
 
        if (port >= 0x300 && port < 0x320) {
                portp = PORT2ADDR_NE(port);
-               while (count--) *buf++ = _ne_inw(portp);
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+               while (count--)
+                       *buf++ = _ne_inw(portp);
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_ioread(0, port, (void *)addr, sizeof(unsigned short), count, 1);
+               pcc_ioread(0, port, (void *)addr, sizeof(unsigned short),
+                          count, 1);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_ioread(1, port, (void *)addr, sizeof(unsigned short), count, 1);
+               pcc_ioread(1, port, (void *)addr, sizeof(unsigned short),
+                          count, 1);
 #endif
        } else {
                portp = PORT2ADDR(port);
-               while (count--) *buf++ = *(volatile unsigned short *)portp;
+               while (count--)
+                       *buf++ = *(volatile unsigned short *)portp;
        }
 }
 
-void _insl(unsigned int port, void * addr, unsigned long count)
+void _insl(unsigned int port, void *addr, unsigned long count)
 {
        unsigned long *buf = addr;
        unsigned long *portp;
 
        portp = PORT2ADDR(port);
-       while (count--) *buf++ = *(volatile unsigned long *)portp;
+       while (count--)
+               *buf++ = *(volatile unsigned long *)portp;
 }
 
-void _outsb(unsigned int port, const void * addr, unsigned long count)
+void _outsb(unsigned int port, const void *addr, unsigned long count)
 {
        const unsigned char *buf = addr;
        unsigned char *portp;
 
        if (port >= 0x300 && port < 0x320) {
                portp = PORT2ADDR_NE(port);
-               while (count--) _ne_outb(*buf++, portp);
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+               while (count--)
+                       _ne_outb(*buf++, portp);
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, (void *)addr, sizeof(unsigned char), count, 1);
+               pcc_iowrite(0, port, (void *)addr, sizeof(unsigned char),
+                           count, 1);
        } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, (void *)addr, sizeof(unsigned char), count, 1);
+               pcc_iowrite(1, port, (void *)addr, sizeof(unsigned char),
+                           count, 1);
 #endif
        } else {
                portp = PORT2ADDR(port);
-               while(count--) *(volatile unsigned char *)portp = *buf++;
+               while (count--)
+                       *(volatile unsigned char *)portp = *buf++;
        }
 }
 
-void _outsw(unsigned int port, const void * addr, unsigned long count)
+void _outsw(unsigned int port, const void *addr, unsigned long count)
 {
        const unsigned short *buf = addr;
        unsigned short *portp;
 
        if (port >= 0x300 && port < 0x320) {
                portp = PORT2ADDR_NE(port);
-               while (count--) _ne_outw(*buf++, portp);
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC)
+               while (count--)
+                       _ne_outw(*buf++, portp);
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-          pcc_iowrite(0, port, (void *)addr, sizeof(unsigned short), count, 1);
+               pcc_iowrite(0, port, (void *)addr, sizeof(unsigned short),
+                           count, 1);
        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
-          pcc_iowrite(1, port, (void *)addr, sizeof(unsigned short), count, 1);
+               pcc_iowrite(1, port, (void *)addr, sizeof(unsigned short),
+                           count, 1);
 #endif
        } else {
                portp = PORT2ADDR(port);
-               while(count--) *(volatile unsigned short *)portp = *buf++;
+               while (count--)
+                       *(volatile unsigned short *)portp = *buf++;
        }
 }
 
-void _outsl(unsigned int port, const void * addr, unsigned long count)
+void _outsl(unsigned int port, const void *addr, unsigned long count)
 {
        const unsigned long *buf = addr;
        unsigned char *portp;
 
        portp = PORT2ADDR(port);
-       while(count--) *(volatile unsigned long *)portp = *buf++;
+       while (count--)
+               *(volatile unsigned long *)portp = *buf++;
 }