diff options
author | peter <peter@FreeBSD.org> | 2003-05-31 06:47:05 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2003-05-31 06:47:05 +0000 |
commit | 776ff76012e24cdf2b89b4f5104d9cf7c1b7de33 (patch) | |
tree | dc24bca9e633ed39a3c953f09a70ebf23a065e5a | |
parent | 58b7016a23eec75221f165ee0a9efbd94010b4d4 (diff) | |
download | FreeBSD-src-776ff76012e24cdf2b89b4f5104d9cf7c1b7de33.zip FreeBSD-src-776ff76012e24cdf2b89b4f5104d9cf7c1b7de33.tar.gz |
Port acpica to amd64.
Approved by: re (amd64/* blanket)
-rw-r--r-- | sys/amd64/acpica/OsdEnvironment.c | 10 | ||||
-rw-r--r-- | sys/conf/files.amd64 | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c index cd7fd64..22b19c8 100644 --- a/sys/amd64/acpica/OsdEnvironment.c +++ b/sys/amd64/acpica/OsdEnvironment.c @@ -36,9 +36,9 @@ #include "acpi.h" -u_long i386_acpi_root; +u_long amd64_acpi_root; -SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &i386_acpi_root, 0, +SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0, "The physical address of the RSDP"); ACPI_STATUS @@ -59,7 +59,7 @@ AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpPhysicalAddress) ACPI_POINTER ptr; ACPI_STATUS status; - if (i386_acpi_root == 0) { + if (amd64_acpi_root == 0) { /* * The loader passes the physical address at which it found the * RSDP in a hint. We could recover this rather than searching @@ -67,11 +67,11 @@ AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpPhysicalAddress) */ status = AcpiFindRootPointer(Flags, &ptr); if (status == AE_OK) - i386_acpi_root = ptr.Pointer.Physical; + amd64_acpi_root = ptr.Pointer.Physical; } else status = AE_OK; RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER; - RsdpPhysicalAddress->Pointer.Physical = i386_acpi_root; + RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root; return (status); } diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 8e1c68d..f80844d 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -44,6 +44,9 @@ dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc isa/atkbd_isa.c optional atkbd +amd64/acpica/OsdEnvironment.c optional acpi +amd64/acpica/acpi_machdep.c optional acpi +amd64/acpica/acpi_wakeup.c optional acpi amd64/amd64/amd64-gdbstub.c optional ddb amd64/amd64/autoconf.c standard amd64/amd64/busdma_machdep.c standard |