[src/trunk]: src/sys/arch/mac68k/mac68k Use constants defined in viareg.h to ...

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

details:   https://anonhg.NetBSD.org/src/rev/8a762fb408c4
branches:  trunk
changeset: 482756:8a762fb408c4
user:      scottr <scottr%NetBSD.org@localhost>
date:      Mon Feb 21 05:36:11 2000 +0000

description:
Use constants defined in viareg.h to set value of VIA2.

diffstat:

 sys/arch/mac68k/mac68k/machdep.c |  22 +++++++++++-----------
 sys/arch/mac68k/mac68k/via.c     |   4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r 4bcfee8920ef -r 8a762fb408c4 sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Mon Feb 21 05:11:09 2000 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Mon Feb 21 05:36:11 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.246 2000/02/21 04:08:21 scottr Exp $     */
+/*     $NetBSD: machdep.c,v 1.247 2000/02/21 05:36:11 scottr Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -2110,7 +2110,7 @@
         */
        switch (cpui->class) {  /* Base this on class of machine... */
        case MACH_CLASSII:
-               VIA2 = 1;
+               VIA2 = VIA2OFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2120,7 +2120,7 @@
                setup_mrg_vectors = 1;
                break;
        case MACH_CLASSPB:
-               VIA2 = 1;
+               VIA2 = VIA2OFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2138,7 +2138,7 @@
                 * like the VIA2 functions might be on the MSC at the RBV
                 * locations.  The rest is copied from the Powerbooks.
                 */
-               VIA2 = 0x13;
+               VIA2 = RBVOFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2150,7 +2150,7 @@
                break;
        case MACH_CLASSQ:
        case MACH_CLASSQ2:
-               VIA2 = 1;
+               VIA2 = VIA2OFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.sonic = 1;
@@ -2179,7 +2179,7 @@
                break;
        case MACH_CLASSAV:
        case MACH_CLASSP580:
-               VIA2 = 1;
+               VIA2 = VIA2OFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi96 = 1;
@@ -2188,7 +2188,7 @@
                via_reg(VIA2, vIER) = 0x7f;     /* disable VIA2 int */
                break;
        case MACH_CLASSIIci:
-               VIA2 = 0x13;
+               VIA2 = RBVOFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2197,7 +2197,7 @@
                via_reg(VIA2, rIER) = 0x7f;     /* disable RBV int */
                break;
        case MACH_CLASSIIsi:
-               VIA2 = 0x13;
+               VIA2 = RBVOFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2206,7 +2206,7 @@
                via_reg(VIA2, rIER) = 0x7f;     /* disable RBV int */
                break;
        case MACH_CLASSIIvx:
-               VIA2 = 0x13;
+               VIA2 = RBVOFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2215,7 +2215,7 @@
                via_reg(VIA2, rIER) = 0x7f;     /* disable RBV int */
                break;
        case MACH_CLASSLC:
-               VIA2 = 0x13;
+               VIA2 = RBVOFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
@@ -2224,7 +2224,7 @@
                via_reg(VIA2, rIER) = 0x7f;     /* disable RBV int */
                break;
        case MACH_CLASSIIfx:
-               VIA2 = 0xd;
+               VIA2 = OSSOFF;
                IOBase = 0x50f00000;
                Via1Base = (volatile u_char *)IOBase;
                mac68k_machine.scsi80 = 1;
diff -r 4bcfee8920ef -r 8a762fb408c4 sys/arch/mac68k/mac68k/via.c
--- a/sys/arch/mac68k/mac68k/via.c      Mon Feb 21 05:11:09 2000 +0000
+++ b/sys/arch/mac68k/mac68k/via.c      Mon Feb 21 05:36:11 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: via.c,v 1.70 1999/06/28 01:56:58 briggs Exp $  */
+/*     $NetBSD: via.c,v 1.71 2000/02/21 05:36:13 scottr Exp $  */
 
 /*-
  * Copyright (C) 1993  Allen K. Briggs, Chris P. Caputo,
@@ -66,7 +66,7 @@
 static void    slot_ignore __P((void *));
 static void    slot_noint __P((void *));
 
-int    VIA2 = 1;               /* default for II, IIx, IIcx, SE/30. */
+int    VIA2 = VIA2OFF;         /* default for II, IIx, IIcx, SE/30. */
 
 /* VIA1 interrupt handler table */
 void (*via1itab[7]) __P((void *)) = {