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]
/
include
/
asm-sh64
/
io.h
diff --git
a/include/asm-sh64/io.h
b/include/asm-sh64/io.h
index
cfafaa7
..
14d8e7b
100644
(file)
--- a/
include/asm-sh64/io.h
+++ b/
include/asm-sh64/io.h
@@
-123,6
+123,13
@@
void insw(unsigned long port, void *addr, unsigned long count);
void outsl(unsigned long port, const void *addr, unsigned long count);
void insl(unsigned long port, void *addr, unsigned long count);
void outsl(unsigned long port, const void *addr, unsigned long count);
void insl(unsigned long port, void *addr, unsigned long count);
+#define __raw_readb readb
+#define __raw_readw readw
+#define __raw_readl readl
+#define __raw_writeb writeb
+#define __raw_writew writew
+#define __raw_writel writel
+
void memcpy_toio(void __iomem *to, const void *from, long count);
void memcpy_fromio(void *to, void __iomem *from, long count);
void memcpy_toio(void __iomem *to, const void *from, long count);
void memcpy_fromio(void *to, void __iomem *from, long count);
@@
-143,12
+150,12
@@
extern unsigned long pciio_virt;
* Change virtual addresses to physical addresses and vv.
* These are trivial on the 1:1 Linux/SuperH mapping
*/
* Change virtual addresses to physical addresses and vv.
* These are trivial on the 1:1 Linux/SuperH mapping
*/
-
extern __inline__
unsigned long virt_to_phys(volatile void * address)
+
static inline
unsigned long virt_to_phys(volatile void * address)
{
return __pa(address);
}
{
return __pa(address);
}
-
extern __inline__
void * phys_to_virt(unsigned long address)
+
static inline
void * phys_to_virt(unsigned long address)
{
return __va(address);
}
{
return __va(address);
}
@@
-156,12
+163,12
@@
extern __inline__ void * phys_to_virt(unsigned long address)
extern void * __ioremap(unsigned long phys_addr, unsigned long size,
unsigned long flags);
extern void * __ioremap(unsigned long phys_addr, unsigned long size,
unsigned long flags);
-
extern __inline__
void * ioremap(unsigned long phys_addr, unsigned long size)
+
static inline
void * ioremap(unsigned long phys_addr, unsigned long size)
{
return __ioremap(phys_addr, size, 1);
}
{
return __ioremap(phys_addr, size, 1);
}
-
extern __inline__
void * ioremap_nocache (unsigned long phys_addr, unsigned long size)
+
static inline
void * ioremap_nocache (unsigned long phys_addr, unsigned long size)
{
return __ioremap(phys_addr, size, 0);
}
{
return __ioremap(phys_addr, size, 0);
}
@@
-171,22
+178,6
@@
extern void iounmap(void *addr);
unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* name);
extern void onchip_unmap(unsigned long vaddr);
unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* name);
extern void onchip_unmap(unsigned long vaddr);
-static __inline__ int check_signature(volatile void __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that
/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that