summaryrefslogtreecommitdiffstats
path: root/DynamicTablesPkg/Library
diff options
context:
space:
mode:
authorSami Mujawar <sami.mujawar@arm.com>2019-02-21 15:28:36 +0000
committerSami Mujawar <sami.mujawar@arm.com>2019-03-20 11:00:43 +0000
commit98a4a7a99bf588dffac031bb300d9aba4adcdea5 (patch)
treed1d2b29ec045c9fa4fce0bb9ed89e963588be75f /DynamicTablesPkg/Library
parent4f93ff22b983c45ec2ff37349f37bf8a3339d89a (diff)
downloadedk2-98a4a7a99bf588dffac031bb300d9aba4adcdea5.tar.gz
edk2-98a4a7a99bf588dffac031bb300d9aba4adcdea5.tar.bz2
edk2-98a4a7a99bf588dffac031bb300d9aba4adcdea5.zip
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>
Diffstat (limited to 'DynamicTablesPkg/Library')
-rw-r--r--DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
index a3ee60664e..b53c4bb477 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
@@ -44,7 +44,7 @@ Requirements:
- EArmObjSmmuV3
- EArmObjPmcg
- EArmObjGicItsIdentifierArray
- - EArmObjIdMapping
+ - EArmObjIdMappingArray
- EArmObjGicItsIdentifierArray
*/
@@ -116,7 +116,7 @@ GET_OBJECT_LIST (
*/
GET_OBJECT_LIST (
EObjNameSpaceArm,
- EArmObjIdMapping,
+ EArmObjIdMappingArray,
CM_ARM_ID_MAPPING
);
@@ -653,7 +653,7 @@ AddIdMappingArray (
Generator = (ACPI_IORT_GENERATOR*)This;
// Get the Id Mapping Array
- Status = GetEArmObjIdMapping (
+ Status = GetEArmObjIdMappingArray (
CfgMgrProtocol,
IdMappingToken,
&IdMappings,