[src/trunk]: src/sys/arch/mac68k/mac68k Revert to the old practice of always ...

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

details:   https://anonhg.NetBSD.org/src/rev/f2aa4de3f44c
branches:  trunk
changeset: 483889:f2aa4de3f44c
user:      scottr <scottr%NetBSD.org@localhost>
date:      Mon Mar 20 08:07:52 2000 +0000

description:
Revert to the old practice of always setting up MRG, even if we don't
need it for ADB.  Besides the misleading message at autoconf time,
MRG is sometimes useful for things other than ADB.

diffstat:

 sys/arch/mac68k/mac68k/machdep.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 155187b5b44c -r f2aa4de3f44c sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Mon Mar 20 07:52:58 2000 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Mon Mar 20 08:07:52 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.249 2000/03/09 22:27:09 scottr Exp $     */
+/*     $NetBSD: machdep.c,v 1.250 2000/03/20 08:07:52 scottr Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1970,7 +1970,7 @@
        u_long  fbmask;
        u_long  fblen;
 } intvid_info[] = {
-       { MACH_MACCLASSICII,    0xfee09a80,     0x0,            21888 },
+       { MACH_MACCLASSICII,    0x009f9a80,     0x0,            21888 },
        { MACH_MACPB140,        0xfee00000,     0x0,            32 * 1024 },
        { MACH_MACPB145,        0xfee00000,     0x0,            32 * 1024 },
        { MACH_MACPB170,        0xfee00000,     0x0,            32 * 1024 },
@@ -2087,7 +2087,6 @@
 void
 setmachdep()
 {
-       int setup_mrg_vectors = 0;
        struct cpu_model_info *cpui;
 
        /*
@@ -2118,7 +2117,6 @@
                mac68k_machine.zs_chip = 0;
                via_reg(VIA1, vIER) = 0x7f;     /* disable VIA1 int */
                via_reg(VIA2, vIER) = 0x7f;     /* disable VIA2 int */
-               setup_mrg_vectors = 1;
                break;
        case MACH_CLASSPB:
                VIA2 = VIA2OFF;
@@ -2243,8 +2241,7 @@
         * used later when we re-map the vectors from MacOS Address
         * Space to NetBSD Address Space.
         */
-       if ((mac68k_machine.serial_console & 0x03) == 0 || setup_mrg_vectors)
-               mrg_MacOSROMVectors = cpui->rom_vectors;
+       mrg_MacOSROMVectors = cpui->rom_vectors;
 }
 
 /*