summaryrefslogtreecommitdiff
path: root/sys/arch/mvme88k/dev/vx.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-12-22 11:54:49 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-12-22 11:54:49 +0000
commitc6a1b850531133e6900c8f4dbdffe8fa1e232aea (patch)
tree8ab5079c21ce2ca4b4c7e9fc26e129b8b7da247c /sys/arch/mvme88k/dev/vx.c
parent46f9808a6613fd9a139db6fffc33fa4243a6cd95 (diff)
Correctly handle vme attachments which specify a larger ca_len size than
initially expected.
Diffstat (limited to 'sys/arch/mvme88k/dev/vx.c')
-rw-r--r--sys/arch/mvme88k/dev/vx.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/arch/mvme88k/dev/vx.c b/sys/arch/mvme88k/dev/vx.c
index 6f5d20ff0b1..2eea375d73f 100644
--- a/sys/arch/mvme88k/dev/vx.c
+++ b/sys/arch/mvme88k/dev/vx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vx.c,v 1.24 2003/11/09 00:31:59 miod Exp $ */
+/* $OpenBSD: vx.c,v 1.25 2003/12/22 11:54:48 miod Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* All rights reserved.
@@ -161,9 +161,6 @@ struct cfdriver vx_cd = {
#define VX_UNIT(x) (int)(minor(x) / 9)
#define VX_PORT(x) (int)(minor(x) % 9)
-struct envelope *bpp_wait;
-unsigned int board_addr;
-
struct tty * vxtty(dev)
dev_t dev;
{
@@ -187,17 +184,14 @@ vxmatch(parent, self, aux)
struct vxreg *vx_reg;
struct confargs *ca = aux;
-#ifdef OLD_MAPPINGS
- ca->ca_vaddr = ca->ca_paddr;
-#endif
- ca->ca_len = 0x10000; /* we know this. */
ca->ca_ipl = 3; /* we need interrupts for this board to work */
+ ca->ca_len = 0x10000; /* we know this */
vx_reg = (struct vxreg *)ca->ca_vaddr;
- board_addr = (unsigned int)ca->ca_vaddr;
if (badvaddr((unsigned)&vx_reg->ipc_cr, 1))
return (0);
- return (1);
+
+ return (1);
}
void