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

Make splimp = splnet | spltty, and get rid of SLIP kluge for splnet and 

spltty.
This commit is contained in:
mycroft 1993-07-11 14:03:51 +00:00
parent f129a8ba77
commit 0daaa4f16c
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/i386/isa/icu.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)icu.h 5.6 (Berkeley) 5/9/91
* $Id: icu.h,v 1.4 1993/06/27 05:42:45 andrew Exp $
* $Id: icu.h,v 1.5 1993/07/11 14:03:51 mycroft Exp $
*/
/*
@ -59,7 +59,8 @@ extern unsigned cpl; /* current priority level mask */
extern unsigned highmask; /* group of interrupts masked with splhigh() */
extern unsigned ttymask; /* group of interrupts masked with spltty() */
extern unsigned biomask; /* group of interrupts masked with splbio() */
extern unsigned netmask; /* group of interrupts masked with splimp() */
extern unsigned netmask; /* group of interrupts masked with splnet() */
extern unsigned impmask; /* group of interrupts masked with splimp() */
#define INTREN(s) (imen &= ~(s), SET_ICUS())
#define INTRDIS(s) (imen |= (s), SET_ICUS())

4
sys/arch/i386/isa/icu.s
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)icu.s 7.2 (Berkeley) 5/21/91
* $Id: icu.s,v 1.17 1993/07/11 06:09:48 cgd Exp $
* $Id: icu.s,v 1.18 1993/07/11 14:03:53 mycroft Exp $
*/
/*
@ -253,7 +253,7 @@ test_resched:
GENSPL(bio, _biomask, 12)
GENSPL(clock, $HIGHMASK, 13) /* splclock == splhigh ex for count */
GENSPL(high, $HIGHMASK, 14)
GENSPL(imp, _netmask, 15) /* splimp == splnet except for count */
GENSPL(imp, _impmask, 15)
GENSPL(net, _netmask, 16)
GENSPL(softclock, $SOFTCLOCKMASK, 17)
GENSPL(tty, _ttymask, 18)

12
sys/arch/i386/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.25 1993/07/07 06:52:39 cgd Exp $
* $Id: isa.c,v 1.26 1993/07/11 14:03:54 mycroft Exp $
*/
/*
@ -108,11 +108,8 @@ isa_configure() {
;
for (dvp = isa_devtab_null; config_isadev(dvp, (u_int *) NULL); dvp++)
;
#include "sl.h"
#if NSL > 0
netmask |= ttymask;
ttymask |= netmask;
#endif
impmask = ttymask | netmask;
/* and the problem is... if netmask == 0, then the loopback
* code can do some really ugly things.
@ -124,7 +121,8 @@ isa_configure() {
netmask = 0x8000; /* same as for softclock. XXX */
/* biomask |= ttymask ; can some tty devices use buffers? */
printf("biomask %x ttymask %x netmask %x\n", biomask, ttymask, netmask);
printf("biomask %x ttymask %x netmask %x impmask %x\n",
biomask, ttymask, netmask, impmask);
splnone();
}

12
sys/dev/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.25 1993/07/07 06:52:39 cgd Exp $
* $Id: isa.c,v 1.26 1993/07/11 14:03:54 mycroft Exp $
*/
/*
@ -108,11 +108,8 @@ isa_configure() {
;
for (dvp = isa_devtab_null; config_isadev(dvp, (u_int *) NULL); dvp++)
;
#include "sl.h"
#if NSL > 0
netmask |= ttymask;
ttymask |= netmask;
#endif
impmask = ttymask | netmask;
/* and the problem is... if netmask == 0, then the loopback
* code can do some really ugly things.
@ -124,7 +121,8 @@ isa_configure() {
netmask = 0x8000; /* same as for softclock. XXX */
/* biomask |= ttymask ; can some tty devices use buffers? */
printf("biomask %x ttymask %x netmask %x\n", biomask, ttymask, netmask);
printf("biomask %x ttymask %x netmask %x impmask %x\n",
biomask, ttymask, netmask, impmask);
splnone();
}