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

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

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
index 8aa355e127576e66e47682be32f4df8bdfb0813c..c1d51022570047a67dcd8a0f830b1c3632b765ec 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
@@ -39,8 +39,13 @@ Abstract:
 #include "EfiFirmwareVolumeHeader.h"\r
 #include "EfiFirmwareFileSystem.h"\r
 #include "PeiHob.h"\r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+#include "TianoHii.h"\r
+#else\r
 #include "EfiInternalFormRepresentation.h"\r
+#endif\r
 #include "EfiStatusCode.h"\r
+#include "EfiPerf.h"\r
 \r
 //\r
 // IPF only\r
@@ -90,10 +95,20 @@ Abstract:
 // resolved when porting a module to real EDK II\r
 //\r
 #include EFI_GUID_DEFINITION (StatusCodeDataTypeId)\r
+#include EFI_GUID_DEFINITION (PeiPerformanceHob)\r
 \r
 //\r
 // Protocol definitions\r
 //\r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+#include EFI_PROTOCOL_DEFINITION (FormBrowser2)\r
+#include EFI_PROTOCOL_DEFINITION (HiiConfigAccess)\r
+#include EFI_PROTOCOL_DEFINITION (HiiConfigRouting)\r
+#include EFI_PROTOCOL_DEFINITION (HiiDatabase)\r
+#include EFI_PROTOCOL_DEFINITION (HiiFont)\r
+#include EFI_PROTOCOL_DEFINITION (HiiImage)\r
+#include EFI_PROTOCOL_DEFINITION (HiiString)\r
+#endif\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)\r
@@ -120,7 +135,9 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (BootScriptSave)\r
 #include EFI_PROTOCOL_DEFINITION (BusSpecificDriverOverride)\r
 #include EFI_PROTOCOL_DEFINITION (ComponentName)\r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 #include EFI_PROTOCOL_DEFINITION (ComponentName2)\r
+#endif\r
 #include EFI_PROTOCOL_DEFINITION (CpuIo)\r
 #include EFI_PROTOCOL_DEFINITION (DataHub)\r
 #include EFI_PROTOCOL_DEFINITION (DebugPort)\r
@@ -140,10 +157,14 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (FirmwareVolume)\r
 #include EFI_PROTOCOL_DEFINITION (FirmwareVolumeBlock)\r
 #include EFI_PROTOCOL_DEFINITION (FirmwareVolumeDispatch)\r
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)\r
 #include EFI_PROTOCOL_DEFINITION (FormBrowser)\r
 #include EFI_PROTOCOL_DEFINITION (FormCallback)\r
+#endif\r
 #include EFI_PROTOCOL_DEFINITION (GuidedSectionExtraction)\r
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)\r
 #include EFI_PROTOCOL_DEFINITION (Hii)\r
+#endif\r
 #include EFI_PROTOCOL_DEFINITION (IdeControllerInit)\r
 #include EFI_PROTOCOL_DEFINITION (IncompatiblePciDeviceSupport)\r
 #include EFI_PROTOCOL_DEFINITION (Legacy8259)\r