1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Include / Common / EdkIIGlueDependencies.h

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
index 1f59b3552b0a214544641f66fed991d029f52bf0..c28debd6f118c8156796906de40974b784a971f2 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
@@ -61,6 +61,45 @@ Abstract:
   #endif\r
 #endif\r
 \r
+//\r
+//  DxePerformanceLib\r
+//\r
+#ifdef __EDKII_GLUE_DXE_PERFORMANCE_LIB__\r
+  #ifndef __EDKII_GLUE_BASE_LIB__\r
+  #define __EDKII_GLUE_BASE_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_BASE_MEMORY_LIB__\r
+  #define __EDKII_GLUE_BASE_MEMORY_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_DXE_MEMORY_ALLOCATION_LIB__\r
+  #define __EDKII_GLUE_DXE_MEMORY_ALLOCATION_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_DXE_HOB_LIB__\r
+  #define __EDKII_GLUE_DXE_HOB_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__\r
+  #define __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_UEFI_LIB__\r
+  #define __EDKII_GLUE_UEFI_LIB__\r
+  #endif\r
+#endif\r
+\r
+//\r
+//  PeiPerformanceLib\r
+//\r
+#ifdef __EDKII_GLUE_PEI_PERFORMANCE_LIB__\r
+  #ifndef __EDKII_GLUE_BASE_LIB__\r
+  #define __EDKII_GLUE_BASE_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_BASE_MEMORY_LIB__\r
+  #define __EDKII_GLUE_BASE_MEMORY_LIB__\r
+  #endif\r
+  #ifndef __EDKII_GLUE_PEI_SERVICES_LIB__\r
+  #define __EDKII_GLUE_PEI_SERVICES_LIB__\r
+  #endif\r
+#endif\r
+\r
 //\r
 // EdkDxeRuntimeDriverLib\r
 //\r
@@ -554,6 +593,14 @@ Abstract:
   //\r
 #endif\r
 \r
+//\r
+//  Whether _gDriverExitBootServicesEvent[] contains effective handler\r
+//\r
+#if defined(__EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__) || defined(__EDKII_GLUE_EXIT_BOOT_SERVICES_EVENT_HANDLER__)\r
+  #define __EDKII_GLUE_HAVE_DRIVER_EXIT_BOOT_SERVICES_EVENT__ 1\r
+#else  \r
+  #define __EDKII_GLUE_HAVE_DRIVER_EXIT_BOOT_SERVICES_EVENT__ 0\r
+#endif\r
 \r
 //\r
 // Check against multiple instances of same library class being used\r
@@ -654,6 +701,7 @@ Abstract:
 \r
 #ifdef __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 UefiBootServicesTableLibConstructor (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
@@ -671,6 +719,7 @@ IoLibConstructor (
 \r
 #ifdef __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 UefiRuntimeServicesTableLibConstructor (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
@@ -679,6 +728,7 @@ UefiRuntimeServicesTableLibConstructor (
 \r
 #ifdef __EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 RuntimeDriverLibConstruct (\r
   IN EFI_HANDLE           ImageHandle,\r
   IN EFI_SYSTEM_TABLE     *SystemTable\r
@@ -687,6 +737,7 @@ RuntimeDriverLibConstruct (
 \r
 #ifdef __EDKII_GLUE_DXE_HOB_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 HobLibConstructor (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
@@ -695,6 +746,7 @@ HobLibConstructor (
 \r
 #ifdef __EDKII_GLUE_UEFI_DRIVER_MODEL_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 UefiDriverModelLibConstructor (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
@@ -703,6 +755,7 @@ UefiDriverModelLibConstructor (
 \r
 #ifdef __EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
   IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
   IN EFI_PEI_SERVICES     **PeiServices\r
@@ -711,6 +764,7 @@ PeiServicesTablePointerLibConstructor (
 \r
 #ifdef __EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_MM7__\r
 EFI_STATUS\r
+EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
   IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
   IN EFI_PEI_SERVICES     **PeiServices\r
@@ -719,6 +773,7 @@ PeiServicesTablePointerLibConstructor (
 \r
 #ifdef __EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_KR1__\r
 EFI_STATUS\r
+EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
   IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
   IN EFI_PEI_SERVICES     **PeiServices\r
@@ -736,6 +791,7 @@ SmbusLibConstructor (
 \r
 #ifdef __EDKII_GLUE_DXE_SERVICES_TABLE_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 DxeServicesTableLibConstructor (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
@@ -760,6 +816,7 @@ DxeSalLibConstructor (
 //\r
 #ifdef __EDKII_GLUE_UEFI_DRIVER_MODEL_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 UefiDriverModelLibDestructor (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
@@ -768,6 +825,7 @@ UefiDriverModelLibDestructor (
 \r
 #ifdef __EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__\r
 EFI_STATUS\r
+EFIAPI\r
 RuntimeDriverLibDeconstruct (\r
   IN EFI_HANDLE        ImageHandle,\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r