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

Synchronize with sys/i386/isa/isa.c revision 1.102.

Browse Source
This commit is contained in:
kato 1997-08-26 15:08:52 +00:00
parent 296745d84b
commit cc4767c96f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/pc98/pc98/pc98.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: pc98.c,v 1.37 1997/08/13 11:00:49 kato Exp $
* $Id: pc98.c,v 1.38 1997/08/21 08:24:19 kato Exp $
*/
/*
@ -141,10 +141,14 @@ haveseen(dvp, tmpdvp, checkbits)
u_int checkbits;
{
/*
* Only check against devices that have already been found and are not
* unilaterally allowed to conflict anyway.
* Ignore all conflicts except IRQ ones if conflicts are allowed.
*/
if (tmpdvp->id_alive && !dvp->id_conflicts) {
if (dvp->id_conflicts)
checkbits &= ~(CC_DRQ | CC_IOADDR | CC_MEMADDR);
/*
* Only check against devices that have already been found.
*/
if (tmpdvp->id_alive) {
char const *whatnot;
whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
@ -531,9 +535,8 @@ config_isadev_c(isdp, mp, reconfig)
* a check for IRQs in the next group of checks.
*/
checkbits |= CC_IRQ;
if (haveseen_isadev(isdp, checkbits)) {
if (haveseen_isadev(isdp, checkbits))
return;
}
isdp->id_alive = id_alive;
}
(*dp->attach)(isdp);
@ -1058,4 +1061,3 @@ struct isa_device *find_isadev(table, driverp, unit)
return (table);
}