patch-2.1.120 linux/include/asm-m68k/io.h

• Lines: 54
• Date: Wed Sep 2 09:39:18 1998
• Orig file: v2.1.119/linux/include/asm-m68k/io.h
• Orig date: Tue Jun 23 10:01:28 1998

diff -u --recursive --new-file v2.1.119/linux/include/asm-m68k/io.h linux/include/asm-m68k/io.h
@@ -3,8 +3,7 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h> /* CONFIG_ATARI, CONFIG_HADES */
-#include <asm/byteorder.h>
+#include <linux/config.h>
 
 #ifdef CONFIG_ATARI
 #include <asm/atarihw.h>
@@ -12,6 +11,8 @@
 #define SLOW_DOWN_IO	do { if (MACH_IS_ATARI) MFPDELAY(); } while (0)
 #endif
 
+#include <asm/virtconvert.h>
+
 /*
  * readX/writeX() are used to access memory mapped devices. On some
  * architectures the memory mapped IO stuff needs to be accessed
@@ -41,34 +42,6 @@
 
 #define outb(x,addr) ((void) writeb(x,addr))
 #define outb_p(x,addr) outb(x,addr)
-
-/*
- * Change virtual addresses to physical addresses and vv.
- */
-extern unsigned long mm_vtop(unsigned long addr) __attribute__ ((const));
-extern unsigned long mm_ptov(unsigned long addr) __attribute__ ((const));
-
-extern inline unsigned long virt_to_phys(volatile void * address)
-{
-	return mm_vtop((unsigned long)address);
-}
-
-extern inline void * phys_to_virt(unsigned long address)
-{
-	return (void *) mm_ptov(address);
-}
-
-/*
- * IO bus memory addresses are 1:1 with the physical address,
- * except on the PCI bus of the Hades.
- */
-#ifdef CONFIG_HADES
-#define virt_to_bus(a) (virt_to_phys(a) + (MACH_IS_HADES ? 0x80000000 : 0))
-#define bus_to_virt(a) (phys_to_virt((a) - (MACH_IS_HADES ? 0x80000000 : 0)))
-#else
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-#endif
 
 #endif /* __KERNEL__ */