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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
rio
/
rio_linux.h
diff --git
a/drivers/char/rio/rio_linux.h
b/drivers/char/rio/rio_linux.h
index
4ce77fb
..
dc3f005
100644
(file)
--- a/
drivers/char/rio/rio_linux.h
+++ b/
drivers/char/rio/rio_linux.h
@@
-23,7
+23,6
@@
* Version 1.0 -- July, 1999.
*
*/
* Version 1.0 -- July, 1999.
*
*/
-#include <linux/config.h>
#define RIO_NBOARDS 4
#define RIO_PORTSPERBOARD 128
#define RIO_NBOARDS 4
#define RIO_PORTSPERBOARD 128
@@
-131,9
+130,9
@@
struct vpd_prom {
#ifdef CONFIG_RIO_OLDPCI
#ifdef CONFIG_RIO_OLDPCI
-static inline void
*rio_memcpy_toio(void *dummy, void
*dest, void *source, int n)
+static inline void
__iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem
*dest, void *source, int n)
{
{
- char *dst = dest;
+ char
__iomem
*dst = dest;
char *src = source;
while (n--) {
char *src = source;
while (n--) {
@@
-144,11
+143,22
@@
static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n
return dest;
}
return dest;
}
+static inline void __iomem *rio_copy_toio(void __iomem *dest, void *source, int n)
+{
+ char __iomem *dst = dest;
+ char *src = source;
+
+ while (n--)
+ writeb(*src++, dst++);
-static inline void *rio_memcpy_fromio(void *dest, void *source, int n)
+ return dest;
+}
+
+
+static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n)
{
char *dst = dest;
{
char *dst = dest;
- char *src = source;
+ char
__iomem
*src = source;
while (n--)
*dst++ = readb(src++);
while (n--)
*dst++ = readb(src++);
@@
-158,6
+168,7
@@
static inline void *rio_memcpy_fromio(void *dest, void *source, int n)
#else
#define rio_memcpy_toio(dummy,dest,source,n) memcpy_toio(dest, source, n)
#else
#define rio_memcpy_toio(dummy,dest,source,n) memcpy_toio(dest, source, n)
+#define rio_copy_toio memcpy_toio
#define rio_memcpy_fromio memcpy_fromio
#endif
#define rio_memcpy_fromio memcpy_fromio
#endif