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

kill siroff() and resturcture do_sir() to be cleaner and more correct.

This commit is contained in:
cgd 1996-12-03 17:34:47 +00:00
parent a04fb885d8
commit 156fe546d2
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/arch/alpha/alpha/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.57 1996/11/17 01:59:35 cgd Exp $ */
/* $NetBSD: machdep.c,v 1.58 1996/12/03 17:34:49 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -1431,16 +1431,29 @@ netintr()
void
do_sir()
{
u_int64_t n;
int s;
if (ssir & SIR_NET) {
siroff(SIR_NET);
cnt.v_soft++;
netintr();
}
if (ssir & SIR_CLOCK) {
siroff(SIR_CLOCK);
cnt.v_soft++;
softclock();
while (ssir) {
s = splhigh();
n = ssir;
ssir = 0;
splx(s);
if (n & SIR_NET) {
cnt.v_soft++;
netintr();
}
if (n & SIR_CLOCK) {
cnt.v_soft++;
softclock();
}
if (n & SIR_TTY) {
extern void comsoft __P((void));
cnt.v_soft++;
comsoft();
}
}
}

3
sys/arch/alpha/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.3 1996/11/17 02:03:10 cgd Exp $ */
/* $NetBSD: intr.h,v 1.4 1996/12/03 17:34:47 cgd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -66,7 +66,6 @@ extern u_int64_t ssir;
#define SIR_NET 0x1
#define SIR_CLOCK 0x2
#define siroff(x) ssir &= ~(x)
#define setsoftnet() ssir |= SIR_NET
#define setsoftclock() ssir |= SIR_CLOCK