patch-2.4.2 linux/include/asm-arm/arch-nexuspci/io.h

• Lines: 76
• Date: Thu Feb 8 16:32:44 2001
• Orig file: v2.4.1/linux/include/asm-arm/arch-nexuspci/io.h
• Orig date: Mon Feb 28 14:16:37 2000

diff -u --recursive --new-file v2.4.1/linux/include/asm-arm/arch-nexuspci/io.h linux/include/asm-arm/arch-nexuspci/io.h
@@ -12,7 +12,7 @@
 /*
  * Translation of various region addresses to virtual addresses
  */
-#define __io_pci(a)		(PCIO_BASE + (a))
+#define __io(a)			(PCIO_BASE + (a))
 #if 1
 #define __mem_pci(a)		((unsigned long)(a))
 #define __mem_isa(a)		(PCIMEM_BASE + (unsigned long)(a))
@@ -36,61 +36,19 @@
 #define __mem_isa(a)		___mem_isa((unsigned long)(a))
 #endif
 
-/* the following macro is depreciated */
-#define __ioaddr(p)		__io_pci(p)
-
 /*
  * Generic virtual read/write
  */
-#define __arch_getb(a)		(*(volatile unsigned char *)(a))
-#define __arch_getl(a)		(*(volatile unsigned int *)(a))
-
-extern __inline__ unsigned int __arch_getw(unsigned long a)
-{
-	unsigned int value;
-	__asm__ __volatile__("ldr%?h	%0, [%1, #0]	@ getw"
-		: "=&r" (value)
-		: "r" (a));
-	return value;
-}
-
-
-#define __arch_putb(v,a)	(*(volatile unsigned char *)(a) = (v))
-#define __arch_putl(v,a)	(*(volatile unsigned int *)(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_pci(p))
-#define inw(p)			__arch_getw(__io_pci(p))
-#define inl(p)			__arch_getl(__io_pci(p))
-
-#define outb(v,p)		__arch_putb(v,__io_pci(p))
-#define outw(v,p)		__arch_putw(v,__io_pci(p))
-#define outl(v,p)		__arch_putl(v,__io_pci(p))
+#define __arch_getw(a)		(*(volatile unsigned short *)(a))
+#define __arch_putw(v,a)	(*(volatile unsigned short *)(a) = (v))
 
 /*
  * ioremap support - validate a PCI memory address,
  * and convert a PCI memory address to a physical
  * address for the page tables.
  */
-#define valid_ioaddr(off,sz)	((off) < 0x80000000 && (off) + (sz) <= 0x80000000)
-#define io_to_phys(off)		((off) + PLX_MEM_START)
-
-/*
- * ioremap takes a PCI memory address, as specified in
- * linux/Documentation/IO-mapping.txt
- */
-#define __arch_ioremap(off,size,nocache)			\
-({								\
-	unsigned long _off = (off), _size = (size);		\
-	void *_ret = (void *)0;					\
-	if (valid_ioaddr(_off, _size))				\
-		_ret = __ioremap(io_to_phys(_off), _size, 0);	\
-	_ret;							\
-})
+#define iomem_valid_addr(iomem,sz)	\
+	((iomem) < 0x80000000 && (iomem) + (sz) <= 0x80000000)
+#define iomem_to_phys(iomem)	((iomem) + PLX_MEM_START)
 
 #endif