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

Skip probing devices which have already probed true.

Browse Source
This commit is contained in:
eivind 1998-01-31 03:29:00 +00:00
parent 6a06ff15fe
commit e6eb2c07dc
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/amd64/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.107 1997/11/21 18:13:58 bde Exp $
* $Id: isa.c,v 1.108 1997/11/30 09:44:28 jmg Exp $
*/
/*
@ -137,6 +137,18 @@ haveseen(dvp, tmpdvp, checkbits)
if (tmpdvp->id_alive) {
char const *whatnot;
/*
* Check for device driver & unit conflict; just drop probing
* a device which has already probed true. This is usually
* not strictly a conflict, but rather the case of somebody
* having specified several mutually exclusive configurations
* for a single device.
*/
if (tmpdvp->id_driver == dvp->id_driver &&
tmpdvp->id_unit == dvp->id_unit) {
return 1;
}
whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
/*
* Check for I/O address conflict. We can only check the

14
sys/i386/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.107 1997/11/21 18:13:58 bde Exp $
* $Id: isa.c,v 1.108 1997/11/30 09:44:28 jmg Exp $
*/
/*
@ -137,6 +137,18 @@ haveseen(dvp, tmpdvp, checkbits)
if (tmpdvp->id_alive) {
char const *whatnot;
/*
* Check for device driver & unit conflict; just drop probing
* a device which has already probed true. This is usually
* not strictly a conflict, but rather the case of somebody
* having specified several mutually exclusive configurations
* for a single device.
*/
if (tmpdvp->id_driver == dvp->id_driver &&
tmpdvp->id_unit == dvp->id_unit) {
return 1;
}
whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
/*
* Check for I/O address conflict. We can only check the