summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/dev/vme.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-11-27 14:19:10 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-11-27 14:19:10 +0000
commit1d293323fa550f4affc1ca7eee249622433fc643 (patch)
treeb3fc53baa4826b9906be356181b91c61a137e3e7 /sys/arch/mvme68k/dev/vme.c
parent91105cad4986d51fb4a9c70d116795e1ae774125 (diff)
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.
Diffstat (limited to 'sys/arch/mvme68k/dev/vme.c')
-rw-r--r--sys/arch/mvme68k/dev/vme.c13
1 files changed, 5 insertions, 8 deletions
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);
}
/*