[src/netbsd-1-4]: src/sys/arch/mac68k/mac68k pullup 1.235->1.236 (briggs)

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

details:   https://anonhg.NetBSD.org/src/rev/d82dba2eae21
branches:  netbsd-1-4
changeset: 469129:d82dba2eae21
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 01 15:37:09 1999 +0000

description:
pullup 1.235->1.236 (briggs)

diffstat:

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

diffs (35 lines):

diff -r 31f9bf0db1bf -r d82dba2eae21 sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Thu Jul 01 15:20:58 1999 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Thu Jul 01 15:37:09 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.227.2.1 1999/04/16 16:19:01 chs Exp $    */
+/*     $NetBSD: machdep.c,v 1.227.2.2 1999/07/01 15:37:09 perry Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -2204,11 +2204,17 @@
                mac68k_machine.zs_chip = 0;
                /* Disable everything but PM; we need it. */
                via_reg(VIA1, vIER) = 0x6f;     /* disable VIA1 int */
+
+               /* The following two may be overridden. */
                /* Are we disabling something important? */
+               SCSIBase = base + 0xf000;
+
                via_reg(VIA2, vIER) = 0x7f;     /* disable VIA2 int */
                if (cputype == CPU_68040)
                        mac68k_machine.sonic = 1;
                break;
+                       sccA = (volatile u_char *)base + 0xc020;
+                       break;
        case MACH_CLASSDUO:
                /*
                 * The Duo definitely does not use a VIA2, but it looks
@@ -2329,7 +2335,6 @@
                case MACH_MACQ950:
                        mac68k_machine.scsi96_2 = 1;
                case MACH_MACQ700:
-                       SCSIBase = base + 0xf000;
                        break;
                default:
                        SCSIBase = base + 0x10000;