diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2019-02-25 20:37:06 +0000 |
|---|---|---|
| committer | Sami Mujawar <sami.mujawar@arm.com> | 2019-02-26 08:53:50 +0000 |
| commit | 334111b0dab80394aeb1ebb8f0f3314847e2dc1f (patch) | |
| tree | 901ec8063e2ed4354d0e697c6b16dfb99c5128b2 /DynamicTablesPkg | |
| parent | bdbbedea949eb4b10d24110c0e559b03c7a6bce4 (diff) | |
| download | edk2-334111b0dab80394aeb1ebb8f0f3314847e2dc1f.tar.gz edk2-334111b0dab80394aeb1ebb8f0f3314847e2dc1f.tar.bz2 edk2-334111b0dab80394aeb1ebb8f0f3314847e2dc1f.zip | |
Revert "DynamicTablesPkg: Rename enum used for ID Mapping"
This reverts commit 1d49a75367ef6827b8b8f77f61e9ce245d1bdee3.
Reverting this patch as Soft Feature Freeze for
edk2-stable201903 started on 22 Feb 2019.
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')
| -rw-r--r-- | DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 2 | ||||
| -rw-r--r-- | DynamicTablesPkg/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 2adaa78808..93cb6949f0 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
- EArmObjIdMappingArray, ///< 25 - ID Mapping Array
+ EArmObjIdMapping, ///< 25 - ID Mapping
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 b53c4bb477..a3ee60664e 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
- - EArmObjIdMappingArray
+ - EArmObjIdMapping
- EArmObjGicItsIdentifierArray
*/
@@ -116,7 +116,7 @@ GET_OBJECT_LIST ( */
GET_OBJECT_LIST (
EObjNameSpaceArm,
- EArmObjIdMappingArray,
+ EArmObjIdMapping,
CM_ARM_ID_MAPPING
);
@@ -653,7 +653,7 @@ AddIdMappingArray ( Generator = (ACPI_IORT_GENERATOR*)This;
// Get the Id Mapping Array
- Status = GetEArmObjIdMappingArray (
+ Status = GetEArmObjIdMapping (
CfgMgrProtocol,
IdMappingToken,
&IdMappings,
|