Port acpica to amd64.

Approved by:  re (amd64/* blanket)
This commit is contained in:
Peter Wemm 2003-05-31 06:47:05 +00:00
parent 151cd71608
commit ff7bf2f72e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=115428
2 changed files with 8 additions and 5 deletions

View File

@ -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);
}

View File

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