Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
scottr 2000-02-21 05:36:11 +00:00
parent 296fbeed2a
commit 45ac4c3122
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/mac68k/mac68k/machdep.c
View File

@ -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 @@ setmachdep()
*/
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 @@ setmachdep()
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 @@ setmachdep()
* 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 @@ setmachdep()
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 @@ setmachdep()
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 @@ setmachdep()
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 @@ setmachdep()
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 @@ setmachdep()
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 @@ setmachdep()
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 @@ setmachdep()
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;

4
sys/arch/mac68k/mac68k/via.c
View File

@ -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 via2_noint __P((void *));
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 *)) = {