[src/netbsd-1-4]: src/sys/arch/mac68k/mac68k last pullup on the branch was co...

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

details:   https://anonhg.NetBSD.org/src/rev/2e09be54bc00
branches:  netbsd-1-4
changeset: 469196:2e09be54bc00
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 08 19:40:49 1999 +0000

description:
last pullup on the branch was corrupt -- this fixes it. (fix from briggs)

diffstat:

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

diffs (45 lines):

diff -r dbe2bc6eaba4 -r 2e09be54bc00 sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Thu Jul 08 17:43:26 1999 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Thu Jul 08 19:40:49 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.227.2.2 1999/07/01 15:37:09 perry Exp $  */
+/*     $NetBSD: machdep.c,v 1.227.2.3 1999/07/08 19:40:49 perry Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -2204,17 +2204,11 @@
                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,11 +2323,17 @@
        switch (current_mac_model->class) {
        case MACH_CLASSQ:
                Via1Base = (volatile u_char *)base;
+
+               /* The following two may be overridden. */
                sccA = (volatile u_char *)base + 0xc000;
+               SCSIBase = base + 0xf000;
+
                switch (current_mac_model->machineid) {
                case MACH_MACQ900:
                case MACH_MACQ950:
                        mac68k_machine.scsi96_2 = 1;
+                       sccA = (volatile u_char *)base + 0xc020;
+                       break;
                case MACH_MACQ700:
                        break;
                default: