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 <krzysztof.koch@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
This commit is contained in:
Krzysztof Koch 2020-01-30 19:42:55 +08:00 committed by mergify[bot]
parent c73fce3d12
commit 0b9026a823
2 changed files with 5 additions and 25 deletions

View File

@ -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)
);

View File

@ -1,7 +1,7 @@
/** @file
Header file for 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
**/
@ -396,26 +396,6 @@ ParseAcpi (
{ L"Creator Revision", 4, 32, L"0x%X", NULL, \
(VOID**)&(Info)->CreatorRevision, NULL, NULL }
/**
Length of the ACPI GAS structure.
NOTE: This might normally be defined as
sizeof (EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE).
However, we deliberately minimise any reference to the EDK2 ACPI
headers in an attempt to provide cross checking.
**/
#define GAS_LENGTH 12
/**
Length of the ACPI Header structure.
NOTE: This might normally be defined as
sizeof (EFI_ACPI_DESCRIPTION_HEADER).
However, we deliberately minimise any reference to the EDK2 ACPI
headers in an attempt to provide cross checking.
**/
#define ACPI_DESCRIPTION_HEADER_LENGTH 36
/**
This function indents and traces the GAS structure as described by the GasParser.