Skip to content

Commit cb8e4fc

Browse files
committed
DynamicTablesPkg: Add EFIAPI to generators hooks
For X64 builds, the EFIAPI is replaced by '(__attribute__((ms_abi))'. This might lead to build error for some ACPI tablte generators due to function prototype mismatch. Add the EFIAPI to ACPI table generator hooks: - ACPI_TABLE_GENERATOR_BUILD_TABLEEX - ACPI_TABLE_GENERATOR_FREE_TABLEEX Signed-off-by: Pierre Gondois <[email protected]> Reviewed-by: Sami Mujawar <[email protected]>
1 parent 1df72e7 commit cb8e4fc

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

DynamicTablesPkg/Include/AcpiTableGenerator.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ typedef struct AcpiTableGenerator ACPI_TABLE_GENERATOR;
214214
@return EFI_SUCCESS If the table is generated successfully or other
215215
failure codes as returned by the generator.
216216
**/
217-
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (
217+
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_BUILD_TABLE)(
218218
IN CONST ACPI_TABLE_GENERATOR *This,
219219
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
220220
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
@@ -234,7 +234,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (
234234
@return EFI_SUCCESS If freed successfully or other failure codes
235235
as returned by the generator.
236236
**/
237-
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (
237+
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_FREE_TABLE)(
238238
IN CONST ACPI_TABLE_GENERATOR *CONST This,
239239
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
240240
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
@@ -257,7 +257,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (
257257
@return EFI_SUCCESS If the table is generated successfully or other
258258
failure codes as returned by the generator.
259259
**/
260-
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (
260+
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_BUILD_TABLEEX)(
261261
IN CONST ACPI_TABLE_GENERATOR *This,
262262
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
263263
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
@@ -280,7 +280,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (
280280
@return EFI_SUCCESS If freed successfully or other failure codes
281281
as returned by the generator.
282282
**/
283-
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLEEX) (
283+
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_FREE_TABLEEX)(
284284
IN CONST ACPI_TABLE_GENERATOR *CONST This,
285285
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
286286
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,

DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ BuildMcfgTable (
261261
**/
262262
STATIC
263263
EFI_STATUS
264+
EFIAPI
264265
FreeMcfgTableResources (
265266
IN CONST ACPI_TABLE_GENERATOR *CONST This,
266267
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,

DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,7 @@ BuildPcctTable (
10751075
**/
10761076
STATIC
10771077
EFI_STATUS
1078+
EFIAPI
10781079
FreePcctTableResources (
10791080
IN CONST ACPI_TABLE_GENERATOR *CONST This,
10801081
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,

DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,6 +1342,7 @@ BuildPpttTable (
13421342
**/
13431343
STATIC
13441344
EFI_STATUS
1345+
EFIAPI
13451346
FreePpttTableResources (
13461347
IN CONST ACPI_TABLE_GENERATOR *CONST This,
13471348
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,

DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ BuildSratTable (
552552
**/
553553
STATIC
554554
EFI_STATUS
555+
EFIAPI
555556
FreeSratTableResources (
556557
IN CONST ACPI_TABLE_GENERATOR *CONST This,
557558
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,

DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,7 @@ BuildSsdtCpuTopologyTable (
13131313
**/
13141314
STATIC
13151315
EFI_STATUS
1316+
EFIAPI
13161317
FreeSsdtCpuTopologyTableResources (
13171318
IN CONST ACPI_TABLE_GENERATOR *CONST This,
13181319
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,

0 commit comments

Comments
 (0)