DynamicTablesPkg: Rename enum used for ID Mapping

This patch was originally merged in edk2 master at
1d49a75367ef6827b8b8f77f61e9ce245d1bdee3. However, this was
later reverted at 334111b0dab80394aeb1ebb8f0f3314847e2dc1f
as it was merged during the Soft Feature Freeze for
edk2-stable201903.

Resubmitting this patch as the edk2 merge window is now open.

Renamed the enum EArmObjIdMapping to EArmObjIdMappingArray
and updated the IORT generator accordingly.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Alexei Fedorov <alexei.fedorov@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>

diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 93cb6949f0eb2ac2ad3524494e4a14c7a6fab4b8..2adaa788083e4e15d049f5f6b6312f77f3c02488 100644 (file)
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -52,7 +52,7 @@ typedef enum ArmObjectID {
   EArmObjSmmuV3,                      ///< 22 - SMMUv3\r
   EArmObjPmcg,                        ///< 23 - PMCG\r
   EArmObjGicItsIdentifierArray,       ///< 24 - GIC ITS Identifier Array\r
   EArmObjSmmuV3,                      ///< 22 - SMMUv3\r
   EArmObjPmcg,                        ///< 23 - PMCG\r
   EArmObjGicItsIdentifierArray,       ///< 24 - GIC ITS Identifier Array\r

-  EArmObjIdMapping,                   ///< 25 - ID Mapping\r
+  EArmObjIdMappingArray,              ///< 25 - ID Mapping Array\r

   EArmObjSmmuInterruptArray,          ///< 26 - SMMU Interrupt Array\r
   EArmObjMax\r
 } EARM_OBJECT_ID;\r
   EArmObjSmmuInterruptArray,          ///< 26 - SMMU Interrupt Array\r
   EArmObjMax\r
 } EARM_OBJECT_ID;\r

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
index a3ee60664ecbeb1b12b01683f838e11804884daf..b53c4bb47798d4ad441db1fe1b1e5b180e313403 100644 (file)
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
@@ -44,7 +44,7 @@ Requirements:
   - EArmObjSmmuV3\r
   - EArmObjPmcg\r
   - EArmObjGicItsIdentifierArray\r
   - EArmObjSmmuV3\r
   - EArmObjPmcg\r
   - EArmObjGicItsIdentifierArray\r

-  - EArmObjIdMapping\r
+  - EArmObjIdMappingArray\r

   - EArmObjGicItsIdentifierArray\r
 */\r
 \r
   - EArmObjGicItsIdentifierArray\r
 */\r
 \r


@@ -116,7 +116,7 @@ GET_OBJECT_LIST (
 */\r
 GET_OBJECT_LIST (\r
   EObjNameSpaceArm,\r
 */\r
 GET_OBJECT_LIST (\r
   EObjNameSpaceArm,\r

-  EArmObjIdMapping,\r
+  EArmObjIdMappingArray,\r

   CM_ARM_ID_MAPPING\r
   );\r
 \r
   CM_ARM_ID_MAPPING\r
   );\r
 \r


@@ -653,7 +653,7 @@ AddIdMappingArray (
   Generator = (ACPI_IORT_GENERATOR*)This;\r
 \r
   // Get the Id Mapping Array\r
   Generator = (ACPI_IORT_GENERATOR*)This;\r
 \r
   // Get the Id Mapping Array\r

-  Status = GetEArmObjIdMapping (\r
+  Status = GetEArmObjIdMappingArray (\r

              CfgMgrProtocol,\r
              IdMappingToken,\r
              &IdMappings,\r
              CfgMgrProtocol,\r
              IdMappingToken,\r
              &IdMappings,\r