change order of interrupt description bit

This commit is contained in:
sakamoto 1997-12-11 09:04:23 +00:00
parent 76de9752dd
commit 8bdb67652b
4 changed files with 15 additions and 14 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: extintr.c,v 1.3 1997/12/09 23:33:17 sakamoto Exp $ */
/* $NetBSD: extintr.c,v 1.4 1997/12/11 09:04:23 sakamoto Exp $ */
/* $OpenBSD: isabus.c,v 1.1 1997/10/11 11:53:00 pefo Exp $ */
/*-
@ -399,7 +399,7 @@ do_pending_int()
pcpl = splhigh(); /* Turn off all */
hwpend = ipending & ~pcpl; /* Do now unmasked pendings */
hwpend &= 0x0fffffff;
hwpend &= ~SINT_MASK;
imen &= ~hwpend;
while (hwpend) {
irq = ffs(hwpend) - 1;

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.2 1997/11/27 10:18:04 sakamoto Exp $ */
/* $NetBSD: locore.S,v 1.3 1997/12/11 09:04:25 sakamoto Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@ -55,14 +55,14 @@ GLOBAL(proc0paddr)
.long 0 /* proc0 p_addr */
GLOBAL(intrnames)
.asciz "irq0", "irq1", "irq2", "irq3"
.asciz "clock", "irq1", "irq2", "irq3"
.asciz "irq4", "irq5", "irq6", "irq7"
.asciz "irq8", "irq9", "irq10", "irq11"
.asciz "irq12", "irq13", "irq14", "irq15"
.asciz "irq16", "irq17", "irq18", "irq19"
.asciz "irq20", "irq21", "irq22", "irq23"
.asciz "irq24", "irq25", "irq26", "irq27"
.asciz "irq28", "softnet", "softclock", "clock"
.asciz "irq28", "softnet", "softclock", "softtty"
GLOBAL(eintrnames)
.align 4
GLOBAL(intrcnt)

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.2 1997/11/27 10:18:04 sakamoto Exp $ */
/* $NetBSD: locore.s,v 1.3 1997/12/11 09:04:25 sakamoto Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@ -55,14 +55,14 @@ GLOBAL(proc0paddr)
.long 0 /* proc0 p_addr */
GLOBAL(intrnames)
.asciz "irq0", "irq1", "irq2", "irq3"
.asciz "clock", "irq1", "irq2", "irq3"
.asciz "irq4", "irq5", "irq6", "irq7"
.asciz "irq8", "irq9", "irq10", "irq11"
.asciz "irq12", "irq13", "irq14", "irq15"
.asciz "irq16", "irq17", "irq18", "irq19"
.asciz "irq20", "irq21", "irq22", "irq23"
.asciz "irq24", "irq25", "irq26", "irq27"
.asciz "irq28", "softnet", "softclock", "clock"
.asciz "irq28", "softnet", "softclock", "softtty"
GLOBAL(eintrnames)
.align 4
GLOBAL(intrcnt)

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.2 1997/11/27 10:18:47 sakamoto Exp $ */
/* $NetBSD: intr.h,v 1.3 1997/12/11 09:04:28 sakamoto Exp $ */
/* $OpenBSD: intr.h,v 1.1 1997/10/13 10:53:45 pefo Exp $ */
/*
@ -147,15 +147,16 @@ set_sint(pending)
#define CPU1_INT_MASK 0x1f0
#define INT_STATE_REG 0x2f0
#define SINT_CLOCK 0x10000000
#define SINT_NET 0x20000000
#define SINT_TTY 0x40000000
#define SPL_CLOCK 0x80000000
#define SINT_CLOCK 0x20000000
#define SINT_NET 0x40000000
#define SINT_TTY 0x80000000
#define SPL_CLOCK 0x00000001
#define SINT_MASK (SINT_CLOCK|SINT_NET|SINT_TTY)
#define CNT_SINT_NET 29
#define CNT_SINT_CLOCK 30
#define CNT_CLOCK 31
#define CNT_SINT_TTY 31
#define CNT_CLOCK 0
#define splbio() splraise(imask[IPL_BIO])
#define splnet() splraise(imask[IPL_NET])