d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include isa/pnpvar.h and remove a duplicate copy of PNP_EISAID.

Browse Source
This commit is contained in:
njl 2004-06-29 01:33:35 +00:00
parent bd2a2aff39
commit 348466ddef
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/acpica/acpi.c
View File

@ -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)
{