Get rid of the `len' locator for VME devices, since mappings have a page

granularity anyway; devices who would want more than one page mapped in
order to probe for the hardware can take appropriate action in their cfmatch
routine anyway.

10 files changed, 70 insertions, 75 deletions

diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index 20b833c3471..6fc48fcf75f 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.26 2005/08/03 02:10:44 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.27 2005/11/27 14:19:06 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -79,16 +79,16 @@ bugtty0 at mainbus0
 
 vmes0	at vme0
 
-vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
+vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
+vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
+vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
+vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
+vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
 
-le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
-le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
-le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76
 
 vmel0	at vme0
 
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index 114c620be2a..1e5f6899b19 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME147,v 1.18 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: MVME147,v 1.19 2005/11/27 14:19:06 miod Exp $
 
 machine		mvme68k m68k
 
@@ -33,16 +33,16 @@ bugtty0 at mainbus0
 
 vmes0	at vme0
 
-#vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-#vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-#vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-#vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-#vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-#vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+#vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
+#vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
+#vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
+#vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
+#vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
+#vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
 
-le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
-le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
-le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76
 
 vmel0	at vme0
 
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index 0bc648a8b03..0139271bc5d 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME162,v 1.21 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: MVME162,v 1.22 2005/11/27 14:19:07 miod Exp $
 
 machine		mvme68k m68k
 
@@ -40,16 +40,16 @@ bugtty0 at mainbus0
 
 vmes0	at vme0
 
-vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
+vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
+vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
+vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
+vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
+vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
 
-le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
-le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
-le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76
 
 vmel0	at vme0
 
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index 9de2d24a187..65c4bf115e6 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME167,v 1.21 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: MVME167,v 1.22 2005/11/27 14:19:07 miod Exp $
 
 machine		mvme68k m68k
 
@@ -36,16 +36,16 @@ bugtty0 at mainbus0
 
 vmes0	at vme0
 
-vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
+vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
+vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
+vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
+vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
+vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
 
-le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
-le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
-le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76
 
 vmel0	at vme0
 
diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177
index 5147cff84f4..f1661195a3e 100644
--- a/sys/arch/mvme68k/conf/MVME177
+++ b/sys/arch/mvme68k/conf/MVME177
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME177,v 1.10 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: MVME177,v 1.11 2005/11/27 14:19:07 miod Exp $
 
 machine		mvme68k m68k
 
@@ -36,16 +36,16 @@ bugtty0 at mainbus0
 
 vmes0	at vme0
 
-vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
+vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
+vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
+vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
+vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
+vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
 
-le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
-le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
-le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76
 
 vmel0	at vme0
 
diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK
index 44c731fdeaa..3c1e4e73058 100644
--- a/sys/arch/mvme68k/conf/RAMDISK
+++ b/sys/arch/mvme68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.6 2005/08/01 12:04:52 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.7 2005/11/27 14:19:07 miod Exp $
 
 machine		mvme68k m68k
 
@@ -83,16 +83,16 @@ bugtty0 at mainbus0
 
 vmes0	at vme0
 
-vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+vs*	at vmes0 addr 0xffff9000 ipl 2 vec 0x80
+vs*	at vmes0 addr 0xffff9800 ipl 2 vec 0x82
+vs*	at vmes0 addr 0xffff4800 ipl 2 vec 0x84
+vs*	at vmes0 addr 0xffff5800 ipl 2 vec 0x86
+vs*	at vmes0 addr 0xffff7000 ipl 2 vec 0x88
+vs*	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a
 
-le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
-le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
-le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
+le*	at vmes0 addr 0xffff1200 ipl 1 vec 0x74
+le*	at vmes0 addr 0xffff1400 ipl 1 vec 0x75
+le*	at vmes0 addr 0xffff1600 ipl 1 vec 0x76
 
 vmel0	at vme0
 
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index b9b3500e9c9..daebb15d8ef 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.27 2005/09/21 21:08:34 miod Exp $
+#	$OpenBSD: files.mvme68k,v 1.28 2005/11/27 14:19:07 miod Exp $
 
 # config file for mvme68k
 
@@ -41,9 +41,9 @@ file	arch/mvme68k/dev/bug.c			bugtty
 
 device	vme {}
 attach	vme at pcc, mc, pcctwo
-device	vmes {[addr = -1], [len = -1], [vec = -1], [ipl = 0]}
+device	vmes {[addr = -1], [vec = -1], [ipl = 0]}
 attach	vmes at vme
-device	vmel {[addr = -1], [len = -1], [vec = -1], [ipl = 0]}
+device	vmel {[addr = -1], [vec = -1], [ipl = 0]}
 attach	vmel at vme
 file	arch/mvme68k/dev/vme.c			vme | vmes | vmel
 file	arch/mvme68k/dev/vmes.c			vmes needs-count
diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c
index d707f80b9f7..e007ca92c84 100644
--- a/sys/arch/mvme68k/dev/ipic.c
+++ b/sys/arch/mvme68k/dev/ipic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipic.c,v 1.16 2005/11/24 22:43:16 miod Exp $ */
+/*	$OpenBSD: ipic.c,v 1.17 2005/11/27 14:19:08 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -126,7 +126,6 @@ ipicscan(parent, child, args)
 		oca.ca_offset = slot;		/* slot number */
 		oca.ca_paddr = ipp;
 		oca.ca_vaddr = ipv;
-		oca.ca_len = NBPG;
 		oca.ca_ipl = cf->cf_loc[2];
 		oca.ca_vec = cf->cf_loc[3];
 		if (oca.ca_ipl > 0 && oca.ca_vec == -1)
diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c
index e70206f9ead..20c111cb269 100644
--- a/sys/arch/mvme68k/dev/vme.c
+++ b/sys/arch/mvme68k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.23 2005/11/24 22:43:16 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.24 2005/11/27 14:19:09 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -305,22 +305,19 @@ vmescan(parent, child, args, bustype)
 	bzero(&oca, sizeof oca);
 	oca.ca_bustype = bustype;
 	oca.ca_paddr = cf->cf_loc[0];
-	oca.ca_len = cf->cf_loc[1];
-	oca.ca_vec = cf->cf_loc[2];
-	oca.ca_ipl = cf->cf_loc[3];
+	oca.ca_vec = cf->cf_loc[1];
+	oca.ca_ipl = cf->cf_loc[2];
 	if (oca.ca_ipl > 0 && oca.ca_vec == -1)
 		oca.ca_vec = intr_findvec(255, 0);
-	if (oca.ca_len == -1)
-		oca.ca_len = 4096;
 
 	oca.ca_offset = oca.ca_paddr;
-	oca.ca_vaddr = vmemap(sc, oca.ca_paddr, oca.ca_len, oca.ca_bustype);
+	oca.ca_vaddr = vmemap(sc, oca.ca_paddr, PAGE_SIZE, oca.ca_bustype);
 	if (oca.ca_vaddr == 0)
 		oca.ca_vaddr = (vaddr_t)-1;
 	oca.ca_name = cf->cf_driver->cd_name;
 	if ((*cf->cf_attach->ca_match)(parent, cf, &oca) == 0) {
 		if (oca.ca_vaddr != (vaddr_t)-1)
-			vmeunmap(oca.ca_vaddr, oca.ca_len);
+			vmeunmap(oca.ca_vaddr, PAGE_SIZE);
 		return (0);
 	}
 	/*
diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h
index d990f81f813..06ef4eab068 100644
--- a/sys/arch/mvme68k/include/autoconf.h
+++ b/sys/arch/mvme68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.12 2005/11/27 14:17:39 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.13 2005/11/27 14:19:09 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -33,7 +33,6 @@ struct confargs {
 	vaddr_t	ca_vaddr;
 	paddr_t	ca_paddr;
 	int	ca_offset;
-	int	ca_len;
 	int	ca_ipl;
 	int	ca_vec;
 	char	*ca_name;