Sync patch r10719 from main trunk.

r10719 - Correct the check for macro definition __EDKII_GLUE_PEI_HOB_LIB__.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2008@10738 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 53 insertions, 3 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
index c28debd6f1..9b13f0d02d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
@@ -226,6 +226,24 @@ Abstract:
 #endif

 

 //

+// SmmRuntimeDxeReportStatusCodeLib - typically used by SMM driver and Runtime driver

+//

+#ifdef __EDKII_GLUE_SMM_RUNTIME_DXE_REPORT_STATUS_CODE_LIB__

+  #ifndef __EDKII_GLUE_BASE_LIB__

+  #define __EDKII_GLUE_BASE_LIB__

+  #endif

+  #ifndef __EDKII_GLUE_BASE_MEMORY_LIB__

+  #define __EDKII_GLUE_BASE_MEMORY_LIB__

+  #endif

+  #ifndef __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__

+  #define __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__

+  #endif

+  #ifndef __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB__

+  #define __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB__

+  #endif

+#endif

+

+//

 // PeiReportStatusCodeLib

 //

 #ifdef  __EDKII_GLUE_PEI_REPORT_STATUS_CODE_LIB__

@@ -613,7 +631,7 @@ Abstract:
   #error EdkIIGluePciLibPciExpress and EdkIIGluePciLibCf8: can only be mutual exclusively used.

 #endif

 

-#if defined (__EDKII_GLUE_DXE_HOB_LIB__) && (__EDKII_GLUE_PEI_HOB_LIB__)

+#if defined(__EDKII_GLUE_DXE_HOB_LIB__) && defined(__EDKII_GLUE_PEI_HOB_LIB__)

   #error EdkIIGlueDxeHobLib and EdkIIGluePeiHobLib: can only be mutual exclusively used.

 #endif

 

@@ -645,6 +663,14 @@ Abstract:
   #error EdkIIGlueDxeReportStatusCodeLib and EdkIIGluePeiReportStatusCodeLib: can only be mutual exclusively used.

 #endif

 

+#if defined(__EDKII_GLUE_SMM_RUNTIME_DXE_REPORT_STATUS_CODE_LIB__) && defined(__EDKII_GLUE_PEI_REPORT_STATUS_CODE_LIB__)

+  #error EdkIIGlueSmmRuntimeDxeReportStatusCodeLib and EdkIIGluePeiReportStatusCodeLib: can only be mutual exclusively used.

+#endif

+

+#if defined(__EDKII_GLUE_DXE_REPORT_STATUS_CODE_LIB__) && defined(__EDKII_GLUE_SMM_RUNTIME_DXE_REPORT_STATUS_CODE_LIB__)

+  #error EdkIIGlueDxeReportStatusCodeLib and EdkIIGlueSmmRuntimeDxeReportStatusCodeLib: can only be mutual exclusively used.

+#endif

+

 #if defined(__EDKII_GLUE_DXE_MEMORY_ALLOCATION_LIB__) && defined(__EDKII_GLUE_PEI_MEMORY_ALLOCATION_LIB__)

   #error EdkIIGlueDxeMemoryAllocationLib and EdkIIGluePeiMemoryAllocationLib: can only be mutual exclusively used.

 #endif

@@ -661,8 +687,12 @@ Abstract:
 // Some instances must be supplied

 //

 #ifdef __EDKII_GLUE_PEI_DXE_DEBUG_LIB_REPORT_STATUS_CODE__

-  #if !defined(__EDKII_GLUE_DXE_REPORT_STATUS_CODE_LIB__) && !defined(__EDKII_GLUE_PEI_REPORT_STATUS_CODE_LIB__)

-    #error You use EdkIIGluePeiDxeDebugLibReportStatusCode, so either EdkIIGlueDxeReportStatusCodeLib or EdkIIGluePeiReportStatusCodeLib must be supplied

+  #if !defined(__EDKII_GLUE_DXE_REPORT_STATUS_CODE_LIB__) \

+      && !defined(__EDKII_GLUE_PEI_REPORT_STATUS_CODE_LIB__) \

+      && !defined(__EDKII_GLUE_SMM_RUNTIME_DXE_REPORT_STATUS_CODE_LIB__)

+    #error You use EdkIIGluePeiDxeDebugLibReportStatusCode, \

+      so either EdkIIGlueDxeReportStatusCodeLib, EdkIIGluePeiReportStatusCodeLib, \

+      or EdkIIGlueSmmRuntimeDxeReportStatusCodeLib must be supplied

   #endif

 #endif

 

@@ -689,6 +719,7 @@ Abstract:
 // DxeIoLibCpuIo                    IoLibConstructor()

 // UefiRuntimeServicesTableLib      UefiRuntimeServicesTableLibConstructor()

 // EdkDxeRuntimeDriverLib           RuntimeDriverLibConstruct()

+// SmmRuntimeDxeReportStatusCodeLib ReportStatusCodeLibConstruct()

 // DxeHobLib                        HobLibConstructor()

 // UefiDriverModelLib               UefiDriverModelLibConstructor()

 // PeiServicesTablePointerLib       PeiServicesTablePointerLibConstructor()

@@ -735,6 +766,15 @@ RuntimeDriverLibConstruct (
   );

 #endif

 

+#ifdef __EDKII_GLUE_SMM_RUNTIME_DXE_REPORT_STATUS_CODE_LIB__

+EFI_STATUS

+EFIAPI

+ReportStatusCodeLibConstruct (

+  IN EFI_HANDLE           ImageHandle,

+  IN EFI_SYSTEM_TABLE     *SystemTable

+  );

+#endif

+

 #ifdef __EDKII_GLUE_DXE_HOB_LIB__

 EFI_STATUS

 EFIAPI

@@ -812,6 +852,7 @@ DxeSalLibConstructor (
 // NOTE: the destructors must be called according to dependency order

 //

 // UefiDriverModelLibDestructor    UefiDriverModelLibDestructor()

+// SmmRuntimeDxeReportStatusCodeLib ReportStatusCodeLibDestruct()

 // EdkDxeRuntimeDriverLib          RuntimeDriverLibDeconstruct()

 //

 #ifdef __EDKII_GLUE_UEFI_DRIVER_MODEL_LIB__

@@ -823,6 +864,15 @@ UefiDriverModelLibDestructor (
   );

 #endif

 

+#ifdef __EDKII_GLUE_SMM_RUNTIME_DXE_REPORT_STATUS_CODE_LIB__

+EFI_STATUS

+EFIAPI

+ReportStatusCodeLibDestruct (

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

+  );

+#endif

+

 #ifdef __EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__

 EFI_STATUS

 EFIAPI