[src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup 1.8 - 1.9 (approved by tv)

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dbf28fc3c7de
branches:  netbsd-1-5
changeset: 489800:dbf28fc3c7de
user:      scw <scw%NetBSD.org@localhost>
date:      Tue Oct 17 19:50:57 2000 +0000

description:
Pullup 1.8 - 1.9 (approved by tv)
Bring support for MVME162 into the 1.5 branch.

diffstat:

 sys/arch/mvme68k/dev/vme_two.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 06f7b8f43ca6 -r dbf28fc3c7de sys/arch/mvme68k/dev/vme_two.c
--- a/sys/arch/mvme68k/dev/vme_two.c    Tue Oct 17 19:50:20 2000 +0000
+++ b/sys/arch/mvme68k/dev/vme_two.c    Tue Oct 17 19:50:57 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vme_two.c,v 1.3.2.1 2000/06/27 20:09:33 scw Exp $ */
+/*     $NetBSD: vme_two.c,v 1.3.2.2 2000/10/17 19:50:57 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -116,7 +116,8 @@
        if (vmetwo_sc)
                return (0);
 
-       if (machineid != MVME_167 && machineid != MVME_177)
+       if (machineid != MVME_167 && machineid != MVME_177 &&
+           machineid != MVME_162)
                return (0);
 
        return (1);
@@ -309,8 +310,13 @@
        vaa.va_bdt = sc->sc_dmat;
        vaa.va_slaveconfig = NULL;
 
-       /* Let the NMI handler deal with level 7 ABORT switch interrupts */
-       vmetwo_intr_establish(sc, 7, VME2_VEC_ABORT, nmihand, NULL);
+       if (machineid != MVME_162) {
+               /*
+                * Let the NMI handler deal with level 7 ABORT switch
+                * interrupts
+                */
+               vmetwo_intr_establish(sc, 7, VME2_VEC_ABORT, nmihand, NULL);
+       }
 
        /* Attach the MI VMEbus glue. */
        config_found(self, &vaa, 0);