diff options
| author | peter <peter@FreeBSD.org> | 1999-04-11 15:51:15 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-04-11 15:51:15 +0000 |
| commit | 9511f667913f4aca79c6f9480b062a7582af2d68 (patch) | |
| tree | 6eea1a4b0cdc10936cce99ab9b63cee838a7e53d | |
| parent | 01b92c3fc2b500c63f5b45f4c1692f56c99f9919 (diff) | |
| download | FreeBSD-src-9511f667913f4aca79c6f9480b062a7582af2d68.zip FreeBSD-src-9511f667913f4aca79c6f9480b062a7582af2d68.tar.gz | |
Move initialization of SWI's in the tty|net|bio masks from isa.c into
the static initializers in ipl.s.
| -rw-r--r-- | sys/amd64/isa/isa.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/ipl.s | 10 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 8 |
3 files changed, 7 insertions, 19 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 177024d..1e91da8 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -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); diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s index 836ac48..9863617 100644 --- a/sys/i386/isa/ipl.s +++ b/sys/i386/isa/ipl.s @@ -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 diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 177024d..1e91da8 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -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); |
