diff options
| author | avg <avg@FreeBSD.org> | 2009-11-07 11:46:38 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2009-11-07 11:46:38 +0000 |
| commit | 267e9d600c17502bb5a3430fc3e21538dad30ece (patch) | |
| tree | d6218aa9c94496b63774fe5285d0656daa2020d6 /sys/dev/acpica/acpivar.h | |
| parent | 00f6dd9619458ca98fbfc8c8ae54dddc80c21e62 (diff) | |
| download | FreeBSD-src-267e9d600c17502bb5a3430fc3e21538dad30ece.zip FreeBSD-src-267e9d600c17502bb5a3430fc3e21538dad30ece.tar.gz | |
acpi: remove 'magic' ivar
o acpi_hpet: auto-added 'wildcard' devices can be identified by
non-NULL handle attribute.
o acpi_ec: auto-add 'wildcard' devices can be identified by
unset (NULL) private attribute.
o acpi_cpu: use private instead of magic to store cpu id.
Reviewed by: jhb
Silence from: acpi@
MFC after: 2 weeks
X-MFC-Note: perhaps the ivar should stay for ABI stability
Diffstat (limited to 'sys/dev/acpica/acpivar.h')
| -rw-r--r-- | sys/dev/acpica/acpivar.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index f4d27e4..abfaa8b 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -88,7 +88,6 @@ struct acpi_softc { struct acpi_device { /* ACPI ivars */ ACPI_HANDLE ad_handle; - uintptr_t ad_magic; void *ad_private; int ad_flags; @@ -224,7 +223,7 @@ extern int acpi_quirks; * attach to ACPI. */ #define ACPI_IVAR_HANDLE 0x100 -#define ACPI_IVAR_MAGIC 0x101 +#define ACPI_IVAR_UNUSED 0x101 /* Unused/reserved. */ #define ACPI_IVAR_PRIVATE 0x102 #define ACPI_IVAR_FLAGS 0x103 @@ -250,7 +249,6 @@ static __inline void varp ## _set_ ## var(device_t dev, type t) \ } __ACPI_BUS_ACCESSOR(acpi, handle, ACPI, HANDLE, ACPI_HANDLE) -__ACPI_BUS_ACCESSOR(acpi, magic, ACPI, MAGIC, uintptr_t) __ACPI_BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *) __ACPI_BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int) |
