From: "Krzysztof Koch" <krzysztof.koch@arm.com>
To: <devel@edk2.groups.io>
Cc: <jaben.carsey@intel.com>, <ray.ni@intel.com>,
<zhichao.gao@intel.com>, <Sami.Mujawar@arm.com>,
<Matteo.Carlini@arm.com>, <nd@arm.com>
Subject: [PATCH v1 3/4] ShellPkg: acpiview: Remove redundant IORT node types enum
Date: Fri, 28 Jun 2019 11:24:37 +0100 [thread overview]
Message-ID: <20190628102438.30544-4-krzysztof.koch@arm.com> (raw)
In-Reply-To: <20190628102438.30544-1-krzysztof.koch@arm.com>
Replace the enum defining valid node types in the IORT table with
macros from IoRemappingTable.h.
Signed-off-by: Krzysztof Koch <krzysztof.koch@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)'
next prev parent reply other threads:[~2019-06-28 10:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 10:24 [PATCH v1 0/4] Fix a number of small issues in acpiview Krzysztof Koch
2019-06-28 10:24 ` [PATCH v1 1/4] ShellPkg: acpiview: Improve PPTT table field validation Krzysztof Koch
2019-06-28 11:00 ` [edk2-devel] " Alexei Fedorov
2019-07-01 3:49 ` Gao, Zhichao
2019-07-01 7:28 ` [edk2-devel] " Krzysztof Koch
2019-07-02 5:56 ` Gao, Zhichao
2019-06-28 10:24 ` [PATCH v1 2/4] ShellPkg: acpiview: Make DBG2 output consistent with other tables Krzysztof Koch
2019-06-28 10:59 ` [edk2-devel] " Alexei Fedorov
2019-06-28 11:02 ` Alexei Fedorov
2019-06-28 10:24 ` Krzysztof Koch [this message]
2019-06-28 10:59 ` [edk2-devel] [PATCH v1 3/4] ShellPkg: acpiview: Remove redundant IORT node types enum Alexei Fedorov
2019-06-28 11:02 ` Alexei Fedorov
2019-06-28 10:24 ` [PATCH v1 4/4] ShellPkg: acpiview: Remove duplicate indentation in IORT parser Krzysztof Koch
2019-06-28 10:58 ` [edk2-devel] " Alexei Fedorov
2019-06-28 11:01 ` Alexei Fedorov
2019-06-28 11:03 ` [edk2-devel] [PATCH v1 0/4] Fix a number of small issues in acpiview Alexei Fedorov
2019-07-02 8:44 ` Sami Mujawar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190628102438.30544-4-krzysztof.koch@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox