diff options
| author | dfr <dfr@FreeBSD.org> | 1999-05-30 11:04:31 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-05-30 11:04:31 +0000 |
| commit | 21de0868b388c77b5b32d95804e6b3375166e33f (patch) | |
| tree | e2fdc15a43f9447ac08780dbaa7ee42ac59fa7aa /sys/i386/isa/isa_compat.c | |
| parent | cc731817af228c4449d79e2623c712c5c1f95603 (diff) | |
| download | FreeBSD-src-21de0868b388c77b5b32d95804e6b3375166e33f.zip FreeBSD-src-21de0868b388c77b5b32d95804e6b3375166e33f.tar.gz | |
* Use ISA_DELETE_RESOURCE to cancel memory resource if driver clears maddr.
* Don't allow new-style isapnp devices through the compat interfaces.
Diffstat (limited to 'sys/i386/isa/isa_compat.c')
| -rw-r--r-- | sys/i386/isa/isa_compat.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c index c5dfd42..28b43bf 100644 --- a/sys/i386/isa/isa_compat.c +++ b/sys/i386/isa/isa_compat.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa_compat.c,v 1.10 1999/05/22 15:18:12 dfr Exp $ + * $Id: isa_compat.c,v 1.11 1999/05/24 18:50:41 dfr Exp $ */ #include <sys/param.h> @@ -150,6 +150,10 @@ isa_compat_probe(device_t dev) struct old_isa_driver *op; u_long start, count; + /* No pnp support */ + if (isa_get_vendorid(dev)) + return (ENXIO); + bzero(&res, sizeof(res)); /* * Fill in the isa_device fields. @@ -222,9 +226,9 @@ isa_compat_probe(device_t dev) kvtop(maddr), dvp->id_msize); else - ISA_SET_RESOURCE(parent, dev, - SYS_RES_MEMORY, - 0, 0, 0); + ISA_DELETE_RESOURCE(parent, dev, + SYS_RES_MEMORY, + 0); } return 0; } |
