Skip to content

L
linux
Commit c14643fd authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files
Options

[PATCH] m32r: io_xxxxx.c cleanups 

cleanups for arch/m32r/kernel/io*.c.

- Fix ugly indentation.

- Change __inline__ to inline.

- Remove RCS ID strings.
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 54e8ec3c
Show whitespace changes
Inline Side-by-side
Showing with 359 additions and 287 deletions
arch/m32r/kernel/io_m32700ut.c
View file @ c14643fd
......@@ -9,7 +9,6 @@
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file "COPYING" in the main directory of this
* archive for more details.
*
*/
#include <linux/config.h>
......@@ -35,13 +34,13 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int);
#define PORT2ADDR(port) _port2addr(port)
#define PORT2ADDR_USB(port) _port2addr_usb(port)
static __inline__ void *_port2addr(unsigned long port)
static inline void *_port2addr(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET);
}
#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
static __inline__ void *__port2addr_ata(unsigned long port)
static inline void *__port2addr_ata(unsigned long port)
{
static int dummy_reg;
......@@ -67,16 +66,16 @@ static __inline__ void *__port2addr_ata(unsigned long port)
*/
#define LAN_IOSTART 0x300
#define LAN_IOEND 0x320
static __inline__ void *_port2addr_ne(unsigned long port)
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
}
static __inline__ void *_port2addr_usb(unsigned long port)
static inline void *_port2addr_usb(unsigned long port)
{
return (void *)((port & 0x0f) + NONCACHE_OFFSET + 0x10303000);
}
static __inline__ void delay(void)
static inline void delay(void)
{
__asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
}
......@@ -87,29 +86,30 @@ 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 *(volatile unsigned char *)portp;
}
static __inline__ unsigned short _ne_inw(void *portp)
static inline unsigned short _ne_inw(void *portp)
{
return (unsigned short)le16_to_cpu(*(volatile unsigned short *)portp);
}
static __inline__ void _ne_insb(void *portp, void * addr, unsigned long count)
static inline void _ne_insb(void *portp, void *addr, unsigned long count)
{
unsigned char *buf = (unsigned char *)addr;
while (count--) *buf++ = _ne_inb(portp);
while (count--)
*buf++ = _ne_inb(portp);
}
static __inline__ void _ne_outb(unsigned char b, void *portp)
static inline void _ne_outb(unsigned char b, void *portp)
{
*(volatile unsigned char *)portp = 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);
}
......@@ -336,7 +336,7 @@ 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)
{
if (port >= LAN_IOSTART && port < LAN_IOEND)
_ne_insb(PORT2ADDR_NE(port), addr, count);
......@@ -344,22 +344,25 @@ void _insb(unsigned int port, void * addr, unsigned long count)
else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
unsigned char *buf = addr;
unsigned char *portp = __port2addr_ata(port);
while(count--) *buf++ = *(volatile unsigned char *)portp;
while (count--)
*buf++ = *(volatile unsigned char *)portp;
}
#endif
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char), count, 1);
pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char),
count, 1);
}
#endif
else {
unsigned char *buf = addr;
unsigned char *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;
......@@ -370,55 +373,64 @@ void _insw(unsigned int port, void * addr, unsigned long count)
* from the DATA_REG. Do not swap the data.
*/
portp = PORT2ADDR_NE(port);
while (count--) *buf++ = *(volatile unsigned short *)portp;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short), count, 1);
pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short),
count, 1);
#endif
#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;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
#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 >= LAN_IOSTART && port < LAN_IOEND) {
portp = PORT2ADDR_NE(port);
while (count--) _ne_outb(*buf++, portp);
while (count--)
_ne_outb(*buf++, portp);
#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++;
while (count--)
*(volatile unsigned char *)portp = *buf++;
#endif
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite_byte(0, port, (void *)addr, sizeof(unsigned char), count, 1);
pcc_iowrite_byte(0, 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;
......@@ -429,27 +441,32 @@ void _outsw(unsigned int port, const void * addr, unsigned long count)
* into the DATA_REG. Do not swap the data.
*/
portp = PORT2ADDR_NE(port);
while(count--) *(volatile unsigned short *)portp = *buf++;
while (count--)
*(volatile unsigned short *)portp = *buf++;
#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++;
while (count--)
*(volatile unsigned short *)portp = *buf++;
#endif
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite_word(9, port, (void *)addr, sizeof(unsigned short), count, 1);
pcc_iowrite_word(9, 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++;
}
arch/m32r/kernel/io_mappi.c
View file @ c14643fd
......@@ -7,8 +7,6 @@
* 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>
......@@ -31,17 +29,17 @@ extern void pcc_iowrite(int, unsigned long, void *, size_t, size_t, int);
#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);
}
......@@ -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;
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);
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);
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);
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++;
}
arch/m32r/kernel/io_mappi2.c
View file @ c14643fd
......@@ -7,8 +7,6 @@
* Hitoshi Yamamoto, Mamoru Sakugawa
*/
/* $Id:$ */
#include <linux/config.h>
#include <asm/m32r.h>
#include <asm/page.h>
......@@ -33,7 +31,7 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int);
#define PORT2ADDR_NE(port) _port2addr_ne(port)
#define PORT2ADDR_USB(port) _port2addr_usb(port)
static __inline__ void *_port2addr(unsigned long port)
static inline void *_port2addr(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET);
}
......@@ -42,7 +40,7 @@ static __inline__ void *_port2addr(unsigned long port)
#define LAN_IOEND 0x320
#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
static __inline__ void *__port2addr_ata(unsigned long port)
static inline void *__port2addr_ata(unsigned long port)
{
static int dummy_reg;
......@@ -62,21 +60,21 @@ static __inline__ void *__port2addr_ata(unsigned long port)
#endif
#ifdef CONFIG_CHIP_OPSP
static __inline__ void *_port2addr_ne(unsigned long port)
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
}
#else
static __inline__ void *_port2addr_ne(unsigned long port)
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x04000000);
}
#endif
static __inline__ void *_port2addr_usb(unsigned long port)
static inline void *_port2addr_usb(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x14000000);
}
static __inline__ void delay(void)
static inline void delay(void)
{
__asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
}
......@@ -85,29 +83,30 @@ static __inline__ void delay(void)
* NIC I/O function
*/
static __inline__ unsigned char _ne_inb(void *portp)
static inline unsigned char _ne_inb(void *portp)
{
return (unsigned char) *(volatile unsigned char *)portp;
}
static __inline__ unsigned short _ne_inw(void *portp)
static inline unsigned short _ne_inw(void *portp)
{
return (unsigned short)le16_to_cpu(*(volatile unsigned short *)portp);
}
static __inline__ void _ne_insb(void *portp, void * addr, unsigned long count)
static inline void _ne_insb(void *portp, void * addr, unsigned long count)
{
unsigned char *buf = addr;
while (count--) *buf++ = *(volatile unsigned char *)portp;
while (count--)
*buf++ = *(volatile unsigned char *)portp;
}
static __inline__ void _ne_outb(unsigned char b, void *portp)
static inline void _ne_outb(unsigned char b, void *portp)
{
*(volatile unsigned char *)portp = (unsigned char)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);
}
......@@ -342,18 +341,21 @@ void _insb(unsigned int port, void * addr, unsigned long count)
else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) {
unsigned char *buf = addr;
unsigned char *portp = __port2addr_ata(port);
while(count--) *buf++ = *(volatile unsigned char *)portp;
while (count--)
*buf++ = *(volatile unsigned char *)portp;
}
#endif
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char), count, 1);
pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char),
count, 1);
}
#endif
else {
unsigned char *buf = addr;
unsigned char *portp = PORT2ADDR(port);
while(count--) *buf++ = *(volatile unsigned char *)portp;
while (count--)
*buf++ = *(volatile unsigned char *)portp;
}
}
......@@ -364,19 +366,23 @@ void _insw(unsigned int port, void * addr, unsigned long count)
if (port >= LAN_IOSTART && port < LAN_IOEND) {
portp = PORT2ADDR_NE(port);
while (count--) *buf++ = *(volatile unsigned short *)portp;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short), count, 1);
pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short),
count, 1);
#endif
#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;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
#endif
} else {
portp = PORT2ADDR(port);
while (count--) *buf++ = *(volatile unsigned short *)portp;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
}
}
......@@ -386,7 +392,8 @@ void _insl(unsigned int port, void * addr, unsigned long count)
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)
......@@ -396,19 +403,23 @@ 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);
while (count--)
_ne_outb(*buf++, portp);
#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++;
while (count--)
*(volatile unsigned char *)portp = *buf++;
#endif
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite_byte(0, port, (void *)addr, sizeof(unsigned char), count, 1);
pcc_iowrite_byte(0, 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++;
}
}
......@@ -419,19 +430,23 @@ void _outsw(unsigned int port, const void * addr, unsigned long count)
if (port >= LAN_IOSTART && port < LAN_IOEND) {
portp = PORT2ADDR_NE(port);
while (count--) *(volatile unsigned short *)portp = *buf++;
while (count--)
*(volatile unsigned short *)portp = *buf++;
#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++;
while (count--)
*(volatile unsigned short *)portp = *buf++;
#endif
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite_word(9, port, (void *)addr, sizeof(unsigned short), count, 1);
pcc_iowrite_word(9, 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++;
}
}
......@@ -441,5 +456,6 @@ void _outsl(unsigned int port, const void * addr, unsigned long count)
unsigned char *portp;
portp = PORT2ADDR(port);
while(count--) *(volatile unsigned long *)portp = *buf++;
while (count--)
*(volatile unsigned long *)portp = *buf++;
}
arch/m32r/kernel/io_oaks32r.c
View file @ c14643fd
......@@ -7,8 +7,6 @@
* Hitoshi Yamamoto, Mamoru Sakugawa
*/
/* $Id$ */
#include <linux/config.h>
#include <asm/m32r.h>
#include <asm/page.h>
......@@ -16,17 +14,17 @@
#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 + 0x02000000);
}
static __inline__ void delay(void)
static inline void delay(void)
{
__asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
}
......@@ -37,12 +35,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 *(volatile unsigned char *)(portp+1);
}
static __inline__ unsigned short _ne_inw(void *portp)
static inline unsigned short _ne_inw(void *portp)
{
unsigned short tmp;
......@@ -51,18 +49,19 @@ static __inline__ unsigned short _ne_inw(void *portp)
return tmp;
}
static __inline__ void _ne_insb(void *portp, void * addr, unsigned long count)
static inline void _ne_insb(void *portp, void *addr, unsigned long count)
{
unsigned char *buf = addr;
while (count--) *buf++ = *(volatile unsigned char *)(portp+1);
while (count--)
*buf++ = *(volatile unsigned char *)(portp+1);
}
static __inline__ void _ne_outb(unsigned char b, void *portp)
static inline void _ne_outb(unsigned char b, void *portp)
{
*(volatile unsigned char *)(portp+1) = 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 = (w >> 8);
*(volatile unsigned short *)(portp+2) = (w & 0xff);
......@@ -171,73 +170,82 @@ 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)
{
if (port >= 0x300 && port < 0x320)
_ne_insb(PORT2ADDR_NE(port), addr, count);
else {
unsigned char *buf = addr;
unsigned char *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);
while (count--)
*buf++ = _ne_inw(portp);
} 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);
while (count--)
_ne_outb(*buf++, portp);
} 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);
while (count--)
_ne_outw(*buf++, portp);
} 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++;
}
arch/m32r/kernel/io_opsput.c
View file @ c14643fd
......@@ -9,7 +9,6 @@
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file "COPYING" in the main directory of this
* archive for more details.
*
*/
#include <linux/config.h>
......@@ -35,7 +34,7 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int);
#define PORT2ADDR(port) _port2addr(port)
#define PORT2ADDR_USB(port) _port2addr_usb(port)
static __inline__ void *_port2addr(unsigned long port)
static inline void *_port2addr(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET);
}
......@@ -47,16 +46,16 @@ static __inline__ void *_port2addr(unsigned long port)
*/
#define LAN_IOSTART 0x300
#define LAN_IOEND 0x320
static __inline__ void *_port2addr_ne(unsigned long port)
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
}
static __inline__ void *_port2addr_usb(unsigned long port)
static inline void *_port2addr_usb(unsigned long port)
{
return (void *)((port & 0x0f) + NONCACHE_OFFSET + 0x10303000);
}
static __inline__ void delay(void)
static inline void delay(void)
{
__asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
}
......@@ -67,29 +66,30 @@ 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 *(volatile unsigned char *)portp;
}
static __inline__ unsigned short _ne_inw(void *portp)
static inline unsigned short _ne_inw(void *portp)
{
return (unsigned short)le16_to_cpu(*(volatile unsigned short *)portp);
}
static __inline__ void _ne_insb(void *portp, void * addr, unsigned long count)
static inline void _ne_insb(void *portp, void *addr, unsigned long count)
{
unsigned char *buf = (unsigned char *)addr;
while (count--) *buf++ = _ne_inb(portp);
while (count--)
*buf++ = _ne_inb(portp);
}
static __inline__ void _ne_outb(unsigned char b, void *portp)
static inline void _ne_outb(unsigned char b, void *portp)
{
*(volatile unsigned char *)portp = 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);
}
......@@ -280,23 +280,25 @@ 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)
{
if (port >= LAN_IOSTART && port < LAN_IOEND)
_ne_insb(PORT2ADDR_NE(port), addr, count);
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char), count, 1);
pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char),
count, 1);
}
#endif
else {
unsigned char *buf = addr;
unsigned char *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;
......@@ -307,45 +309,52 @@ void _insw(unsigned int port, void * addr, unsigned long count)
* from the DATA_REG. Do not swap the data.
*/
portp = PORT2ADDR_NE(port);
while (count--) *buf++ = *(volatile unsigned short *)portp;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short), count, 1);
pcc_ioread_word(9, 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 >= LAN_IOSTART && port < LAN_IOEND) {
portp = PORT2ADDR_NE(port);
while (count--) _ne_outb(*buf++, portp);
while (count--)
_ne_outb(*buf++, portp);
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite_byte(0, port, (void *)addr, sizeof(unsigned char), count, 1);
pcc_iowrite_byte(0, 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;
......@@ -356,22 +365,26 @@ void _outsw(unsigned int port, const void * addr, unsigned long count)
* into the DATA_REG. Do not swap the data.
*/
portp = PORT2ADDR_NE(port);
while(count--) *(volatile unsigned short *)portp = *buf++;
while (count--)
*(volatile unsigned short *)portp = *buf++;
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite_word(9, port, (void *)addr, sizeof(unsigned short), count, 1);
pcc_iowrite_word(9, 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++;
}
arch/m32r/kernel/io_usrv.c
View file @ c14643fd
......@@ -178,7 +178,8 @@ void _insb(unsigned int port, void * addr, unsigned long count)
else {
unsigned char *buf = addr;
unsigned char *portp = PORT2ADDR(port);
while(count--) *buf++ = *(volatile unsigned char *)portp;
while (count--)
*buf++ = *(volatile unsigned char *)portp;
}
}
......@@ -192,7 +193,8 @@ void _insw(unsigned int port, void * addr, unsigned long count)
1);
else {
portp = PORT2ADDR(port);
while (count--) *buf++ = *(volatile unsigned short *)portp;
while (count--)
*buf++ = *(volatile unsigned short *)portp;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7