DynamicTablesPkg: Rename enum used for ID Mapping
This patch was originally merged in edk2 master at1d49a75367
. However, this was later reverted at334111b0da
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>
This commit is contained in:
@ -52,7 +52,7 @@ typedef enum ArmObjectID {
|
|||||||
EArmObjSmmuV3, ///< 22 - SMMUv3
|
EArmObjSmmuV3, ///< 22 - SMMUv3
|
||||||
EArmObjPmcg, ///< 23 - PMCG
|
EArmObjPmcg, ///< 23 - PMCG
|
||||||
EArmObjGicItsIdentifierArray, ///< 24 - GIC ITS Identifier Array
|
EArmObjGicItsIdentifierArray, ///< 24 - GIC ITS Identifier Array
|
||||||
EArmObjIdMapping, ///< 25 - ID Mapping
|
EArmObjIdMappingArray, ///< 25 - ID Mapping Array
|
||||||
EArmObjSmmuInterruptArray, ///< 26 - SMMU Interrupt Array
|
EArmObjSmmuInterruptArray, ///< 26 - SMMU Interrupt Array
|
||||||
EArmObjMax
|
EArmObjMax
|
||||||
} EARM_OBJECT_ID;
|
} EARM_OBJECT_ID;
|
||||||
|
@ -44,7 +44,7 @@ Requirements:
|
|||||||
- EArmObjSmmuV3
|
- EArmObjSmmuV3
|
||||||
- EArmObjPmcg
|
- EArmObjPmcg
|
||||||
- EArmObjGicItsIdentifierArray
|
- EArmObjGicItsIdentifierArray
|
||||||
- EArmObjIdMapping
|
- EArmObjIdMappingArray
|
||||||
- EArmObjGicItsIdentifierArray
|
- EArmObjGicItsIdentifierArray
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -116,7 +116,7 @@ GET_OBJECT_LIST (
|
|||||||
*/
|
*/
|
||||||
GET_OBJECT_LIST (
|
GET_OBJECT_LIST (
|
||||||
EObjNameSpaceArm,
|
EObjNameSpaceArm,
|
||||||
EArmObjIdMapping,
|
EArmObjIdMappingArray,
|
||||||
CM_ARM_ID_MAPPING
|
CM_ARM_ID_MAPPING
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -653,7 +653,7 @@ AddIdMappingArray (
|
|||||||
Generator = (ACPI_IORT_GENERATOR*)This;
|
Generator = (ACPI_IORT_GENERATOR*)This;
|
||||||
|
|
||||||
// Get the Id Mapping Array
|
// Get the Id Mapping Array
|
||||||
Status = GetEArmObjIdMapping (
|
Status = GetEArmObjIdMappingArray (
|
||||||
CfgMgrProtocol,
|
CfgMgrProtocol,
|
||||||
IdMappingToken,
|
IdMappingToken,
|
||||||
&IdMappings,
|
&IdMappings,
|
||||||
|
Reference in New Issue
Block a user