summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1994-03-08 13:24:46 +0000
committermycroft <mycroft@NetBSD.org>1994-03-08 13:24:46 +0000
commita692d2185a6b08e393bb617579eb0f6f80cbcc94 (patch)
tree8adc7980a0383edec8dde6e99a3d6632c557e51c /sys/dev
parenta618881dd7a5549f04d49058e64ea39acd3be464 (diff)
Inline spl*() calls.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/isa.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 0d3ef8e6633..299932827d4 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: isa.c,v 1.40 1994/03/06 17:37:56 mycroft Exp $
+ * $Id: isa.c,v 1.41 1994/03/08 13:24:57 mycroft Exp $
*/
/*
@@ -60,7 +60,7 @@
#include <vm/vm.h>
-#include <machine/segments.h>
+#include <machine/cpu.h>
#include <machine/pio.h>
#include <machine/cpufunc.h>
@@ -107,27 +107,27 @@ isa_configure()
struct isa_device *dvp;
struct isa_driver *dp;
- splhigh();
+ (void) splhigh();
INTREN(IRQ_SLAVE);
enable_intr();
- for (dvp = isa_devtab_tty; config_isadev(dvp, &ttymask); dvp++)
+ for (dvp = isa_devtab_tty; config_isadev(dvp, &imask[PIL_TTY]); dvp++)
;
- for (dvp = isa_devtab_bio; config_isadev(dvp, &biomask); dvp++)
+ for (dvp = isa_devtab_bio; config_isadev(dvp, &imask[PIL_BIO]); dvp++)
;
- for (dvp = isa_devtab_net; config_isadev(dvp, &netmask); dvp++)
+ for (dvp = isa_devtab_net; config_isadev(dvp, &imask[PIL_IMP]); dvp++)
;
for (dvp = isa_devtab_null; config_isadev(dvp, (u_int *) NULL); dvp++)
;
- printf("biomask %x ttymask %x netmask %x\n",
- biomask, ttymask, netmask);
+ printf("biomask %x ttymask %x impmask %x\n",
+ imask[PIL_BIO], imask[PIL_TTY], imask[PIL_IMP]);
- clockmask |= astmask;
- biomask |= astmask;
- ttymask |= astmask;
- netmask |= astmask;
- impmask = netmask | ttymask;
+ imask[PIL_AST] |= 0x80000000; /* must be non-zero */
+ imask[PIL_IMP] |= imask[PIL_AST];
+ imask[PIL_TTY] |= imask[PIL_AST];
+ imask[PIL_BIO] |= imask[PIL_AST];
+ imask[PIL_CLOCK] |= imask[PIL_AST];
spl0();
}