diff options
author | Robert Moore <Robert.Moore@intel.com> | 2019-02-22 07:17:52 -0800 |
---|---|---|
committer | Robert Moore <Robert.Moore@intel.com> | 2019-02-22 07:17:52 -0800 |
commit | 19c18d3157945d1b8b64a826f0a8e848b7dbb127 (patch) | |
tree | 504fbb62344eb8c0d948395d4299b05d08acf4dc | |
parent | 3132320003b348bcf48274d4e326e496ffc4b23b (diff) | |
download | acpica-19c18d3157945d1b8b64a826f0a8e848b7dbb127.tar.gz |
Rename nameseg copy macro for clarity
ACPI_MOVE_NAME changed to ACPI_COPY_NAMESEG
This clarifies (1) this is a copy operation, and
(2) it operates on ACPI NameSegs.
Improves understanding of the code.
-rw-r--r-- | source/common/dmrestag.c | 4 | ||||
-rw-r--r-- | source/compiler/aslcodegen.c | 6 | ||||
-rw-r--r-- | source/compiler/aslutils.c | 2 | ||||
-rw-r--r-- | source/components/namespace/nsnames.c | 2 | ||||
-rw-r--r-- | source/components/namespace/nsutils.c | 2 | ||||
-rw-r--r-- | source/components/tables/tbfind.c | 2 | ||||
-rw-r--r-- | source/components/utilities/utstring.c | 2 | ||||
-rw-r--r-- | source/include/actypes.h | 4 | ||||
-rw-r--r-- | source/os_specific/efi/osefitbl.c | 2 | ||||
-rw-r--r-- | source/os_specific/service_layers/osbsdtbl.c | 8 | ||||
-rw-r--r-- | source/os_specific/service_layers/oslinuxtbl.c | 4 | ||||
-rw-r--r-- | source/tools/acpidump/apfiles.c | 4 | ||||
-rw-r--r-- | source/tools/acpiexec/aetables.c | 10 | ||||
-rw-r--r-- | source/tools/acpinames/antables.c | 6 | ||||
-rw-r--r-- | source/tools/acpixtract/acpixtract.c | 4 |
15 files changed, 31 insertions, 31 deletions
diff --git a/source/common/dmrestag.c b/source/common/dmrestag.c index 66593206c..0faf78743 100644 --- a/source/common/dmrestag.c +++ b/source/common/dmrestag.c @@ -823,13 +823,13 @@ AcpiGetTagPathname ( * disassembled code. */ PathnameEnd = Pathname + (RequiredSize - ACPI_NAME_SIZE - 1); - ACPI_MOVE_NAME (PathnameEnd, ResourceNode->Name.Ascii); + ACPI_COPY_NAMESEG (PathnameEnd, ResourceNode->Name.Ascii); PathnameEnd += ACPI_NAME_SIZE; *PathnameEnd = '.'; PathnameEnd++; - ACPI_MOVE_NAME (PathnameEnd, Tag); + ACPI_COPY_NAMESEG (PathnameEnd, Tag); /* Internalize the namepath to AML format */ diff --git a/source/compiler/aslcodegen.c b/source/compiler/aslcodegen.c index 873f926d1..8edcb668a 100644 --- a/source/compiler/aslcodegen.c +++ b/source/compiler/aslcodegen.c @@ -556,11 +556,11 @@ CgWriteTableHeader ( */ if (AcpiGbl_CaptureComments) { - ACPI_MOVE_NAME (AcpiGbl_TableSig, Child->Asl.Value.String); + ACPI_COPY_NAMESEG (AcpiGbl_TableSig, Child->Asl.Value.String); Child->Asl.Value.String = ACPI_SIG_XXXX; } - ACPI_MOVE_NAME (AslGbl_TableHeader.Signature, Child->Asl.Value.String); + ACPI_COPY_NAMESEG (AslGbl_TableHeader.Signature, Child->Asl.Value.String); /* Revision */ @@ -593,7 +593,7 @@ CgWriteTableHeader ( /* Compiler ID */ - ACPI_MOVE_NAME (AslGbl_TableHeader.AslCompilerId, ASL_CREATOR_ID); + ACPI_COPY_NAMESEG (AslGbl_TableHeader.AslCompilerId, ASL_CREATOR_ID); /* Compiler version */ diff --git a/source/compiler/aslutils.c b/source/compiler/aslutils.c index 1fc98bb52..a32f3993c 100644 --- a/source/compiler/aslutils.c +++ b/source/compiler/aslutils.c @@ -823,7 +823,7 @@ UtAttachNameseg ( UtPadNameWithUnderscores (Name, PaddedNameSeg); } - ACPI_MOVE_NAME (Op->Asl.NameSeg, PaddedNameSeg); + ACPI_COPY_NAMESEG (Op->Asl.NameSeg, PaddedNameSeg); } diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c index 0bab2f236..90dafee81 100644 --- a/source/components/namespace/nsnames.c +++ b/source/components/namespace/nsnames.c @@ -273,7 +273,7 @@ AcpiNsHandleToName ( /* Just copy the ACPI name from the Node and zero terminate it */ NodeName = AcpiUtGetNodeName (Node); - ACPI_MOVE_NAME (Buffer->Pointer, NodeName); + ACPI_COPY_NAMESEG (Buffer->Pointer, NodeName); ((char *) Buffer->Pointer) [ACPI_NAME_SIZE] = 0; ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%4.4s\n", (char *) Buffer->Pointer)); diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c index 4a9f0313d..047339a92 100644 --- a/source/components/namespace/nsutils.c +++ b/source/components/namespace/nsutils.c @@ -721,7 +721,7 @@ AcpiNsExternalizeName ( /* Copy and validate the 4-char name segment */ - ACPI_MOVE_NAME (&(*ConvertedName)[j], + ACPI_COPY_NAMESEG (&(*ConvertedName)[j], &InternalName[NamesIndex]); AcpiUtRepairName (&(*ConvertedName)[j]); diff --git a/source/components/tables/tbfind.c b/source/components/tables/tbfind.c index 4ec53043f..98a2cffea 100644 --- a/source/components/tables/tbfind.c +++ b/source/components/tables/tbfind.c @@ -207,7 +207,7 @@ AcpiTbFindTable ( /* Normalize the input strings */ memset (&Header, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_MOVE_NAME (Header.Signature, Signature); + ACPI_COPY_NAMESEG (Header.Signature, Signature); strncpy (Header.OemId, OemId, ACPI_OEM_ID_SIZE); strncpy (Header.OemTableId, OemTableId, ACPI_OEM_TABLE_ID_SIZE); diff --git a/source/components/utilities/utstring.c b/source/components/utilities/utstring.c index 893a95745..0469d1244 100644 --- a/source/components/utilities/utstring.c +++ b/source/components/utilities/utstring.c @@ -308,7 +308,7 @@ AcpiUtRepairName ( return; } - ACPI_MOVE_NAME (&OriginalName, Name); + ACPI_COPY_NAMESEG (&OriginalName, Name); /* Check each character in the name */ diff --git a/source/include/actypes.h b/source/include/actypes.h index 2a65ee8f5..952c9428f 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h @@ -667,10 +667,10 @@ typedef UINT64 ACPI_INTEGER; #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED #define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR (UINT32, (b))) -#define ACPI_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) +#define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) #else #define ACPI_COMPARE_NAME(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE)) -#define ACPI_MOVE_NAME(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) +#define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) #endif /* Support for the special RSDP signature (8 characters) */ diff --git a/source/os_specific/efi/osefitbl.c b/source/os_specific/efi/osefitbl.c index 1974899a7..4c205b398 100644 --- a/source/os_specific/efi/osefitbl.c +++ b/source/os_specific/efi/osefitbl.c @@ -378,7 +378,7 @@ OslAddTableToList ( return (AE_NO_MEMORY); } - ACPI_MOVE_NAME (NewInfo->Signature, Signature); + ACPI_COPY_NAMESEG (NewInfo->Signature, Signature); if (!Gbl_TableListHead) { diff --git a/source/os_specific/service_layers/osbsdtbl.c b/source/os_specific/service_layers/osbsdtbl.c index 0f112781e..88b8bb573 100644 --- a/source/os_specific/service_layers/osbsdtbl.c +++ b/source/os_specific/service_layers/osbsdtbl.c @@ -862,18 +862,18 @@ OslAddTablesToList( case 1: - ACPI_MOVE_NAME (NewInfo->Signature, + ACPI_COPY_NAMESEG (NewInfo->Signature, Gbl_Revision ? ACPI_SIG_XSDT : ACPI_SIG_RSDT); break; case 2: - ACPI_MOVE_NAME (NewInfo->Signature, ACPI_SIG_FACS); + ACPI_COPY_NAMESEG (NewInfo->Signature, ACPI_SIG_FACS); break; default: - ACPI_MOVE_NAME (NewInfo->Signature, ACPI_SIG_DSDT); + ACPI_COPY_NAMESEG (NewInfo->Signature, ACPI_SIG_DSDT); } @@ -932,7 +932,7 @@ OslAddTablesToList( return (AE_NO_MEMORY); } - ACPI_MOVE_NAME (NewInfo->Signature, Table->Signature); + ACPI_COPY_NAMESEG (NewInfo->Signature, Table->Signature); AcpiOsUnmapMemory (Table, sizeof (*Table)); diff --git a/source/os_specific/service_layers/oslinuxtbl.c b/source/os_specific/service_layers/oslinuxtbl.c index 254a7746d..b28f3fb61 100644 --- a/source/os_specific/service_layers/oslinuxtbl.c +++ b/source/os_specific/service_layers/oslinuxtbl.c @@ -484,7 +484,7 @@ OslAddTableToList ( return (AE_NO_MEMORY); } - ACPI_MOVE_NAME (NewInfo->Signature, Signature); + ACPI_COPY_NAMESEG (NewInfo->Signature, Signature); if (!Gbl_TableListHead) { @@ -1479,7 +1479,7 @@ OslTableNameFromFile ( /* Extract signature */ - ACPI_MOVE_NAME (Signature, Filename); + ACPI_COPY_NAMESEG (Signature, Filename); return (AE_OK); } diff --git a/source/tools/acpidump/apfiles.c b/source/tools/acpidump/apfiles.c index 0010ca6fb..b93a64329 100644 --- a/source/tools/acpidump/apfiles.c +++ b/source/tools/acpidump/apfiles.c @@ -272,11 +272,11 @@ ApWriteToBinaryFile ( if (ACPI_VALIDATE_RSDP_SIG (Table->Signature)) { - ACPI_MOVE_NAME (Filename, ACPI_RSDP_NAME); + ACPI_COPY_NAMESEG (Filename, ACPI_RSDP_NAME); } else { - ACPI_MOVE_NAME (Filename, Table->Signature); + ACPI_COPY_NAMESEG (Filename, Table->Signature); } Filename[0] = (char) tolower ((int) Filename[0]); diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c index de51b210d..eee9a78eb 100644 --- a/source/tools/acpiexec/aetables.c +++ b/source/tools/acpiexec/aetables.c @@ -255,13 +255,13 @@ AeInitializeTableHeader ( 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 */ @@ -531,7 +531,7 @@ AeBuildLocalTables ( /* 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; @@ -545,7 +545,7 @@ AeBuildLocalTables ( * ACPICA core ignores it */ memset (&LocalTEST, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_MOVE_NAME (LocalTEST.Signature, "TEST"); + ACPI_COPY_NAMESEG (LocalTEST.Signature, "TEST"); LocalTEST.Revision = 1; LocalTEST.Length = sizeof (ACPI_TABLE_HEADER); @@ -559,7 +559,7 @@ AeBuildLocalTables ( * sure that the ACPICA core ignores it */ memset (&LocalBADTABLE, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_MOVE_NAME (LocalBADTABLE.Signature, "BAD!"); + ACPI_COPY_NAMESEG (LocalBADTABLE.Signature, "BAD!"); LocalBADTABLE.Revision = 1; LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER); diff --git a/source/tools/acpinames/antables.c b/source/tools/acpinames/antables.c index 911a2cc5c..9a2617a1d 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 */ @@ -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; diff --git a/source/tools/acpixtract/acpixtract.c b/source/tools/acpixtract/acpixtract.c index 75e3382ae..352de829d 100644 --- a/source/tools/acpixtract/acpixtract.c +++ b/source/tools/acpixtract/acpixtract.c @@ -262,7 +262,7 @@ AxExtractTables ( continue; } - ACPI_MOVE_NAME (ThisSignature, Gbl_LineBuffer); + ACPI_COPY_NAMESEG (ThisSignature, Gbl_LineBuffer); if (Signature) { /* Ignore signatures that don't match */ @@ -466,7 +466,7 @@ AxExtractToMultiAmlFile ( continue; } - ACPI_MOVE_NAME (ThisSignature, Gbl_LineBuffer); + ACPI_COPY_NAMESEG (ThisSignature, Gbl_LineBuffer); /* Only want DSDT and SSDTs */ |