diff options
| author | Pierre Gondois <Pierre.Gondois@arm.com> | 2021-06-01 23:04:50 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-06-02 09:57:17 +0000 |
| commit | 1f515342d8d83ef0fff0c3f4ac67232dd8c97565 (patch) | |
| tree | 8d71153e8186e4dd1d4e4b3c9ae3ee8ba76e5e39 | |
| parent | 039e07f626e3234cdd56d47f9fd024c68f135319 (diff) | |
| download | edk2-1f515342d8d83ef0fff0c3f4ac67232dd8c97565.tar.gz edk2-1f515342d8d83ef0fff0c3f4ac67232dd8c97565.tar.bz2 edk2-1f515342d8d83ef0fff0c3f4ac67232dd8c97565.zip | |
DynamicTablesPkg: Use AML_NAME_SEG_SIZE define
Use the newly introduced defined value in:
MdePkg/Include/IndustryStandard/AcpiAml.h
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
3 files changed, 5 insertions, 12 deletions
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c index 97a5c55fa3..1e8c2bfca5 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c @@ -1,7 +1,7 @@ /** @file
SSDT CMN-600 AML Table Generator.
- Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
+ Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -511,7 +511,7 @@ BuildSsdtCmn600TableEx ( UINT64 Index;
CM_ARM_CMN_600_INFO * Cmn600Info;
UINT32 Cmn600Count;
- CHAR8 NewName[5];
+ CHAR8 NewName[AML_NAME_SEG_SIZE + 1];
EFI_ACPI_DESCRIPTION_HEADER ** TableList;
ASSERT (This != NULL);
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c index 6a1e7487df..570f53aacf 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c @@ -1,7 +1,7 @@ /** @file
SSDT Serial Port Table Generator.
- Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
+ Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -171,7 +171,7 @@ BuildSsdtSerialPortTableEx ( CM_ARM_SERIAL_PORT_INFO * SerialPortInfo;
UINT32 SerialPortCount;
UINTN Index;
- CHAR8 NewName[5];
+ CHAR8 NewName[AML_NAME_SEG_SIZE + 1];
UINT64 Uid;
EFI_ACPI_DESCRIPTION_HEADER ** TableList;
diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h b/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h index cbae14d788..fff99e644b 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h @@ -1,7 +1,7 @@ /** @file
AML Defines.
- Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
+ Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -138,13 +138,6 @@ typedef enum EAmlParseIndex { */
#define AML_FIELD_NAMED_OP 0x04
-/** Size of a NameSeg.
- Cf. ACPI 6.3 specification, s20.2.
-
- @ingroup TreeStructures
-*/
- #define AML_NAME_SEG_SIZE 4U
-
/** AML object types.
The ACPI specification defines several object types. They are listed
|