diff options
| author | Nate Lawson <njl@FreeBSD.org> | 2004-02-19 18:20:03 +0000 |
|---|---|---|
| committer | Nate Lawson <njl@FreeBSD.org> | 2004-02-19 18:20:03 +0000 |
| commit | abcbc5bc601e02b23658eec4d2250722e2b92ea3 (patch) | |
| tree | 6b98f7d986af4a98a3a3498b6f110e0684ad6fb1 /sys/dev | |
| parent | bb949efb953c5b9e9e79e58157915505c4504f66 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpica/acpi.c | 6 | ||||
| -rw-r--r-- | sys/dev/acpica/acpivar.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index ea6e6b95bab54..a92659a34674b 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1413,7 +1413,7 @@ acpi_FindIndexedResource(ACPI_BUFFER *buf, int index, ACPI_RESOURCE **resp) /* Check for terminator */ if (rp->Id == ACPI_RSTYPE_END_TAG || rp->Length == 0) return (AE_NOT_FOUND); - rp = ACPI_RESOURCE_NEXT(rp); + rp = ACPI_NEXT_RESOURCE(rp); } if (resp != NULL) *resp = rp; @@ -1461,7 +1461,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *buf, ACPI_RESOURCE *res) return (AE_BAD_PARAMETER); if (rp->Id == ACPI_RSTYPE_END_TAG || rp->Length == 0) break; - rp = ACPI_RESOURCE_NEXT(rp); + rp = ACPI_NEXT_RESOURCE(rp); } /* @@ -1492,7 +1492,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *buf, ACPI_RESOURCE *res) bcopy(res, rp, res->Length + ACPI_RESOURCE_LENGTH_NO_DATA); /* And add the terminator. */ - rp = ACPI_RESOURCE_NEXT(rp); + rp = ACPI_NEXT_RESOURCE(rp); rp->Id = ACPI_RSTYPE_END_TAG; rp->Length = 0; diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 4b64b07f59062..a94ce7be964b7 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -221,8 +221,6 @@ struct acpi_parse_resource_set { extern struct acpi_parse_resource_set acpi_res_parse_set; extern ACPI_STATUS acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resource_set *set); -/* XXX until Intel fix this in their headers, based on NEXT_RESOURCE */ -#define ACPI_RESOURCE_NEXT(Res) (ACPI_RESOURCE *)((UINT8 *)Res + Res->Length) /* ACPI event handling */ extern UINT32 acpi_event_power_button_sleep(void *context); |