aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-09-19 08:17:49 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2006-09-20 00:06:18 -0400
commit5adcaf50cf697aa4d0c731107003c1383b59b214 (patch)
treec4f93c02f43c325066a46e9d9221cac9d51125d8 /include
parent73ea9e1bcb8eea4f3b2052fe7ccd7ee4b5a271a0 (diff)
[POWERPC] convert string i/o operations to C
This produces essentially the same code and will make the iSeries i/o consolidation easier. The count parameter is changed to long since that will produce the same (better) code on 32 and 64 bit builds. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/io.h12
-rw-r--r--include/asm-ppc/io.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 51a598747367..57e7d14d6563 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -143,12 +143,12 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
143#define readl_relaxed(addr) readl(addr) 143#define readl_relaxed(addr) readl(addr)
144#define readq_relaxed(addr) readq(addr) 144#define readq_relaxed(addr) readq(addr)
145 145
146extern void _insb(volatile u8 __iomem *port, void *buf, int ns); 146extern void _insb(volatile u8 __iomem *port, void *buf, long count);
147extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns); 147extern void _outsb(volatile u8 __iomem *port, const void *buf, long count);
148extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns); 148extern void _insw_ns(volatile u16 __iomem *port, void *buf, long count);
149extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns); 149extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count);
150extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); 150extern void _insl_ns(volatile u32 __iomem *port, void *buf, long count);
151extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl); 151extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count);
152 152
153static inline void mmiowb(void) 153static inline void mmiowb(void)
154{ 154{
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 9fac420f1648..3d9a9e6f3321 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -327,12 +327,12 @@ __do_out_asm(outl, "stwbrx")
327#define inl_p(port) inl((port)) 327#define inl_p(port) inl((port))
328#define outl_p(val, port) outl((val), (port)) 328#define outl_p(val, port) outl((val), (port))
329 329
330extern void _insb(volatile u8 __iomem *port, void *buf, int ns); 330extern void _insb(volatile u8 __iomem *port, void *buf, long count);
331extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns); 331extern void _outsb(volatile u8 __iomem *port, const void *buf, long count);
332extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns); 332extern void _insw_ns(volatile u16 __iomem *port, void *buf, long count);
333extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns); 333extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count);
334extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); 334extern void _insl_ns(volatile u32 __iomem *port, void *buf, long count);
335extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl); 335extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count);
336 336
337 337
338#define IO_SPACE_LIMIT ~0 338#define IO_SPACE_LIMIT ~0