diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2006-06-12 21:07:13 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2006-06-12 21:07:13 +0000 |
| commit | acb8c14985b436c339f8bafa0988e84533b80422 (patch) | |
| tree | da4439ea5709e5618e109faeee8993d3a0aa0ad5 /sys/isa | |
| parent | ed5c24e27da353299c3c319243f57d60cba88db0 (diff) | |
| download | src-acb8c14985b436c339f8bafa0988e84533b80422.tar.gz src-acb8c14985b436c339f8bafa0988e84533b80422.zip | |
Make the ISAPNP code optional and only enable it on i386 and pc98 (used
for CBUS-PNP cards there) by default, as there are no amd64 and sparc64
machines with ISA slots and which therefore could make use of this code
known to exist. For sparc64 this additionally allows to get rid of the
compat shims for in{b,w,l}()/out{b,w,l}() etc and the associated hacks.
OK'ed by: imp, peter
Notes
Notes:
svn path=/head/; revision=159552
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/isa_common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index f824c4d91782..72de76cb6464 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -60,6 +60,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_isa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -652,8 +654,10 @@ isa_print_all_resources(device_t dev) retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%ld"); if (device_get_flags(dev)) retval += printf(" flags %#x", device_get_flags(dev)); +#ifdef ISAPNP if (idev->id_vendorid) retval += printf(" pnpid %s", pnp_eisaformat(idev->id_vendorid)); +#endif return (retval); } @@ -1062,11 +1066,13 @@ static int isa_child_pnpinfo_str(device_t bus, device_t child, char *buf, size_t buflen) { +#ifdef ISAPNP struct isa_device *idev = DEVTOISA(child); if (idev->id_vendorid) snprintf(buf, buflen, "pnpid=%s", pnp_eisaformat(idev->id_vendorid)); +#endif return (0); } |