summaryrefslogtreecommitdiff
path: root/source/tools/acpinames/antables.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools/acpinames/antables.c')
-rw-r--r--source/tools/acpinames/antables.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/tools/acpinames/antables.c b/source/tools/acpinames/antables.c
index 911a2cc5c267..289948f68a07 100644
--- a/source/tools/acpinames/antables.c
+++ b/source/tools/acpinames/antables.c
@@ -206,13 +206,13 @@ AnInitializeTableHeader (
UINT32 Length)
{
- ACPI_MOVE_NAME (Header->Signature, Signature);
+ ACPI_COPY_NAMESEG (Header->Signature, Signature);
Header->Length = Length;
Header->OemRevision = 0x1001;
memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE);
memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
- ACPI_MOVE_NAME (Header->AslCompilerId, "INTL");
+ ACPI_COPY_NAMESEG (Header->AslCompilerId, "INTL");
Header->AslCompilerRevision = ACPI_CA_VERSION;
/* Set the checksum, must set to zero first */
@@ -257,8 +257,8 @@ AnBuildLocalTables (
NextTable = TableList;
while (NextTable)
{
- if (!ACPI_COMPARE_NAME (NextTable->Table->Signature, ACPI_SIG_DSDT) &&
- !ACPI_COMPARE_NAME (NextTable->Table->Signature, ACPI_SIG_FADT))
+ if (!ACPI_COMPARE_NAMESEG (NextTable->Table->Signature, ACPI_SIG_DSDT) &&
+ !ACPI_COMPARE_NAMESEG (NextTable->Table->Signature, ACPI_SIG_FADT))
{
TableCount++;
}
@@ -294,7 +294,7 @@ AnBuildLocalTables (
* Incoming DSDT or FADT are special cases. All other tables are
* just immediately installed into the XSDT.
*/
- if (ACPI_COMPARE_NAME (NextTable->Table->Signature, ACPI_SIG_DSDT))
+ if (ACPI_COMPARE_NAMESEG (NextTable->Table->Signature, ACPI_SIG_DSDT))
{
if (DsdtAddress)
{
@@ -306,7 +306,7 @@ AnBuildLocalTables (
DsdtAddress = ACPI_PTR_TO_PHYSADDR (NextTable->Table);
}
- else if (ACPI_COMPARE_NAME (NextTable->Table->Signature, ACPI_SIG_FADT))
+ else if (ACPI_COMPARE_NAMESEG (NextTable->Table->Signature, ACPI_SIG_FADT))
{
ExternalFadt =
ACPI_CAST_PTR (ACPI_TABLE_FADT, NextTable->Table);
@@ -434,7 +434,7 @@ AnBuildLocalTables (
/* Build a FACS */
memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
- ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS);
+ ACPI_COPY_NAMESEG (LocalFACS.Signature, ACPI_SIG_FACS);
LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
LocalFACS.GlobalLock = 0x11AA0011;