From 2aad33d767e5e9fcabd6ead6d0111eacb30df626 Mon Sep 17 00:00:00 2001 From: Hirokazu Takata Date: Thu, 16 Sep 2004 22:07:16 -0700 Subject: [PATCH] [PATCH] m32r: modify IO routines for m32700ut CF access Here is a patch for M3T-M32700UT board. - Enable CF access through card-service if CONFIG_M32R_CFC is not defined. Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/m32r/kernel/io_m32700ut.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/kernel/io_m32700ut.c index 9843b32922dd1..501b755814113 100644 --- a/arch/m32r/kernel/io_m32700ut.c +++ b/arch/m32r/kernel/io_m32700ut.c @@ -40,7 +40,7 @@ static __inline__ void *_port2addr(unsigned long port) return (void *)(port + NONCACHE_OFFSET); } -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) static __inline__ void *__port2addr_ata(unsigned long port) { static int dummy_reg; @@ -119,7 +119,7 @@ unsigned char _inb(unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) return _ne_inb(PORT2ADDR_NE(port)); -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { return *(volatile unsigned char *)__port2addr_ata(port); } @@ -139,7 +139,7 @@ unsigned short _inw(unsigned long port) { if (port >= LAN_IOSTART && port < LAN_IOEND) return _ne_inw(PORT2ADDR_NE(port)); -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { return *(volatile unsigned short *)__port2addr_ata(port); } @@ -177,7 +177,7 @@ unsigned char _inb_p(unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) v = _ne_inb(PORT2ADDR_NE(port)); else -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { return *(volatile unsigned char *)__port2addr_ata(port); } else @@ -202,7 +202,7 @@ unsigned short _inw_p(unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) v = _ne_inw(PORT2ADDR_NE(port)); else -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { return *(volatile unsigned short *)__port2addr_ata(port); } else @@ -239,7 +239,7 @@ void _outb(unsigned char b, unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) _ne_outb(b, PORT2ADDR_NE(port)); else -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { *(volatile unsigned char *)__port2addr_ata(port) = b; } else @@ -257,7 +257,7 @@ void _outw(unsigned short w, unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) _ne_outw(w, PORT2ADDR_NE(port)); else -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { *(volatile unsigned short *)__port2addr_ata(port) = w; } else @@ -290,7 +290,7 @@ void _outb_p(unsigned char b, unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) _ne_outb(b, PORT2ADDR_NE(port)); else -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { *(volatile unsigned char *)__port2addr_ata(port) = b; } else @@ -310,7 +310,7 @@ void _outw_p(unsigned short w, unsigned long port) if (port >= LAN_IOSTART && port < LAN_IOEND) _ne_outw(w, PORT2ADDR_NE(port)); else -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { *(volatile unsigned short *)__port2addr_ata(port) = w; } else @@ -340,7 +340,7 @@ void _insb(unsigned int port, void * addr, unsigned long count) { if (port >= LAN_IOSTART && port < LAN_IOEND) _ne_insb(PORT2ADDR_NE(port), addr, count); -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { unsigned char *buf = addr; unsigned char *portp = __port2addr_ata(port); @@ -375,7 +375,7 @@ void _insw(unsigned int port, void * addr, unsigned long count) } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short), count, 1); #endif -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { portp = __port2addr_ata(port); while (count--) *buf++ = *(volatile unsigned short *)portp; @@ -403,7 +403,7 @@ void _outsb(unsigned int port, const void * addr, unsigned long count) if (port >= LAN_IOSTART && port < LAN_IOEND) { portp = PORT2ADDR_NE(port); while (count--) _ne_outb(*buf++, portp); -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { portp = __port2addr_ata(port); while(count--) *(volatile unsigned char *)portp = *buf++; @@ -430,7 +430,7 @@ void _outsw(unsigned int port, const void * addr, unsigned long count) */ portp = PORT2ADDR_NE(port); while(count--) *(volatile unsigned short *)portp = *buf++; -#if defined(CONFIG_IDE) +#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { portp = __port2addr_ata(port); while(count--) *(volatile unsigned short *)portp = *buf++; -- 2.53.0