4 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index 84c2cb8bf2f..3d797eb2919 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.15 2001/11/06 19:53:15 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.16 2001/11/07 22:31:57 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -65,7 +65,6 @@ void vme2chip_init __P((struct vmesoftc *));
 u_long vme2chip_map __P((u_long, int, int));
 int vme2abort __P((void *));
 int sysconabort __P((void *));
-void * vmemap __P((struct vmesoftc *, void *, int, int));
 void vmeunmap __P((void *, int));
 int vmeprint __P((void *, const char *));
 
@@ -122,7 +121,7 @@ vmematch(parent, cf, args)
 void *
 vmepmap(sc, vmeaddr, len, bustype)
 	struct vmesoftc *sc;
-	void *vmeaddr;
+	off_t vmeaddr;
 	int len;
 	int bustype;
 {
@@ -164,7 +163,7 @@ vmepmap(sc, vmeaddr, len, bustype)
 void *
 vmemap(sc, vmeaddr, len, bustype)
 	struct vmesoftc *sc;
-	void *vmeaddr;
+	off_t vmeaddr;
 	int len;
 	int bustype;
 {
@@ -214,7 +213,7 @@ vmerw(sc, uio, flags, bus)
 			c = NBPG - (v & PGOFSET);
 		if (c == 0)
 			return (0);
-		vme = vmemap(sc, (void *)(v & ~PGOFSET),
+		vme = vmemap(sc, v & ~PGOFSET,
 		    NBPG, BUS_VMES);
 		if (vme == NULL) {
 			error = EFAULT;	/* XXX? */
@@ -269,7 +268,8 @@ vmescan(parent, child, args, bustype)
 		oca.ca_len = 4096;
 
 	oca.ca_offset = (u_int)oca.ca_paddr;
-	oca.ca_vaddr = vmemap(sc, oca.ca_paddr, oca.ca_len, oca.ca_bustype);
+	oca.ca_vaddr = vmemap(sc, (vm_offset_t)oca.ca_paddr, oca.ca_len,
+	    oca.ca_bustype);
 	if (!oca.ca_vaddr)
 		oca.ca_vaddr = (void *)-1;
 	oca.ca_master = (void *)sc;
diff --git a/sys/arch/mvme88k/dev/vme.h b/sys/arch/mvme88k/dev/vme.h
index 845366a6979..44677a21093 100644
--- a/sys/arch/mvme88k/dev/vme.h
+++ b/sys/arch/mvme88k/dev/vme.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: vme.h,v 1.7 2001/11/07 22:31:57 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -373,8 +373,8 @@ struct vme2reg {
 #define VME2_A16BASE	0xffff0000UL
 #define VME2_A24BASE	0xff000000UL
 
-void * vmepmap __P((struct vmesoftc *sc, void * vmeaddr, int len, int bustype));
-void * vmemap __P((struct vmesoftc *sc, void * vmeaddr, int len, int bustype));
+void * vmepmap __P((struct vmesoftc *sc, off_t vmeaddr, int len, int bustype));
+void * vmemap __P((struct vmesoftc *sc, off_t vmeaddr, int len, int bustype));
 int vmerw __P((struct vmesoftc *sc, struct uio *uio, int flags, int bus));
 int vmeintr_establish __P((int vec, struct intrhand *ih));
 int vme_findvec __P((void));
diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c
index 4b6660783e1..64dccbdc9f1 100644
--- a/sys/arch/mvme88k/dev/vmel.c
+++ b/sys/arch/mvme88k/dev/vmel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmel.c,v 1.6 2001/11/01 12:13:46 art Exp $ */
+/*	$OpenBSD: vmel.c,v 1.7 2001/11/07 22:31:57 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -171,7 +171,7 @@ vmelmmap(dev, off, prot)
 	struct vmelsoftc *sc = (struct vmelsoftc *) vmel_cd.cd_devs[unit];
 	void * pa;
 
-	pa = vmepmap(sc->sc_vme, (void *)off, NBPG, BUS_VMEL);
+	pa = vmepmap(sc->sc_vme, off, NBPG, BUS_VMEL);
 	printf("vmel %x pa %x\n", off, pa);
 	if (pa == NULL)
 		return (-1);
diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c
index f907c093b1e..71c4c35600c 100644
--- a/sys/arch/mvme88k/dev/vmes.c
+++ b/sys/arch/mvme88k/dev/vmes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmes.c,v 1.6 2001/11/01 12:13:46 art Exp $ */
+/*	$OpenBSD: vmes.c,v 1.7 2001/11/07 22:31:57 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -171,7 +171,7 @@ vmesmmap(dev, off, prot)
 	struct vmessoftc *sc = (struct vmessoftc *) vmes_cd.cd_devs[unit];
 	void * pa;
 
-	pa = vmepmap(sc->sc_vme, (void *)off, NBPG, BUS_VMES);
+	pa = vmepmap(sc->sc_vme, off, NBPG, BUS_VMES);
 	printf("vmes %x pa %x\n", off, pa);
 	if (pa == NULL)
 		return (-1);