summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Gondois <Pierre.Gondois@arm.com>2021-06-01 23:04:49 +0100
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-06-02 09:57:17 +0000
commit039e07f626e3234cdd56d47f9fd024c68f135319 (patch)
treea1da9cc1b5beabc47b71e99303c3429778ee9b91
parentb5379899b38ed84561db6dc07dc4641a049ae238 (diff)
downloadedk2-039e07f626e3234cdd56d47f9fd024c68f135319.tar.gz
edk2-039e07f626e3234cdd56d47f9fd024c68f135319.tar.bz2
edk2-039e07f626e3234cdd56d47f9fd024c68f135319.zip
MdePkg/MdeModulePkg: Move AML_NAME_SEG_SIZE definition
A NameSeg is made 4 chars. Cf. ACPI 6.4 s20.2.2 "Name Objects Encoding": NameSeg := <leadnamechar namechar namechar namechar> Notice that NameSegs shorter than 4 characters are filled with trailing underscores (‘_’s). AML_NAME_SEG_SIZE is currently defined in: - DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h Since the value can be inferred from the ACPI specification and to avoid multiple definitions, move it to MdePkg/Include/IndustryStandard/ Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> Reviewed-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
-rw-r--r--MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h1
-rw-r--r--MdePkg/Include/IndustryStandard/AcpiAml.h7
2 files changed, 6 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
index 50d4c96edb..1b26729e71 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
@@ -56,7 +56,6 @@ typedef struct _EFI_AML_NODE_LIST EFI_AML_NODE_LIST;
// Size is the total size of this ACPI node buffer.
// Children is the children linked list of this node.
//
-#define AML_NAME_SEG_SIZE 4
struct _EFI_AML_NODE_LIST {
UINT32 Signature;
diff --git a/MdePkg/Include/IndustryStandard/AcpiAml.h b/MdePkg/Include/IndustryStandard/AcpiAml.h
index 74622e912e..4255ca3d70 100644
--- a/MdePkg/Include/IndustryStandard/AcpiAml.h
+++ b/MdePkg/Include/IndustryStandard/AcpiAml.h
@@ -2,7 +2,7 @@
This file contains AML code definition in the latest ACPI spec.
Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2019, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -176,4 +176,9 @@
#define AML_FIELD_CONNECTION_OP 0x02
#define AML_FIELD_EXT_ACCESS_OP 0x03
+//
+// AML Name segment definitions
+//
+#define AML_NAME_SEG_SIZE 4
+
#endif