Change d_mmap in struct cdevsw from:

        int     (*d_mmap)       __P((dev_t, int, int));
to:
	paddr_t	(*d_mmap)	__P((dev_t, off_t, int));

This allows us to mmap devices past 4GB offsets.

5 files changed, 14 insertions, 13 deletions

diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c
index 4c7a5d700ab..b587b2b446e 100644
--- a/sys/arch/mac68k/dev/asc.c
+++ b/sys/arch/mac68k/dev/asc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc.c,v 1.11 2001/08/23 08:17:40 miod Exp $	*/
+/*	$OpenBSD: asc.c,v 1.12 2001/11/01 12:13:46 art Exp $	*/
 /*	$NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $	*/
 
 /*
@@ -272,10 +272,10 @@ ascselect(dev, rw, p)
 	return (0);
 }
 
-int
+paddr_t
 ascmmap(dev, off, prot)
 	dev_t dev;
-	int off;
+	off_t off;
 	int prot;
 {
 	int unit = ASCUNIT(dev);
diff --git a/sys/arch/mac68k/dev/ascvar.h b/sys/arch/mac68k/dev/ascvar.h
index e850f83707e..ff05129d144 100644
--- a/sys/arch/mac68k/dev/ascvar.h
+++ b/sys/arch/mac68k/dev/ascvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ascvar.h,v 1.3 2001/08/23 08:17:40 miod Exp $	*/
+/*	$OpenBSD: ascvar.h,v 1.4 2001/11/01 12:13:46 art Exp $	*/
 /*	$NetBSD: ascvar.h,v 1.3 1997/02/24 05:47:34 scottr Exp $	*/
 
 /*
@@ -48,4 +48,4 @@ int	ascread __P((dev_t, struct uio *, int));
 int	ascwrite __P((dev_t, struct uio *, int));
 int	ascioctl __P((dev_t, int, caddr_t, int, struct proc *p));
 int	ascselect __P((dev_t dev, int rw, struct proc *p));
-int	ascmmap __P((dev_t dev, int off, int prot));
+paddr_t	ascmmap __P((dev_t dev, off_t off, int prot));
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c
index d0f1810a74e..19e2ebd6cbf 100644
--- a/sys/arch/mac68k/dev/grf.c
+++ b/sys/arch/mac68k/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf.c,v 1.16 2001/09/11 20:05:24 miod Exp $	*/
+/*	$OpenBSD: grf.c,v 1.17 2001/11/01 12:13:46 art Exp $	*/
 /*	$NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $	*/
 
 /*
@@ -271,10 +271,10 @@ grfselect(dev, rw, p)
 }
 
 /*ARGSUSED*/
-int
+paddr_t
 grfmmap(dev, off, prot)
 	dev_t dev;
-	int off;
+	off_t off;
 	int prot;
 {
 	int     unit = GRFUNIT(dev);
diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h
index f4ad26636d0..f6031403ab6 100644
--- a/sys/arch/mac68k/dev/grfvar.h
+++ b/sys/arch/mac68k/dev/grfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grfvar.h,v 1.8 1997/05/01 03:36:51 briggs Exp $	*/
+/*	$OpenBSD: grfvar.h,v 1.9 2001/11/01 12:13:46 art Exp $	*/
 /*	$NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $	*/
 
 /*
@@ -144,7 +144,7 @@ int	grfopen __P((dev_t dev, int flag, int mode, struct proc *p));
 int	grfclose __P((dev_t dev, int flag, int mode, struct proc *p));
 int	grfioctl __P((dev_t, int, caddr_t, int, struct proc *p));
 int	grfselect __P((dev_t dev, int rw, struct proc *p));
-int	grfmmap __P((dev_t dev, int off, int prot));
+paddr_t	grfmmap __P((dev_t dev, off_t off, int prot));
 int	grfon __P((dev_t dev));
 int	grfoff __P((dev_t dev));
 int	grfaddr __P((struct grf_softc *gp, register int off));
diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c
index 34d0c7b4f77..764078ea26f 100644
--- a/sys/arch/mac68k/mac68k/mem.c
+++ b/sys/arch/mac68k/mac68k/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.14 2001/07/25 13:25:32 art Exp $	*/
+/*	$OpenBSD: mem.c,v 1.15 2001/11/01 12:13:46 art Exp $	*/
 /*	$NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $	*/
 
 /*
@@ -211,10 +211,11 @@ unlock:
 	return (error);
 }
 
-int
+paddr_t
 mmmmap(dev, off, prot)
 	dev_t dev;
-	int off, prot;
+	off_t off;
+	int prot;
 {
 	/*
 	 * /dev/mem is the only one that makes sense through this