Some field names in the IORT table parser were longer than the
OUTPUT_FIELD_COLUMN_WIDTH plus indentation, resulting in loss of
the output print alignment. Therefore, abbreviate the field names.
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
Notes:
v2:
- No code change since v1. Re-sending with v2 series. [SAMI]
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
index f7447947b2308d35d4d2890373778f0fd2f97f9e..fcecaff5134256497bda87241f339076897c3ece 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
@@ -1,11 +1,14 @@
/** @file
IORT table parser
- Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+ Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s):
- - IO Remapping Table, Platform Design Document, Revision D, March 2018
+ - IO Remapping Table, Platform Design Document, Revision D, March 2018
+
+ @par Glossary:
+ - Ref - Reference
**/
#include <IndustryStandard/IoRemappingTable.h>
@@ -144,15 +147,15 @@ STATIC CONST ACPI_PARSER IortNodeSmmuV1V2Parser[] = {
{L"Span", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
{L"Model", 4, 32, L"%d", NULL, NULL, NULL, NULL},
{L"Flags", 4, 36, L"0x%x", NULL, NULL, NULL, NULL},
- {L"Reference to Global Interrupt Array", 4, 40, L"0x%x", NULL, NULL, NULL,
+ {L"Global Interrupt Array Ref", 4, 40, L"0x%x", NULL, NULL, NULL,
NULL},
{L"Number of context interrupts", 4, 44, L"%d", NULL,
(VOID**)&InterruptContextCount, NULL, NULL},
- {L"Reference to Context Interrupt Array", 4, 48, L"0x%x", NULL,
+ {L"Context Interrupt Array Ref", 4, 48, L"0x%x", NULL,
(VOID**)&InterruptContextOffset, NULL, NULL},
{L"Number of PMU Interrupts", 4, 52, L"%d", NULL,
(VOID**)&PmuInterruptCount, NULL, NULL},
- {L"Reference to PMU Interrupt Array", 4, 56, L"0x%x", NULL,
+ {L"PMU Interrupt Array Ref", 4, 56, L"0x%x", NULL,
(VOID**)&PmuInterruptOffset, NULL, NULL},
// Interrupt Array
--
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76655): https://edk2.groups.io/g/devel/message/76655
Mute This Topic: https://groups.io/mt/83600717/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Thanks,
Zhichao
> -----Original Message-----
> From: Sami Mujawar <sami.mujawar@arm.com>
> Sent: Thursday, June 17, 2021 5:56 PM
> To: devel@edk2.groups.io
> Cc: Sami Mujawar <sami.mujawar@arm.com>; Alexei.Fedorov@arm.com;
> Matteo.Carlini@arm.com; Ben.Adderson@arm.com; Ni, Ray
> <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; nd@arm.com
> Subject: [PATCH v2 3/8] ShellPkg: Acpiview: Abbreviate field names to
> preserve alignment
>
> Some field names in the IORT table parser were longer than the
> OUTPUT_FIELD_COLUMN_WIDTH plus indentation, resulting in loss of the
> output print alignment. Therefore, abbreviate the field names.
>
> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
> ---
>
> Notes:
> v2:
> - No code change since v1. Re-sending with v2 series. [SAMI]
>
> ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c |
> 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
> index
> f7447947b2308d35d4d2890373778f0fd2f97f9e..fcecaff5134256497bda87241f3
> 39076897c3ece 100644
> ---
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
> +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortPars
> +++ er.c
> @@ -1,11 +1,14 @@
> /** @file
> IORT table parser
>
> - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
> + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Reference(s):
> - - IO Remapping Table, Platform Design Document, Revision D, March 2018
> + - IO Remapping Table, Platform Design Document, Revision D, March
> + 2018
> +
> + @par Glossary:
> + - Ref - Reference
> **/
>
> #include <IndustryStandard/IoRemappingTable.h>
> @@ -144,15 +147,15 @@ STATIC CONST ACPI_PARSER
> IortNodeSmmuV1V2Parser[] = {
> {L"Span", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
> {L"Model", 4, 32, L"%d", NULL, NULL, NULL, NULL},
> {L"Flags", 4, 36, L"0x%x", NULL, NULL, NULL, NULL},
> - {L"Reference to Global Interrupt Array", 4, 40, L"0x%x", NULL, NULL, NULL,
> + {L"Global Interrupt Array Ref", 4, 40, L"0x%x", NULL, NULL, NULL,
> NULL},
> {L"Number of context interrupts", 4, 44, L"%d", NULL,
> (VOID**)&InterruptContextCount, NULL, NULL},
> - {L"Reference to Context Interrupt Array", 4, 48, L"0x%x", NULL,
> + {L"Context Interrupt Array Ref", 4, 48, L"0x%x", NULL,
> (VOID**)&InterruptContextOffset, NULL, NULL},
> {L"Number of PMU Interrupts", 4, 52, L"%d", NULL,
> (VOID**)&PmuInterruptCount, NULL, NULL},
> - {L"Reference to PMU Interrupt Array", 4, 56, L"0x%x", NULL,
> + {L"PMU Interrupt Array Ref", 4, 56, L"0x%x", NULL,
> (VOID**)&PmuInterruptOffset, NULL, NULL},
>
> // Interrupt Array
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77165): https://edk2.groups.io/g/devel/message/77165
Mute This Topic: https://groups.io/mt/83600717/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Sami,
The patch looks good to me:
Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
Regards,
Pierre
On 6/17/21 10:55, Sami Mujawar via groups.io wrote:
> Some field names in the IORT table parser were longer than the
> OUTPUT_FIELD_COLUMN_WIDTH plus indentation, resulting in loss of
> the output print alignment. Therefore, abbreviate the field names.
>
> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
> ---
>
> Notes:
> v2:
> - No code change since v1. Re-sending with v2 series. [SAMI]
>
> ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
> index f7447947b2308d35d4d2890373778f0fd2f97f9e..fcecaff5134256497bda87241f339076897c3ece 100644
> --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
> +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
> @@ -1,11 +1,14 @@
> /** @file
> IORT table parser
>
> - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
> + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Reference(s):
> - - IO Remapping Table, Platform Design Document, Revision D, March 2018
> + - IO Remapping Table, Platform Design Document, Revision D, March 2018
> +
> + @par Glossary:
> + - Ref - Reference
> **/
>
> #include <IndustryStandard/IoRemappingTable.h>
> @@ -144,15 +147,15 @@ STATIC CONST ACPI_PARSER IortNodeSmmuV1V2Parser[] = {
> {L"Span", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
> {L"Model", 4, 32, L"%d", NULL, NULL, NULL, NULL},
> {L"Flags", 4, 36, L"0x%x", NULL, NULL, NULL, NULL},
> - {L"Reference to Global Interrupt Array", 4, 40, L"0x%x", NULL, NULL, NULL,
> + {L"Global Interrupt Array Ref", 4, 40, L"0x%x", NULL, NULL, NULL,
> NULL},
> {L"Number of context interrupts", 4, 44, L"%d", NULL,
> (VOID**)&InterruptContextCount, NULL, NULL},
> - {L"Reference to Context Interrupt Array", 4, 48, L"0x%x", NULL,
> + {L"Context Interrupt Array Ref", 4, 48, L"0x%x", NULL,
> (VOID**)&InterruptContextOffset, NULL, NULL},
> {L"Number of PMU Interrupts", 4, 52, L"%d", NULL,
> (VOID**)&PmuInterruptCount, NULL, NULL},
> - {L"Reference to PMU Interrupt Array", 4, 56, L"0x%x", NULL,
> + {L"PMU Interrupt Array Ref", 4, 56, L"0x%x", NULL,
> (VOID**)&PmuInterruptOffset, NULL, NULL},
>
> // Interrupt Array
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82136): https://edk2.groups.io/g/devel/message/82136
Mute This Topic: https://groups.io/mt/83600717/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2026 Red Hat, Inc.