git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
m32r
/
kernel
/
io_oaks32r.c
diff --git
a/arch/m32r/kernel/io_oaks32r.c
b/arch/m32r/kernel/io_oaks32r.c
index
2869647
..
910dd13
100644
(file)
--- a/
arch/m32r/kernel/io_oaks32r.c
+++ b/
arch/m32r/kernel/io_oaks32r.c
@@
-3,7
+3,7
@@
*
* Typical I/O routines for OAKS32R board.
*
*
* Typical I/O routines for OAKS32R board.
*
- * Copyright (c) 2001-200
4
Hiroyuki Kondo, Hirokazu Takata,
+ * Copyright (c) 2001-200
5
Hiroyuki Kondo, Hirokazu Takata,
* Hitoshi Yamamoto, Mamoru Sakugawa
*/
* Hitoshi Yamamoto, Mamoru Sakugawa
*/
@@
-16,7
+16,7
@@
static inline void *_port2addr(unsigned long port)
{
static inline void *_port2addr(unsigned long port)
{
- return (void *)(port
+
NONCACHE_OFFSET);
+ return (void *)(port
|
NONCACHE_OFFSET);
}
static inline void *_port2addr_ne(unsigned long port)
}
static inline void *_port2addr_ne(unsigned long port)
@@
-90,35
+90,21
@@
unsigned long _inl(unsigned long port)
unsigned char _inb_p(unsigned long port)
{
unsigned char _inb_p(unsigned long port)
{
- unsigned char v;
-
- if (port >= 0x300 && port < 0x320)
- v = _ne_inb(PORT2ADDR_NE(port));
- else
- v = *(volatile unsigned char *)PORT2ADDR(port);
-
+ unsigned char v = _inb(port);
delay();
return (v);
}
unsigned short _inw_p(unsigned long port)
{
delay();
return (v);
}
unsigned short _inw_p(unsigned long port)
{
- unsigned short v;
-
- if (port >= 0x300 && port < 0x320)
- v = _ne_inw(PORT2ADDR_NE(port));
- else
- v = *(volatile unsigned short *)PORT2ADDR(port);
-
+ unsigned short v = _inw(port);
delay();
return (v);
}
unsigned long _inl_p(unsigned long port)
{
delay();
return (v);
}
unsigned long _inl_p(unsigned long port)
{
- unsigned long v;
-
- v = *(volatile unsigned long *)PORT2ADDR(port);
+ unsigned long v = _inl(port);
delay();
return (v);
}
delay();
return (v);
}
@@
-146,27
+132,19
@@
void _outl(unsigned long l, unsigned long port)
void _outb_p(unsigned char b, unsigned long port)
{
void _outb_p(unsigned char b, unsigned long port)
{
- if (port >= 0x300 && port < 0x320)
- _ne_outb(b, PORT2ADDR_NE(port));
- else
- *(volatile unsigned char *)PORT2ADDR(port) = b;
-
+ _outb(b, port);
delay();
}
void _outw_p(unsigned short w, unsigned long port)
{
delay();
}
void _outw_p(unsigned short w, unsigned long port)
{
- if (port >= 0x300 && port < 0x320)
- _ne_outw(w, PORT2ADDR_NE(port));
- else
- *(volatile unsigned short *)PORT2ADDR(port) = w;
-
+ _outw(w, port);
delay();
}
void _outl_p(unsigned long l, unsigned long port)
{
delay();
}
void _outl_p(unsigned long l, unsigned long port)
{
-
*(volatile unsigned long *)PORT2ADDR(port) = l
;
+
_outl(l, port)
;
delay();
}
delay();
}