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 <pierre.gondois@arm.com> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
This commit is contained in:
parent
7537028fa5
commit
be1d408773
|
@ -214,7 +214,7 @@ typedef struct AcpiTableGenerator ACPI_TABLE_GENERATOR;
|
||||||
@return EFI_SUCCESS If the table is generated successfully or other
|
@return EFI_SUCCESS If the table is generated successfully or other
|
||||||
failure codes as returned by the generator.
|
failure codes as returned by the generator.
|
||||||
**/
|
**/
|
||||||
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (
|
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_BUILD_TABLE)(
|
||||||
IN CONST ACPI_TABLE_GENERATOR *This,
|
IN CONST ACPI_TABLE_GENERATOR *This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
||||||
|
@ -234,7 +234,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (
|
||||||
@return EFI_SUCCESS If freed successfully or other failure codes
|
@return EFI_SUCCESS If freed successfully or other failure codes
|
||||||
as returned by the generator.
|
as returned by the generator.
|
||||||
**/
|
**/
|
||||||
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (
|
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_FREE_TABLE)(
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
||||||
|
@ -257,7 +257,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (
|
||||||
@return EFI_SUCCESS If the table is generated successfully or other
|
@return EFI_SUCCESS If the table is generated successfully or other
|
||||||
failure codes as returned by the generator.
|
failure codes as returned by the generator.
|
||||||
**/
|
**/
|
||||||
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (
|
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_BUILD_TABLEEX)(
|
||||||
IN CONST ACPI_TABLE_GENERATOR *This,
|
IN CONST ACPI_TABLE_GENERATOR *This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
||||||
|
@ -280,7 +280,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (
|
||||||
@return EFI_SUCCESS If freed successfully or other failure codes
|
@return EFI_SUCCESS If freed successfully or other failure codes
|
||||||
as returned by the generator.
|
as returned by the generator.
|
||||||
**/
|
**/
|
||||||
typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLEEX) (
|
typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_FREE_TABLEEX)(
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
|
||||||
|
|
|
@ -261,6 +261,7 @@ error_handler:
|
||||||
**/
|
**/
|
||||||
STATIC
|
STATIC
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
|
EFIAPI
|
||||||
FreeMcfgTableResources (
|
FreeMcfgTableResources (
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
|
|
|
@ -1075,6 +1075,7 @@ error_handler:
|
||||||
**/
|
**/
|
||||||
STATIC
|
STATIC
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
|
EFIAPI
|
||||||
FreePcctTableResources (
|
FreePcctTableResources (
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
|
|
|
@ -1342,6 +1342,7 @@ error_handler:
|
||||||
**/
|
**/
|
||||||
STATIC
|
STATIC
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
|
EFIAPI
|
||||||
FreePpttTableResources (
|
FreePpttTableResources (
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
|
|
|
@ -552,6 +552,7 @@ error_handler:
|
||||||
**/
|
**/
|
||||||
STATIC
|
STATIC
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
|
EFIAPI
|
||||||
FreeSratTableResources (
|
FreeSratTableResources (
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
|
|
|
@ -1313,6 +1313,7 @@ exit_handler:
|
||||||
**/
|
**/
|
||||||
STATIC
|
STATIC
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
|
EFIAPI
|
||||||
FreeSsdtCpuTopologyTableResources (
|
FreeSsdtCpuTopologyTableResources (
|
||||||
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
IN CONST ACPI_TABLE_GENERATOR *CONST This,
|
||||||
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,
|
||||||
|
|
Loading…
Reference in New Issue