diff options
| author | peter <peter@FreeBSD.org> | 1999-05-08 18:15:49 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-05-08 18:15:49 +0000 |
| commit | efc7518c771fd43194b4fe00658b4544b429a678 (patch) | |
| tree | 2e725488794dae023a3e9c7fcdbdcb5079c510c0 /sys/i386/isa/isa.c | |
| parent | ac83c868181ad1b10841349ec46d24600ae0bc06 (diff) | |
| download | FreeBSD-src-efc7518c771fd43194b4fe00658b4544b429a678.zip FreeBSD-src-efc7518c771fd43194b4fe00658b4544b429a678.tar.gz | |
Look up the sensitive flag better, allowing interoperation between old and
new isa drivers with sensitive flags. If the resource_find() code
is meant to "find" the wildcard sensitive flag for a driver even though
a unit is supplied, this can be simplified.
Diffstat (limited to 'sys/i386/isa/isa.c')
| -rw-r--r-- | sys/i386/isa/isa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 3547800..caa6fc9 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa.c,v 1.121 1999/04/24 06:47:24 peter Exp $ + * $Id: isa.c,v 1.122 1999/04/24 18:24:43 kato Exp $ */ /* @@ -100,8 +100,10 @@ isa_add_device(device_t dev, const char *name, int unit) int sensitive, t; static device_t last_sensitive; + /* device-specific flag overrides any wildcard */ + sensitive = 0; if (resource_int_value(name, unit, "sensitive", &sensitive) != 0) - sensitive = 0; + resource_int_value(name, -1, "sensitive", &sensitive); idev = malloc(sizeof(struct isa_device), M_ISADEV, M_NOWAIT); if (!idev) |
