summaryrefslogtreecommitdiff
path: root/BaseTools/Source/C/GenFw/GenFw.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2023-05-24 17:05:55 +0300
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-06-01 13:53:35 +0300
commit26d6ef38e74979d729c260985de3f885871f6688 (patch)
tree1552993296abc66b06767798346adbe2fd06a23b /BaseTools/Source/C/GenFw/GenFw.c
parent69ac88cabdf2e472dcc1aaa7572745e9259948d6 (diff)
downloadedk2-26d6ef38e74979d729c260985de3f885871f6688.tar.xz
BaseTools: remove duplicate includes: IndustryStandard/Acpi*.h
Use the MdePkg version instead of maintaining a copy in BaseTools. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Sunil V L <sunilvl@ventanamicro.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
Diffstat (limited to 'BaseTools/Source/C/GenFw/GenFw.c')
-rw-r--r--BaseTools/Source/C/GenFw/GenFw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index 80ee73a803..0da25fd055 100644
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -26,9 +26,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Acpi Table definition
//
#include <IndustryStandard/Acpi.h>
-#include <IndustryStandard/Acpi1_0.h>
-#include <IndustryStandard/Acpi2_0.h>
-#include <IndustryStandard/Acpi3_0.h>
+#include <IndustryStandard/Acpi10.h>
+#include <IndustryStandard/Acpi20.h>
+#include <IndustryStandard/Acpi30.h>
#include <IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h>
#include "CommonLib.h"
@@ -368,7 +368,7 @@ Returns:
if (Facs->Version > EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION) {
break;
}
- if ((Facs->Version != EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION) &&
+ if ((Facs->Version != 0 /* field is reserved in ACPI 1.0 */) &&
(Facs->Version != EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION) &&
(Facs->Version != EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION)){
Error (NULL, 0, 3000, "Invalid", "FACS version check failed.");