Don't lower spl before calling main. For now, do it right before

calling hilinit().  Eventually, would like to enable them only after
autoconfiguration is finished.
This commit is contained in:
thorpej 1996-10-05 07:06:11 +00:00
parent d2be4a69c2
commit 2f9a90e967
2 changed files with 13 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.21 1996/08/18 17:01:53 hpeyerl Exp $ */
/* $NetBSD: autoconf.c,v 1.22 1996/10/05 07:06:13 thorpej Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe. All rights reserved.
@ -111,12 +111,20 @@ configure()
*/
find_devs();
/* Initialize the interrupt system. */
isrinit();
/*
* XXX Enable interrupts. We have to do this now so that the
* XXX HIL configures.
*/
(void)spl0();
/*
* XXX: these should be consolidated into some kind of table
*/
hilsoftinit(0, HILADDR);
hilinit(0, HILADDR);
isrinit();
dmainit();
/*
@ -140,6 +148,8 @@ configure()
}
}
/* XXX Should enable interrupts here. */
#if GENERIC
if ((boothowto & RB_ASKNAME) == 0)
setroot();

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.55 1996/09/11 00:29:28 thorpej Exp $ */
/* $NetBSD: locore.s,v 1.56 1996/10/05 07:06:11 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -989,7 +989,6 @@ Lnocache0:
movc d0,vbr
jbsr _isrinit | be ready for stray ints
jbsr _hp300_calibrate_delay | calibrate delay
movw #PSL_LOWIPL,sr | lower SPL
movl d7,_boothowto | save reboot flags
movl d6,_bootdev | and boot device