From 43a0e08d0275bceb57067ff28ea46d3c960a58b9 Mon Sep 17 00:00:00 2001 From: Sami Mujawar Date: Tue, 9 Jul 2019 12:14:24 +0100 Subject: [PATCH] DynamicTablesPkg: Fix entry point param definition VS2017 reports 'warning C4028: formal parameter 2 different from declaration' for the library constructor and destructor interfaces for the Generator modules. VS2017 compiler also reports similar warnings for the DXE entry points. Remove the CONST qualifier for the SystemTable pointer (the second parameter to the constructor/destructor/DXE Entry point) to make it compatible with the formal declaration. Signed-off-by: Sami Mujawar Reviewed-by: Alexei Fedorov --- .../DynamicTableFactoryDxe/DynamicTableFactoryDxe.c | 6 +++--- .../DynamicTableManagerDxe/DynamicTableManagerDxe.c | 4 ++-- .../Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiRawLibArm/RawGenerator.c | 8 ++++---- .../Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c | 8 ++++---- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.c b/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.c index d87ea7809e..d1432348f0 100644 --- a/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.c +++ b/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.c @@ -1,7 +1,7 @@ /** @file Dynamic Table Factory Dxe - Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -60,8 +60,8 @@ EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL DynamicTableFactoryProtocol = { EFI_STATUS EFIAPI DynamicTableFactoryDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.c b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.c index 39b75996d9..e27dcaf374 100644 --- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.c +++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.c @@ -655,8 +655,8 @@ ProcessAcpiTables ( EFI_STATUS EFIAPI DynamicTableManagerDxeInitialize ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c index 0b45e15d2d..346ab5b22f 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c @@ -418,8 +418,8 @@ ACPI_TABLE_GENERATOR Dbg2Generator = { EFI_STATUS EFIAPI AcpiDbg2LibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -442,8 +442,8 @@ AcpiDbg2LibConstructor ( EFI_STATUS EFIAPI AcpiDbg2LibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c index 1f05a04c7c..b748c982b2 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c @@ -648,8 +648,8 @@ ACPI_TABLE_GENERATOR FadtGenerator = { EFI_STATUS EFIAPI AcpiFadtLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -671,8 +671,8 @@ AcpiFadtLibConstructor ( EFI_STATUS EFIAPI AcpiFadtLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c index a30870806d..7e86c30649 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c @@ -738,8 +738,8 @@ ACPI_TABLE_GENERATOR GtdtGenerator = { EFI_STATUS EFIAPI AcpiGtdtLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -761,8 +761,8 @@ AcpiGtdtLibConstructor ( EFI_STATUS EFIAPI AcpiGtdtLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index 05e360c899..f303e9f29c 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -2040,8 +2040,8 @@ ACPI_IORT_GENERATOR IortGenerator = { EFI_STATUS EFIAPI AcpiIortLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -2063,8 +2063,8 @@ AcpiIortLibConstructor ( EFI_STATUS EFIAPI AcpiIortLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c index dc52380783..2651ca1541 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c @@ -795,8 +795,8 @@ ACPI_TABLE_GENERATOR MadtGenerator = { EFI_STATUS EFIAPI AcpiMadtLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -818,8 +818,8 @@ AcpiMadtLibConstructor ( EFI_STATUS EFIAPI AcpiMadtLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c index d219e2f04a..1293ac8e43 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c @@ -329,8 +329,8 @@ ACPI_TABLE_GENERATOR McfgGenerator = { EFI_STATUS EFIAPI AcpiMcfgLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -352,8 +352,8 @@ AcpiMcfgLibConstructor ( EFI_STATUS EFIAPI AcpiMcfgLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index c8713dec62..9e42eee9b7 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -1492,8 +1492,8 @@ ACPI_PPTT_GENERATOR PpttGenerator = { EFI_STATUS EFIAPI AcpiPpttLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -1516,8 +1516,8 @@ AcpiPpttLibConstructor ( EFI_STATUS EFIAPI AcpiPpttLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiRawLibArm/RawGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiRawLibArm/RawGenerator.c index 544ea06f0b..2facfaa048 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiRawLibArm/RawGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiRawLibArm/RawGenerator.c @@ -109,8 +109,8 @@ ACPI_TABLE_GENERATOR RawGenerator = { EFI_STATUS EFIAPI AcpiRawLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -132,8 +132,8 @@ AcpiRawLibConstructor ( EFI_STATUS EFIAPI AcpiRawLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c index 7b70ba2c2c..1404279f82 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c @@ -308,8 +308,8 @@ ACPI_TABLE_GENERATOR SpcrGenerator = { EFI_STATUS EFIAPI AcpiSpcrLibConstructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; @@ -331,8 +331,8 @@ AcpiSpcrLibConstructor ( EFI_STATUS EFIAPI AcpiSpcrLibDestructor ( - IN CONST EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE * CONST SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE * SystemTable ) { EFI_STATUS Status; -- 2.39.2