summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-tbox/io.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/arch-tbox/io.h')
-rw-r--r--include/asm-arm/arch-tbox/io.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/include/asm-arm/arch-tbox/io.h b/include/asm-arm/arch-tbox/io.h
index 322941657..5fd9aa0a3 100644
--- a/include/asm-arm/arch-tbox/io.h
+++ b/include/asm-arm/arch-tbox/io.h
@@ -10,14 +10,11 @@
#define IO_SPACE_LIMIT 0xffffffff
-#define __io_pc(_x) ((_x) << 2)
+#define __io(_x) ((_x) << 2)
/*
* Generic virtual read/write
*/
-#define __arch_getb(a) (*(volatile unsigned char *)(a))
-#define __arch_getl(a) (*(volatile unsigned long *)(a))
-
extern __inline__ unsigned int __arch_getw(unsigned long a)
{
unsigned int value;
@@ -27,24 +24,12 @@ extern __inline__ unsigned int __arch_getw(unsigned long a)
return value;
}
-
-#define __arch_putb(v,a) (*(volatile unsigned char *)(a) = (v))
-#define __arch_putl(v,a) (*(volatile unsigned long *)(a) = (v))
-
extern __inline__ void __arch_putw(unsigned int value, unsigned long a)
{
__asm__ __volatile__("str%?h %0, [%1, #0] @ putw"
: : "r" (value), "r" (a));
}
-#define inb(p) __arch_getb(__io_pc(p))
-#define inw(p) __arch_getw(__io_pc(p))
-#define inl(p) __arch_getl(__io_pc(p))
-
-#define outb(v,p) __arch_putb(v,__io_pc(p))
-#define outw(v,p) __arch_putw(v,__io_pc(p))
-#define outl(v,p) __arch_putl(v,__io_pc(p))
-
/* Idem, for devices on the upper byte lanes */
#define inb_u(p) __arch_getb(__io_pc(p) + 2)
#define inw_u(p) __arch_getw(__io_pc(p) + 2)