diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-07-19 23:32:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:24:49 -0400 |
commit | f9569e1d1540791f664aeb935b1ec11b6e56507c (patch) | |
tree | 42124a5027a9feb7f499beed73a8f467629046a4 /include/asm-m68k/raw_io.h | |
parent | 3a5df1d451cfe3a3d6d63f144554cac286eecba1 (diff) |
m68k iomem (based on Geert's tree + memcpy_... stuff)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68k/raw_io.h')
-rw-r--r-- | include/asm-m68k/raw_io.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-m68k/raw_io.h b/include/asm-m68k/raw_io.h index 811ccd25d4a6..91c623f0994c 100644 --- a/include/asm-m68k/raw_io.h +++ b/include/asm-m68k/raw_io.h | |||
@@ -49,10 +49,16 @@ extern void __iounmap(void *addr, unsigned long size); | |||
49 | #define raw_inb in_8 | 49 | #define raw_inb in_8 |
50 | #define raw_inw in_be16 | 50 | #define raw_inw in_be16 |
51 | #define raw_inl in_be32 | 51 | #define raw_inl in_be32 |
52 | #define __raw_readb in_8 | ||
53 | #define __raw_readw in_be16 | ||
54 | #define __raw_readl in_be32 | ||
52 | 55 | ||
53 | #define raw_outb(val,port) out_8((port),(val)) | 56 | #define raw_outb(val,port) out_8((port),(val)) |
54 | #define raw_outw(val,port) out_be16((port),(val)) | 57 | #define raw_outw(val,port) out_be16((port),(val)) |
55 | #define raw_outl(val,port) out_be32((port),(val)) | 58 | #define raw_outl(val,port) out_be32((port),(val)) |
59 | #define __raw_writeb(val,addr) out_8((addr),(val)) | ||
60 | #define __raw_writew(val,addr) out_be16((addr),(val)) | ||
61 | #define __raw_writel(val,addr) out_be32((addr),(val)) | ||
56 | 62 | ||
57 | static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len) | 63 | static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len) |
58 | { | 64 | { |
@@ -336,8 +342,6 @@ static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf, | |||
336 | : "d0", "a0", "a1", "d6"); | 342 | : "d0", "a0", "a1", "d6"); |
337 | } | 343 | } |
338 | 344 | ||
339 | #define __raw_writel raw_outl | ||
340 | |||
341 | #endif /* __KERNEL__ */ | 345 | #endif /* __KERNEL__ */ |
342 | 346 | ||
343 | #endif /* _RAW_IO_H */ | 347 | #endif /* _RAW_IO_H */ |