summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2003-04-02 23:42:14 +0000
committerJason Wright <jason@cvs.openbsd.org>2003-04-02 23:42:14 +0000
commit4d2e69a4def08a469de9a7d4508e47e6cca5a1b8 (patch)
tree2c650ebd9426ddac08b8ba0aa31f9269e690cf89 /sys/arch
parentb2a231fe987a8aa8de6af24d48a24102ecc58d16 (diff)
Don't allow the DZ-11 RX interrupt to be masked (if a DZ-11 interrupt was seen
during the "wait for a second looking for annoying interrupts" period, it would mask it off... oops =)
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/vax/vsa/vsbus.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c
index ea0aa49edbc..dbc1d3ce5c3 100644
--- a/sys/arch/vax/vsa/vsbus.c
+++ b/sys/arch/vax/vsa/vsbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsbus.c,v 1.10 2002/01/16 20:50:17 miod Exp $ */
+/* $OpenBSD: vsbus.c,v 1.11 2003/04/02 23:42:13 jason Exp $ */
/* $NetBSD: vsbus.c,v 1.29 2000/06/29 07:14:37 mrg Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
@@ -206,7 +206,18 @@ vsbus_attach(parent, self, aux)
*sc->sc_intclr = 0xff;
DELAY(1000000); /* Wait a second */
sc->sc_mask = *sc->sc_intreq;
+
+#if VAX48
+ /*
+ * It's possible for the 4000/VLC to generate an DZ-11 rx interrupt
+ * (0x20) during the delay period, unmask that bit.
+ */
+ if (vax_boardtype == VAX_BTYP_48)
+ sc->sc_mask &= ~0x20;
+#endif
+
printf("%s: interrupt mask %x\n", self->dv_xname, sc->sc_mask);
+
/*
* now check for all possible devices on this "bus"
*/