From 0b9026a823e01078681a3a9153f17c78afb042dd Mon Sep 17 00:00:00 2001 From: Krzysztof Koch Date: Thu, 30 Jan 2020 19:42:55 +0800 Subject: ShellPkg: acpiview: Remove duplicate ACPI structure size definitions Remove duplicate Generic Address Structure (GAS) and ACPI table header size definitions. Replace any dependencies with the definitions from Acpi63.h. AcpiParser.h redefines the size of Generic Address Structure (GAS) and the ACPI table header. The motivation is to 'minimise any reference to the EDK2 ACPI headers in an attempt to provide cross checking'. While the redefined values are unlikely to change, redefinition causes unnecessary maintenance overhead for acpiview. In addition to this, EDK2 ACPI headers are referenced throughout the entire project, so the assumption should be that the definitions in these header files are correct. Signed-off-by: Krzysztof Koch Reviewed-by: Sami Mujawar Reviewed-by: Zhichao Gao --- ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c') diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c index 84c5f0468d..3f12a33050 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c @@ -1,7 +1,7 @@ /** @file ACPI parser - Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -673,7 +673,7 @@ DumpGas ( IN UINT8* Ptr ) { - DumpGasStruct (Ptr, 2, GAS_LENGTH); + DumpGasStruct (Ptr, 2, sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE)); } /** @@ -694,7 +694,7 @@ DumpAcpiHeader ( 0, "ACPI Table Header", Ptr, - ACPI_DESCRIPTION_HEADER_LENGTH, + sizeof (EFI_ACPI_DESCRIPTION_HEADER), PARSER_PARAMS (AcpiHeaderParser) ); } @@ -728,7 +728,7 @@ ParseAcpiHeader ( 0, NULL, Ptr, - ACPI_DESCRIPTION_HEADER_LENGTH, + sizeof (EFI_ACPI_DESCRIPTION_HEADER), PARSER_PARAMS (AcpiHeaderParser) ); -- cgit v1.2.3