patch-2.1.34 linux/include/asm-sparc64/io.h

• Lines: 44
• Date: Fri Apr 11 10:47:39 1997
• Orig file: v2.1.33/linux/include/asm-sparc64/io.h
• Orig date: Thu Mar 27 14:40:09 1997

diff -u --recursive --new-file v2.1.33/linux/include/asm-sparc64/io.h linux/include/asm-sparc64/io.h
@@ -1,8 +1,9 @@
-/* $Id: io.h,v 1.5 1997/03/18 18:04:00 jj Exp $ */
+/* $Id: io.h,v 1.10 1997/04/10 05:13:29 davem Exp $ */
 #ifndef __SPARC64_IO_H
 #define __SPARC64_IO_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/page.h>      /* IO address mapping routines need this */
 #include <asm/system.h>
@@ -83,24 +84,24 @@
 #define inb_p inb
 #define outb_p outb
 
-extern void sparc_ultra_mapioaddr   (unsigned long physaddr, unsigned long virt_addr, int rdonly);
+extern void sparc_ultra_mapioaddr   (unsigned long physaddr, unsigned long virt_addr,
+				     int bus, int rdonly);
 extern void sparc_ultra_unmapioaddr (unsigned long virt_addr);
 
-extern __inline__ void mapioaddr (unsigned long physaddr, unsigned long virt_addr, int rdonly)
+extern __inline__ void mapioaddr (unsigned long physaddr, unsigned long virt_addr,
+				  int bus, int rdonly)
 {
-	sparc_ultra_mapioaddr (physaddr, virt_addr, rdonly);
-	return;
+	sparc_ultra_mapioaddr (physaddr, virt_addr, bus, rdonly);
 }
 
 extern __inline__ void unmapioaddr(unsigned long virt_addr)
 {
 	sparc_ultra_unmapioaddr (virt_addr);
-	return;
 }
 
-extern void *sparc_alloc_io (void *, void *, int, char *, unsigned, int);
-extern void sparc_free_io (void *, int);
-extern void *sparc_dvma_malloc (int, char *);
+extern void *sparc_alloc_io (u32 pa, void *va, int sz, char *name, u32 io, int rdonly);
+extern void sparc_free_io (void *va, int sz);
+extern void *sparc_dvma_malloc (int sz, char *name, __u32 *dvma_addr);
 
 #define virt_to_phys(x) __pa((unsigned long)(x))
 #define phys_to_virt(x) __va((unsigned long)(x))