From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4825.1622585100070457894 for ; Tue, 01 Jun 2021 15:05:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AAD381042; Tue, 1 Jun 2021 15:04:59 -0700 (PDT) Received: from e120189.arm.com (unknown [10.57.3.149]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4D72B3F774; Tue, 1 Jun 2021 15:04:58 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, dandan.bi@intel.com, gaoliming@byosoft.com.cn, michael.d.kinney@intel.com, Sami.Mujawar@arm.com, Alexei.Fedorov@arm.com Subject: [PATCH v1 1/2] MdePkg/MdeModulePkg: Move AML_NAME_SEG_SIZE definition Date: Tue, 1 Jun 2021 23:04:49 +0100 Message-Id: <20210601220450.28003-2-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210601220450.28003-1-Pierre.Gondois@arm.com> References: <20210601220450.28003-1-Pierre.Gondois@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable From: Pierre Gondois A NameSeg is made 4 chars. Cf. ACPI 6.4 s20.2.2 "Name Objects Encoding": NameSeg :=3D Notice that NameSegs shorter than 4 characters are filled with trailing underscores (=E2=80=98_=E2=80=99s). 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 --- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h | 1 - MdePkg/Include/IndustryStandard/AcpiAml.h | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/MdeModu= lePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h index 50d4c96edb63..1b26729e71c3 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 =20 struct _EFI_AML_NODE_LIST { UINT32 Signature; diff --git a/MdePkg/Include/IndustryStandard/AcpiAml.h b/MdePkg/Include/I= ndustryStandard/AcpiAml.h index 74622e912ea4..4255ca3d7087 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. =20 Copyright (c) 2011, Intel Corporation. All rights reserved.
- Copyright (c) 2019, ARM Limited. All rights reserved.
+ Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -176,4 +176,9 @@ #define AML_FIELD_CONNECTION_OP 0x02 #define AML_FIELD_EXT_ACCESS_OP 0x03 =20 +// +// AML Name segment definitions +// +#define AML_NAME_SEG_SIZE 4 + #endif --=20 2.17.1