linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / io.h

diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index bf7b9de..fd0147e 100644 (file)
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -225,6 +225,42 @@ out:
 
 #endif /* __mem_pci */
 
+/*
+ * If this architecture has ISA IO, then define the isa_read/isa_write
+ * macros.
+ */
+#ifdef __mem_isa
+
+#define isa_readb(addr)                        __raw_readb(__mem_isa(addr))
+#define isa_readw(addr)                        __raw_readw(__mem_isa(addr))
+#define isa_readl(addr)                        __raw_readl(__mem_isa(addr))
+#define isa_writeb(val,addr)           __raw_writeb(val,__mem_isa(addr))
+#define isa_writew(val,addr)           __raw_writew(val,__mem_isa(addr))
+#define isa_writel(val,addr)           __raw_writel(val,__mem_isa(addr))
+#define isa_memset_io(a,b,c)           _memset_io(__mem_isa(a),(b),(c))
+#define isa_memcpy_fromio(a,b,c)       _memcpy_fromio((a),__mem_isa(b),(c))
+#define isa_memcpy_toio(a,b,c)         _memcpy_toio(__mem_isa((a)),(b),(c))
+
+#define isa_eth_io_copy_and_sum(a,b,c,d) \
+                               eth_copy_and_sum((a),__mem_isa(b),(c),(d))
+
+#else  /* __mem_isa */
+
+#define isa_readb(addr)                        (__readwrite_bug("isa_readb"),0)
+#define isa_readw(addr)                        (__readwrite_bug("isa_readw"),0)
+#define isa_readl(addr)                        (__readwrite_bug("isa_readl"),0)
+#define isa_writeb(val,addr)           __readwrite_bug("isa_writeb")
+#define isa_writew(val,addr)           __readwrite_bug("isa_writew")
+#define isa_writel(val,addr)           __readwrite_bug("isa_writel")
+#define isa_memset_io(a,b,c)           __readwrite_bug("isa_memset_io")
+#define isa_memcpy_fromio(a,b,c)       __readwrite_bug("isa_memcpy_fromio")
+#define isa_memcpy_toio(a,b,c)         __readwrite_bug("isa_memcpy_toio")
+
+#define isa_eth_io_copy_and_sum(a,b,c,d) \
+                               __readwrite_bug("isa_eth_io_copy_and_sum")
+
+#endif /* __mem_isa */
+
 /*
  * ioremap and friends.
  *
@@ -291,12 +327,5 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
  */
 #define xlate_dev_kmem_ptr(p)  p
 
-/*
- * Register ISA memory and port locations for glibc iopl/inb/outb
- * emulation.
- */
-extern void register_isa_ports(unsigned int mmio, unsigned int io,
-                              unsigned int io_shift);
-
 #endif /* __KERNEL__ */
 #endif /* __ASM_ARM_IO_H */