Replace the enum defining valid node types in the IORT table with macros from IoRemappingTable.h.
Signed-off-by: Krzysztof Koch <krzysztof.k...@arm.com> --- Changes can be seen at: https://github.com/KrzysztofKoch1/edk2/commit/79650cd6f2552e849afcd89aa016f35774376408 Notes: v1: - Remove redundant enum defining allowed IORT node types [Krzysztof] - Use macros from IoRemappingTable.h instead [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 30 ++++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c index e3d9bc9a996001f77ed8b13a1c57505496807f4c..a91a4f9db13a52285bf56abe33f359a771fc04bd 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c @@ -1,7 +1,7 @@ /** @file IORT table parser - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -17,24 +17,10 @@ // Local variables STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; -/** - The EIORT_NODE enum describes the IORT Node types. -**/ -typedef enum IortNode { - Iort_Node_ITS_Group, ///< ITS Group node - Iort_Node_Named_Component, ///< Named Component node - Iort_Node_Root_Complex, ///< Root Complex node - Iort_Node_SMMUV1_V2, ///< SMMU v1/v2 node - Iort_Node_SMMUV3, ///< SMMU v3 node - Iort_Node_PMCG, ///< PMC group node - Iort_Node_Max -} EIORT_NODE; - -// Local Variables STATIC CONST UINT32* IortNodeCount; STATIC CONST UINT32* IortNodeOffset; -STATIC CONST UINT8* IortNodeType; +STATIC CONST UINT8* IortNodeType; STATIC CONST UINT16* IortNodeLength; STATIC CONST UINT32* IortIdMappingCount; STATIC CONST UINT32* IortIdMappingOffset; @@ -659,13 +645,13 @@ ParseAcpiIort ( Print (L"0x%x\n", Offset); switch (*IortNodeType) { - case Iort_Node_ITS_Group: + case EFI_ACPI_IORT_TYPE_ITS_GROUP: DumpIortNodeIts ( NodePtr, *IortNodeLength ); break; - case Iort_Node_Named_Component: + case EFI_ACPI_IORT_TYPE_NAMED_COMP: DumpIortNodeNamedComponent ( NodePtr, *IortNodeLength, @@ -673,7 +659,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_Root_Complex: + case EFI_ACPI_IORT_TYPE_ROOT_COMPLEX: DumpIortNodeRootComplex ( NodePtr, *IortNodeLength, @@ -681,7 +667,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_SMMUV1_V2: + case EFI_ACPI_IORT_TYPE_SMMUv1v2: DumpIortNodeSmmuV1V2 ( NodePtr, *IortNodeLength, @@ -689,7 +675,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_SMMUV3: + case EFI_ACPI_IORT_TYPE_SMMUv3: DumpIortNodeSmmuV3 ( NodePtr, *IortNodeLength, @@ -697,7 +683,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_PMCG: + case EFI_ACPI_IORT_TYPE_PMCG: DumpIortNodePmcg ( NodePtr, *IortNodeLength, -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43006): https://edk2.groups.io/g/devel/message/43006 Mute This Topic: https://groups.io/mt/32240402/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
