diff options
| author | njl <njl@FreeBSD.org> | 2004-06-29 01:33:35 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2004-06-29 01:33:35 +0000 |
| commit | 348466ddef9897fd09915a421127252c9507072e (patch) | |
| tree | fd8f0a6ddd728be23285070eb3e5c0a89de71a6e /sys/dev/acpica | |
| parent | bd2a2aff397a5df81c5e8074164fd897ba252411 (diff) | |
| download | FreeBSD-src-348466ddef9897fd09915a421127252c9507072e.zip FreeBSD-src-348466ddef9897fd09915a421127252c9507072e.tar.gz | |
Include isa/pnpvar.h and remove a duplicate copy of PNP_EISAID.
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/acpi.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 93bed57..16aa839 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -52,6 +52,7 @@ #include <machine/bus.h> #include <sys/rman.h> #include <isa/isavar.h> +#include <isa/pnpvar.h> #include "acpi.h" #include <dev/acpica/acpivar.h> @@ -969,19 +970,7 @@ acpi_bus_alloc_gas(device_t dev, int *rid, ACPI_GENERIC_ADDRESS *gas) return (bus_alloc_resource_any(dev, type, rid, RF_ACTIVE)); } -/* - * Handle ISA-like devices probing for a PnP ID to match. - */ -#define PNP_EISAID(s) \ - ((((s[0] - '@') & 0x1f) << 2) \ - | (((s[1] - '@') & 0x18) >> 3) \ - | (((s[1] - '@') & 0x07) << 13) \ - | (((s[2] - '@') & 0x1f) << 8) \ - | (PNP_HEXTONUM(s[4]) << 16) \ - | (PNP_HEXTONUM(s[3]) << 20) \ - | (PNP_HEXTONUM(s[6]) << 24) \ - | (PNP_HEXTONUM(s[5]) << 28)) - +/* Probe _HID and _CID for compatible ISA PNP ids. */ static uint32_t acpi_isa_get_logicalid(device_t dev) { |
