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>

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c
index 97a5c55fa3f60b6885862a76223994ab5c3daa26..1e8c2bfca5de01a1e013b896e59c5a2fa5a94d9e 100644 (file)
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c
@@ -1,7 +1,7 @@
 /** @file\r
   SSDT CMN-600 AML Table Generator.\r
 \r
 /** @file\r
   SSDT CMN-600 AML Table Generator.\r
 \r

-  Copyright (c) 2020, Arm Limited. All rights reserved.<BR>\r
+  Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>\r

 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r


@@ -511,7 +511,7 @@ BuildSsdtCmn600TableEx (
   UINT64                            Index;\r
   CM_ARM_CMN_600_INFO             * Cmn600Info;\r
   UINT32                            Cmn600Count;\r
   UINT64                            Index;\r
   CM_ARM_CMN_600_INFO             * Cmn600Info;\r
   UINT32                            Cmn600Count;\r

-  CHAR8                             NewName[5];\r
+  CHAR8                             NewName[AML_NAME_SEG_SIZE + 1];\r

   EFI_ACPI_DESCRIPTION_HEADER    ** TableList;\r
 \r
   ASSERT (This != NULL);\r
   EFI_ACPI_DESCRIPTION_HEADER    ** TableList;\r
 \r
   ASSERT (This != NULL);\r

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c
index 6a1e7487dfaf4ceb2e074e52cef2fc30bfce7152..570f53aacf16a0d6fe172b68feaf2101dd847f99 100644 (file)
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c
@@ -1,7 +1,7 @@
 /** @file\r
   SSDT Serial Port Table Generator.\r
 \r
 /** @file\r
   SSDT Serial Port Table Generator.\r
 \r

-  Copyright (c) 2020, Arm Limited. All rights reserved.<BR>\r
+  Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>\r

 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r


@@ -171,7 +171,7 @@ BuildSsdtSerialPortTableEx (
   CM_ARM_SERIAL_PORT_INFO       * SerialPortInfo;\r
   UINT32                          SerialPortCount;\r
   UINTN                           Index;\r
   CM_ARM_SERIAL_PORT_INFO       * SerialPortInfo;\r
   UINT32                          SerialPortCount;\r
   UINTN                           Index;\r

-  CHAR8                           NewName[5];\r
+  CHAR8                           NewName[AML_NAME_SEG_SIZE + 1];\r

   UINT64                          Uid;\r
   EFI_ACPI_DESCRIPTION_HEADER  ** TableList;\r
 \r
   UINT64                          Uid;\r
   EFI_ACPI_DESCRIPTION_HEADER  ** TableList;\r
 \r

diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h b/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h
index cbae14d78802005c9b7610e8085a484610e8b18f..fff99e644b8dff057c73600a64c5fe1eb5005080 100644 (file)
--- a/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h
+++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h
@@ -1,7 +1,7 @@
 /** @file\r
   AML Defines.\r
 \r
 /** @file\r
   AML Defines.\r
 \r

-  Copyright (c) 2020, Arm Limited. All rights reserved.<BR>\r
+  Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>\r

 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r


@@ -138,13 +138,6 @@ typedef enum EAmlParseIndex {
 */\r
 #define AML_FIELD_NAMED_OP            0x04\r
 \r
 */\r
 #define AML_FIELD_NAMED_OP            0x04\r
 \r

-/** Size of a NameSeg.\r
-    Cf. ACPI 6.3 specification, s20.2.\r
-\r
-  @ingroup TreeStructures\r
-*/\r
- #define AML_NAME_SEG_SIZE            4U\r
-\r

 /** AML object types.\r
 \r
   The ACPI specification defines several object types. They are listed\r
 /** AML object types.\r
 \r
   The ACPI specification defines several object types. They are listed\r