summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/isa.c
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-11-21 18:14:02 +0000
committerbde <bde@FreeBSD.org>1997-11-21 18:14:02 +0000
commit63e63c0d0019d60593eb0edbfaff536899cc11e0 (patch)
tree4a2e84702068165e93f17ee3754076b2ba611565 /sys/i386/isa/isa.c
parent60fadeeab4fe79ffac175341f33e5d1b4d016f37 (diff)
downloadFreeBSD-src-63e63c0d0019d60593eb0edbfaff536899cc11e0.zip
FreeBSD-src-63e63c0d0019d60593eb0edbfaff536899cc11e0.tar.gz
Moved splhigh()/spl0() calls from isa_configure() to configure() so that
there is a natural place to initialize `safepri' in a future commit. Spinoffs: - spl0() gets called in the unlikely event that isa is not configured. - configure() has better control over enabling interrupts. - it is now less unclear that interrupts aren't actually enabled early. Rev.1.48 of autoconf.c seems to have done the opposite of what was intended - moving the isa_configure() call delayed the spl0() side effect. Added some comments about the bogons. Removed the splhigh() call since it is a no-op.
Diffstat (limited to 'sys/i386/isa/isa.c')
-rw-r--r--sys/i386/isa/isa.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 55e39c3..ddbf625 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.105 1997/09/21 21:41:18 gibbs Exp $
+ * $Id: isa.c,v 1.106 1997/10/12 08:31:41 jkh Exp $
*/
/*
@@ -351,7 +351,6 @@ void
isa_configure() {
struct isa_device *dvp;
- splhigh();
printf("Probing for devices on the ISA bus:\n");
/* First probe all the sensitive probes */
for (dvp = isa_devtab_tty; dvp->id_driver; dvp++)
@@ -431,7 +430,6 @@ isa_configure() {
register_imask(dvp, cam_imask);
for (dvp = isa_devtab_null; dvp->id_driver; dvp++)
register_imask(dvp, SWI_CLOCK_MASK);
- spl0();
}
/*
OpenPOWER on IntegriCloud