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

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

details:   https://anonhg.NetBSD.org/src/rev/cdb329ed5d1a
branches:  netbsd-1-5
changeset: 489795:cdb329ed5d1a
user:      scw <scw%NetBSD.org@localhost>
date:      Tue Oct 17 19:48:13 2000 +0000

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

diffstat:

 sys/arch/mvme68k/dev/mainbus.c   |  11 +++--------
 sys/arch/mvme68k/dev/pcctwovar.h |   3 ++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 3edb53efb89e -r cdb329ed5d1a sys/arch/mvme68k/dev/mainbus.c
--- a/sys/arch/mvme68k/dev/mainbus.c    Tue Oct 17 19:47:29 2000 +0000
+++ b/sys/arch/mvme68k/dev/mainbus.c    Tue Oct 17 19:48:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.2 2000/03/18 22:33:03 scw Exp $  */
+/*     $NetBSD: mainbus.c,v 1.2.4.1 2000/10/17 19:48:13 scw Exp $      */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
 };
 #endif
 
-#if defined(MVME167) || defined(MVME177)
+#if defined(MVME162) || defined(MVME167) || defined(MVME177)
 static struct mainbus_devices mainbusdevs_1x7[] = {
        {"pcctwo", MAINBUS_PCCTWO_OFFSET},
        {"vmetwo", MAINBUS_VMETWO_OFFSET},
@@ -146,13 +146,8 @@
                break;
 #endif
 
-#ifdef MVME162
+#if defined(MVME162) || defined(MVME167) || defined(MVME177)
        case MVME_162:
-               devices = mainbusdevs_162;
-               break;
-#endif
-
-#if defined(MVME167) || defined(MVME177)
        case MVME_166:
        case MVME_167:
        case MVME_177:
diff -r 3edb53efb89e -r cdb329ed5d1a sys/arch/mvme68k/dev/pcctwovar.h
--- a/sys/arch/mvme68k/dev/pcctwovar.h  Tue Oct 17 19:47:29 2000 +0000
+++ b/sys/arch/mvme68k/dev/pcctwovar.h  Tue Oct 17 19:48:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcctwovar.h,v 1.2 2000/03/18 22:33:03 scw Exp $        */
+/*     $NetBSD: pcctwovar.h,v 1.2.4.1 2000/10/17 19:48:46 scw Exp $    */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -61,6 +61,7 @@
        struct device           sc_dev;
        bus_space_tag_t         sc_bust;        /* PCCChip2's register tag */
        bus_space_handle_t      sc_bush;        /* PCCChip2's register handle */
+       int                     *sc_vec2icsr;   /* Translate vector to ICSR */
 };
 
 extern struct pcctwo_softc *sys_pcctwo;