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, 24 insertions, 19 deletions

diff --git a/sys/arch/mvme88k/dev/nvram.c b/sys/arch/mvme88k/dev/nvram.c
index a2a54b3eac0..3c1b526a4ef 100644
--- a/sys/arch/mvme88k/dev/nvram.c
+++ b/sys/arch/mvme88k/dev/nvram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvram.c,v 1.11 2001/08/26 02:37:07 miod Exp $ */
+/*	$OpenBSD: nvram.c,v 1.12 2001/11/01 12:13:46 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -82,7 +82,7 @@ int nvramioctl __P((dev_t dev, int cmd, caddr_t data, int flag,
     struct proc *p));
 int nvramread __P((dev_t dev, struct uio *uio, int flags));
 int nvramwrite __P((dev_t dev, struct uio *uio, int flags));
-int nvrammmap __P((dev_t dev, int off, int prot));
+paddr_t nvrammmap __P((dev_t dev, off_t off, int prot));
 
 u_long chiptotime __P((int, int, int, int, int, int));
 
@@ -487,10 +487,11 @@ nvramwrite(dev, uio, flags)
  * will also be mmap'd, due to NBPG being 4K. On the MVME147 the NVRAM
  * repeats, so userland gets two copies back-to-back.
  */
-int
+paddr_t
 nvrammmap(dev, off, prot)
 	dev_t dev;
-	int off, prot;
+	off_t off;
+	int prot;
 {
 	int unit = minor(dev);
 	struct nvramsoftc *sc = (struct nvramsoftc *) nvram_cd.cd_devs[unit];
diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c
index 79c128a33a0..c8ffa6923bc 100644
--- a/sys/arch/mvme88k/dev/sram.c
+++ b/sys/arch/mvme88k/dev/sram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sram.c,v 1.2 2001/06/14 21:30:34 miod Exp $ */
+/*	$OpenBSD: sram.c,v 1.3 2001/11/01 12:13:46 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -205,10 +205,11 @@ sramwrite(dev, uio, flags)
 	return (memdevrw(sc->sc_vaddr, sc->sc_len, uio, flags));
 }
 
-int
+paddr_t
 srammmap(dev, off, prot)
 	dev_t dev;
-	int off, prot;
+	off_t off;
+	int prot;
 {
 	int unit = minor(dev);
 	struct sramsoftc *sc = (struct sramsoftc *) sram_cd.cd_devs[unit];
diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c
index 8c91db1892b..4b6660783e1 100644
--- a/sys/arch/mvme88k/dev/vmel.c
+++ b/sys/arch/mvme88k/dev/vmel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmel.c,v 1.5 2001/08/26 02:37:07 miod Exp $ */
+/*	$OpenBSD: vmel.c,v 1.6 2001/11/01 12:13:46 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -65,7 +65,7 @@ int vmelclose __P((dev_t, int, int));
 int vmelioctl __P((dev_t, int, caddr_t, int, struct proc *));
 int vmelread __P((dev_t, struct uio *, int));
 int vmelwrite __P((dev_t, struct uio *, int));
-int vmelmmap __P((dev_t, int, int));
+paddr_t vmelmmap __P((dev_t, off_t, int));
 
 int
 vmelmatch(parent, cf, args)
@@ -161,10 +161,11 @@ vmelwrite(dev, uio, flags)
 	return (vmerw(sc->sc_vme, uio, flags, BUS_VMEL));
 }
 
-int
+paddr_t
 vmelmmap(dev, off, prot)
 	dev_t dev;
-	int off, prot;
+	off_t off;
+	int prot;
 {
 	int unit = minor(dev);
 	struct vmelsoftc *sc = (struct vmelsoftc *) vmel_cd.cd_devs[unit];
diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c
index 4832d7f73cc..f907c093b1e 100644
--- a/sys/arch/mvme88k/dev/vmes.c
+++ b/sys/arch/mvme88k/dev/vmes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmes.c,v 1.5 2001/08/26 02:37:07 miod Exp $ */
+/*	$OpenBSD: vmes.c,v 1.6 2001/11/01 12:13:46 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -65,7 +65,7 @@ int vmesclose __P((dev_t, int, int));
 int vmesioctl __P((dev_t, int, caddr_t, int, struct proc *));
 int vmesread __P((dev_t, struct uio *, int));
 int vmeswrite __P((dev_t, struct uio *, int));
-int vmesmmap __P((dev_t, int, int));
+paddr_t vmesmmap __P((dev_t, off_t, int));
 
 int
 vmesmatch(parent, cf, args)
@@ -161,10 +161,11 @@ vmeswrite(dev, uio, flags)
 	return (vmerw(sc->sc_vme, uio, flags, BUS_VMES));
 }
 
-int
+paddr_t
 vmesmmap(dev, off, prot)
 	dev_t dev;
-	int off, prot;
+	off_t off;
+	int prot;
 {
 	int unit = minor(dev);
 	struct vmessoftc *sc = (struct vmessoftc *) vmes_cd.cd_devs[unit];
diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c
index 522f5bb0b12..d3770956fb4 100644
--- a/sys/arch/mvme88k/mvme88k/mem.c
+++ b/sys/arch/mvme88k/mvme88k/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.11 2001/08/26 14:31:12 miod Exp $ */
+/*	$OpenBSD: mem.c,v 1.12 2001/11/01 12:13:46 art Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -61,7 +61,7 @@ caddr_t zeropage;
 int mmopen __P((dev_t, int, int));
 int mmclose __P((dev_t, int, int));
 int mmrw __P((dev_t, struct uio *, int));
-int mmmmap __P((dev_t, int, int));
+paddr_t mmmmap __P((dev_t, off_t, int));
 int mmioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
 
 /*ARGSUSED*/
@@ -217,10 +217,11 @@ unlock:
 	return (error);
 }
 
-int
+paddr_t
 mmmmap(dev, off, prot)
         dev_t dev;
-        int off, prot;
+        off_t off;
+	int prot;
 {
 	return (-1);
 }