From 1d49a75367ef6827b8b8f77f61e9ce245d1bdee3 Mon Sep 17 00:00:00 2001 From: Sami Mujawar Date: Thu, 21 Feb 2019 15:28:36 +0000 Subject: [PATCH] DynamicTablesPkg: Rename enum used for ID Mapping Renamed the enum EArmObjIdMapping to EArmObjIdMappingArray and updated the IORT generator accordingly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar Reviewed-by: Alexei Fedorov --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 2 +- .../Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 93cb6949f0..2adaa78808 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -52,7 +52,7 @@ typedef enum ArmObjectID { EArmObjSmmuV3, ///< 22 - SMMUv3 EArmObjPmcg, ///< 23 - PMCG EArmObjGicItsIdentifierArray, ///< 24 - GIC ITS Identifier Array - EArmObjIdMapping, ///< 25 - ID Mapping + EArmObjIdMappingArray, ///< 25 - ID Mapping Array EArmObjSmmuInterruptArray, ///< 26 - SMMU Interrupt Array EArmObjMax } EARM_OBJECT_ID; 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, -- 2.39.2