This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index c473424..d5a2140 100644 (file)
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -135,8 +135,6 @@ extern inline void * phys_to_virt(unsigned long address)
 #define page_to_phys(page)     ((page - mem_map) << PAGE_SHIFT)
 #endif
 
-#include <asm-generic/iomap.h>
-
 extern void __iomem *__ioremap(unsigned long offset, unsigned long size, unsigned long flags);
 
 extern inline void __iomem * ioremap (unsigned long offset, unsigned long size)
@@ -150,7 +148,7 @@ extern inline void __iomem * ioremap (unsigned long offset, unsigned long size)
  * or read caching is not desirable:
  */
 extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
-extern void iounmap(volatile void __iomem *addr);
+extern void iounmap(void __iomem *addr);
 
 /*
  * ISA I/O bus memory addresses are 1:1 with the physical address.
@@ -175,26 +173,10 @@ extern void iounmap(volatile void __iomem *addr);
  * memory location directly.
  */
 
-static inline __u8 __readb(volatile void __iomem *addr)
-{
-       return *(__force volatile __u8 *)addr;
-}
-static inline __u16 __readw(volatile void __iomem *addr)
-{
-       return *(__force volatile __u16 *)addr;
-}
-static inline __u32 __readl(volatile void __iomem *addr)
-{
-       return *(__force volatile __u32 *)addr;
-}
-static inline __u64 __readq(volatile void __iomem *addr)
-{
-       return *(__force volatile __u64 *)addr;
-}
-#define readb(x) __readb(x)
-#define readw(x) __readw(x)
-#define readl(x) __readl(x)
-#define readq(x) __readq(x)
+#define readb(addr) (*(__force volatile __u8 *) (__u8 __iomem *)(addr))
+#define readw(addr) (*(__force volatile __u16 *) (__u16 __iomem *)(addr))
+#define readl(addr) (*(__force volatile __u32 *) (__u32 __iomem *)(addr))
+#define readq(addr) (*(__force volatile __u64 *) (__u64 __iomem *)(addr))
 #define readb_relaxed(a) readb(a)
 #define readw_relaxed(a) readw(a)
 #define readl_relaxed(a) readl(a)
@@ -204,10 +186,8 @@ static inline __u64 __readq(volatile void __iomem *addr)
 #define __raw_readl readl
 #define __raw_readq readq
 
-#define mmiowb()
-
 #ifdef CONFIG_UNORDERED_IO
-static inline void __writel(__u32 val, volatile void __iomem *addr)
+static inline void __writel(__u32 val, void __iomem *addr)
 {
        volatile __u32 __iomem *target = addr;
        asm volatile("movnti %1,%0"
@@ -215,35 +195,21 @@ static inline void __writel(__u32 val, volatile void __iomem *addr)
                     : "r" (val) : "memory");
 }
 
-static inline void __writeq(__u64 val, volatile void __iomem *addr)
+static inline void __writeq(__u64 val, void __iomem *addr)
 {
-       volatile __u64 __iomem *target = addr;
+       volatile __u64 *target = addr;
        asm volatile("movnti %1,%0"
                     : "=m" (*target)
                     : "r" (val) : "memory");
 }
+#define writeq(val,addr) __writeq((val),(void __iomem *)(addr))
+#define writel(val,addr) __writel((val),(void __iomem *)(addr))
 #else
-static inline void __writel(__u32 b, volatile void __iomem *addr)
-{
-       *(__force volatile __u32 *)addr = b;
-}
-static inline void __writeq(__u64 b, volatile void __iomem *addr)
-{
-       *(__force volatile __u64 *)addr = b;
-}
+#define writel(b,addr) (*(__force volatile __u32 *)(__u32 __iomem *)(addr) = (b))
+#define writeq(b,addr) (*(__force volatile __u64 *)(__u64 __iomem *)(addr) = (b))
 #endif
-static inline void __writeb(__u8 b, volatile void __iomem *addr)
-{
-       *(__force volatile __u8 *)addr = b;
-}
-static inline void __writew(__u16 b, volatile void __iomem *addr)
-{
-       *(__force volatile __u16 *)addr = b;
-}
-#define writeq(val,addr) __writeq((val),(addr))
-#define writel(val,addr) __writel((val),(addr))
-#define writew(val,addr) __writew((val),(addr))
-#define writeb(val,addr) __writeb((val),(addr))
+#define writeb(b,addr) (*(__force volatile __u8 *)(__u8 __iomem *)(addr) = (b))
+#define writew(b,addr) (*(__force volatile __u16 *)(__u16 __iomem *)(addr) = (b))
 #define __raw_writeb writeb
 #define __raw_writew writew
 #define __raw_writel writel
@@ -252,18 +218,11 @@ static inline void __writew(__u16 b, volatile void __iomem *addr)
 void *__memcpy_fromio(void*,unsigned long,unsigned);
 void *__memcpy_toio(unsigned long,const void*,unsigned);
 
-static inline void *memcpy_fromio(void *to, volatile void __iomem *from, unsigned len)
-{
-       return __memcpy_fromio(to,(unsigned long)from,len);
-}
-static inline void *memcpy_toio(volatile void __iomem *to, const void *from, unsigned len)
-{
-       return __memcpy_toio((unsigned long)to,from,len);
-}
-static inline void *memset_io(volatile void __iomem *a, int b, size_t c)
-{
-       return memset((__force void *)a,b,c);
-}
+#define memcpy_fromio(to,from,len) \
+  __memcpy_fromio((to),(unsigned long)(void __iomem *)(from),(len))
+#define memcpy_toio(to,from,len) \
+  __memcpy_toio((unsigned long)(void __iomem *)(to),(from),(len))
+#define memset_io(a,b,c)       memset((__force void *)(void __iomem *)(a),(b),(c))
 
 /*
  * ISA space is 'always mapped' on a typical x86 system, no need to
@@ -304,7 +263,7 @@ static inline void *memset_io(volatile void __iomem *a, int b, size_t c)
  *     Returns 1 on a match.
  */
  
-static inline int check_signature(void __iomem *io_addr,
+static inline int check_signature(unsigned long io_addr,
        const unsigned char *signature, int length)
 {
        int retval = 0;
@@ -320,6 +279,38 @@ out:
        return retval;
 }
 
+#ifndef __i386__
+/**
+ *     isa_check_signature             -       find BIOS signatures
+ *     @io_addr: mmio address to check 
+ *     @signature:  signature block
+ *     @length: length of signature
+ *
+ *     Perform a signature comparison with the ISA mmio address io_addr.
+ *     Returns 1 on a match.
+ *
+ *     This function is deprecated. New drivers should use ioremap and
+ *     check_signature.
+ */
+ 
+
+static inline int isa_check_signature(unsigned long io_addr,
+       const unsigned char *signature, int length)
+{
+       int retval = 0;
+       do {
+               if (isa_readb(io_addr) != *signature)
+                       goto out;
+               io_addr++;
+               signature++;
+               length--;
+       } while (length);
+       retval = 1;
+out:
+       return retval;
+}
+#endif
+
 /* Nothing to do */
 
 #define dma_cache_inv(_start,_size)            do { } while (0)