d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move initialization of SWI's in the tty|net|bio masks from isa.c into

Browse Source 
the static initializers in ipl.s.
This commit is contained in:
peter 1999-04-11 15:51:15 +00:00
parent 984b981d29
commit 32242a8048
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/amd64/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.116 1998/10/22 05:58:39 bde Exp $
* $Id: isa.c,v 1.117 1998/11/29 15:42:40 phk Exp $
*/
/*
@ -404,10 +404,6 @@ isa_configure()
if (!dvp->id_driver->sensitive_hw)
config_isadev(dvp, (u_int *)NULL);
bio_imask |= SWI_CLOCK_MASK;
net_imask |= SWI_NET_MASK;
tty_imask |= SWI_TTY_MASK;
/*
* XXX we should really add the tty device to net_imask when the line is
* switched to SLIPDISC, and then remove it when it is switched away from
@ -425,8 +421,6 @@ isa_configure()
tty_imask = net_imask;
#endif
/* bio_imask |= tty_imask ; can some tty devices use buffers? */
if (bootverbose)
printf("imasks: bio %x, tty %x, net %x\n",
bio_imask, tty_imask, net_imask);

10
sys/i386/isa/ipl.s
View File

@ -36,7 +36,7 @@
*
* @(#)ipl.s
*
* $Id: ipl.s,v 1.23 1998/08/11 15:08:12 bde Exp $
* $Id: ipl.s,v 1.24 1998/08/11 17:01:32 bde Exp $
*/
@ -53,13 +53,13 @@
_cpl: .long HWI_MASK | SWI_MASK
.globl _tty_imask
_tty_imask: .long 0
_tty_imask: .long SWI_TTY_MASK
.globl _bio_imask
_bio_imask: .long SWI_CAMBIO_MASK
_bio_imask: .long SWI_CLOCK_MASK | SWI_CAMBIO_MASK
.globl _net_imask
_net_imask: .long SWI_NET_MASK | SWI_CAMNET_MASK
.globl _cam_imask
_cam_imask: .long SWI_CAMBIO_MASK | SWI_CAMNET_MASK
.globl _net_imask
_net_imask: .long SWI_CAMNET_MASK
.globl _soft_imask
_soft_imask: .long SWI_MASK
.globl _softnet_imask

8
sys/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.116 1998/10/22 05:58:39 bde Exp $
* $Id: isa.c,v 1.117 1998/11/29 15:42:40 phk Exp $
*/
/*
@ -404,10 +404,6 @@ isa_configure()
if (!dvp->id_driver->sensitive_hw)
config_isadev(dvp, (u_int *)NULL);
bio_imask |= SWI_CLOCK_MASK;
net_imask |= SWI_NET_MASK;
tty_imask |= SWI_TTY_MASK;
/*
* XXX we should really add the tty device to net_imask when the line is
* switched to SLIPDISC, and then remove it when it is switched away from
@ -425,8 +421,6 @@ isa_configure()
tty_imask = net_imask;
#endif
/* bio_imask |= tty_imask ; can some tty devices use buffers? */
if (bootverbose)
printf("imasks: bio %x, tty %x, net %x\n",
bio_imask, tty_imask, net_imask);