talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have Eisa and PCI probes occur before ISA probes. Buslogic EISA and PCI cards 

can be found in ISA compatibility mode by the ISA driver, but since the
EISA and PCI probes are non-invasive, we prefer them to find the card first.
Since both EISA and PCI probes can rely on interrupts, enable them before
probing of any type is performed.  All ISA probes are still "protected" by
splhigh().
This commit is contained in:
Justin T. Gibbs 1995-12-12 08:50:15 +00:00
parent 8313579d97
commit ab8f0fa54c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.46 1995/12/07 20:31:02 peter Exp $
* $Id: autoconf.c,v 1.47 1995/12/10 13:36:24 phk Exp $
*/
/*
@ -59,6 +59,7 @@
#include <machine/cons.h>
#include <machine/md_var.h>
#include <machine/pte.h>
#include <i386/isa/icu.h> /* For interrupts */
#include "isa.h"
#if NISA > 0
@ -171,15 +172,15 @@ configure(dummy)
configure_start();
/* Allow all routines to decide for themselves if they want intrs */
enable_intr();
INTREN(IRQ_SLAVE);
#if NCRD > 0
/* Before isa_configure to avoid ISA drivers finding our cards */
pccard_configure();
#endif
#if NISA > 0
isa_configure();
#endif
#if NEISA > 0
eisa_configure();
#endif
@ -188,6 +189,10 @@ configure(dummy)
pci_configure();
#endif
#if NISA > 0
isa_configure();
#endif
configure_finish();
cninit_finish();

15
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.46 1995/12/07 20:31:02 peter Exp $
* $Id: autoconf.c,v 1.47 1995/12/10 13:36:24 phk Exp $
*/
/*
@ -59,6 +59,7 @@
#include <machine/cons.h>
#include <machine/md_var.h>
#include <machine/pte.h>
#include <i386/isa/icu.h> /* For interrupts */
#include "isa.h"
#if NISA > 0
@ -171,15 +172,15 @@ configure(dummy)
configure_start();
/* Allow all routines to decide for themselves if they want intrs */
enable_intr();
INTREN(IRQ_SLAVE);
#if NCRD > 0
/* Before isa_configure to avoid ISA drivers finding our cards */
pccard_configure();
#endif
#if NISA > 0
isa_configure();
#endif
#if NEISA > 0
eisa_configure();
#endif
@ -188,6 +189,10 @@ configure(dummy)
pci_configure();
#endif
#if NISA > 0
isa_configure();
#endif
configure_finish();
cninit_finish();