diff options
| author | jkh <jkh@FreeBSD.org> | 1994-11-03 04:15:04 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-11-03 04:15:04 +0000 |
| commit | 55c533176cb5611377e367c8d66c185068eb4a08 (patch) | |
| tree | a43e6c875251ec31338298e75e5e5f5ab2ca6f59 | |
| parent | 1c47156a31b0025b080324b14a54bd2a396b3f92 (diff) | |
| download | FreeBSD-src-55c533176cb5611377e367c8d66c185068eb4a08.zip FreeBSD-src-55c533176cb5611377e367c8d66c185068eb4a08.tar.gz | |
Add extra id_enabled flag for userconfig to manipulate. If id_enabled
is FALSE, the device will not be probed. id_enabled is TRUE by default.
| -rw-r--r-- | sys/amd64/isa/isa.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/isa_device.h | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 89dd774..2246826 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.34 1994/10/26 00:16:20 phk Exp $ + * $Id: isa.c,v 1.35 1994/11/01 17:26:29 ache Exp $ */ /* @@ -404,6 +404,11 @@ config_isadev_c(isdp, mp, reconfig) #ifndef ALLOW_CONFLICT_MEMADDR checkbits |= CC_MEMADDR; #endif + if (!isdp->id_enabled) { + printf("%s%d: disabled, not probed.\n", + dp->name, isdp->id_unit); + return; + } if (!reconfig && haveseen_isadev(isdp, checkbits)) return; if (!reconfig && isdp->id_maddr) { diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 89dd774..2246826 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.34 1994/10/26 00:16:20 phk Exp $ + * $Id: isa.c,v 1.35 1994/11/01 17:26:29 ache Exp $ */ /* @@ -404,6 +404,11 @@ config_isadev_c(isdp, mp, reconfig) #ifndef ALLOW_CONFLICT_MEMADDR checkbits |= CC_MEMADDR; #endif + if (!isdp->id_enabled) { + printf("%s%d: disabled, not probed.\n", + dp->name, isdp->id_unit); + return; + } if (!reconfig && haveseen_isadev(isdp, checkbits)) return; if (!reconfig && isdp->id_maddr) { diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 8c2fb0b..08a49d0 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.15 1994/10/23 21:27:27 wollman Exp $ + * $Id: isa_device.h,v 1.16 1994/10/25 23:06:16 se Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -74,6 +74,7 @@ struct isa_device { #define RI_FAST 1 /* fast interrupt handler */ u_int id_ri_flags; /* flags for register_intr() */ int id_reconfig; /* hot eject device support (such as PCMCIA) */ + int id_enabled; /* is device enabled */ }; /* |
