DynamicTablesPkg: Rename enum used for ID Mapping
authorSami Mujawar <sami.mujawar@arm.com>
Thu, 21 Feb 2019 15:28:36 +0000 (15:28 +0000)
committerSami Mujawar <sami.mujawar@arm.com>
Wed, 20 Mar 2019 11:00:43 +0000 (11:00 +0000)
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>
DynamicTablesPkg/Include/ArmNameSpaceObjects.h
DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c

index 93cb694..2adaa78 100644 (file)
@@ -52,7 +52,7 @@ typedef enum ArmObjectID {
   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
index a3ee606..b53c4bb 100644 (file)
@@ -44,7 +44,7 @@ Requirements:
   - EArmObjSmmuV3\r
   - EArmObjPmcg\r
   - EArmObjGicItsIdentifierArray\r
-  - EArmObjIdMapping\r
+  - EArmObjIdMappingArray\r
   - EArmObjGicItsIdentifierArray\r
 */\r
 \r
@@ -116,7 +116,7 @@ GET_OBJECT_LIST (
 */\r
 GET_OBJECT_LIST (\r
   EObjNameSpaceArm,\r
-  EArmObjIdMapping,\r
+  EArmObjIdMappingArray,\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
-  Status = GetEArmObjIdMapping (\r
+  Status = GetEArmObjIdMappingArray (\r
              CfgMgrProtocol,\r
              IdMappingToken,\r
              &IdMappings,\r