diff options
author | dfr <dfr@FreeBSD.org> | 1999-04-18 15:10:58 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 1999-04-18 15:10:58 +0000 |
commit | 58dd4aa09241236519480cd97d5a5db1a175f261 (patch) | |
tree | e9812bb5096deadd84b1030b8437b0e5c04795c9 /sys/i386 | |
parent | 6b69df13a813066197b2439adba31c602f84361b (diff) | |
download | FreeBSD-src-58dd4aa09241236519480cd97d5a5db1a175f261.zip FreeBSD-src-58dd4aa09241236519480cd97d5a5db1a175f261.tar.gz |
Add support for 'disabled' probe hint.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/apm/apm.c | 8 | ||||
-rw-r--r-- | sys/i386/bios/apm.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 359e99e..3de9481 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.77 1998/12/10 23:36:14 msmith Exp $ + * $Id: apm.c,v 1.78 1999/04/16 21:22:05 peter Exp $ */ #include "opt_devfs.h" @@ -648,7 +648,11 @@ apm_probe(device_t dev) struct vm86frame vmf; int i; #endif - int flags; + int disabled, flags; + + if (resource_int_value("apm", 0, "disabled", &disabled) == 0 + && disabled != 0) + return ENXIO; device_set_desc(dev, "APM BIOS"); diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 359e99e..3de9481 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.77 1998/12/10 23:36:14 msmith Exp $ + * $Id: apm.c,v 1.78 1999/04/16 21:22:05 peter Exp $ */ #include "opt_devfs.h" @@ -648,7 +648,11 @@ apm_probe(device_t dev) struct vm86frame vmf; int i; #endif - int flags; + int disabled, flags; + + if (resource_int_value("apm", 0, "disabled", &disabled) == 0 + && disabled != 0) + return ENXIO; device_set_desc(dev, "APM BIOS"); |