tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "DynamicTablesPkg: Rename enum used for ID Mapping" 

This reverts commit 1d49a75367.

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>
This commit is contained in:
Sami Mujawar 2019-02-25 20:37:06 +00:00
parent bdbbedea94
commit 334111b0da
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DynamicTablesPkg/Include/ArmNameSpaceObjects.h
View File

@ -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;

6
DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
View File

@ -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,