Remove PeCoffLoader library class and its instances.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain.h

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index f17f9ab400018a5ca39bb2f4a254c7b0696722dd..b0330092754a12073ead876d495c20eca10995cb 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -23,14 +23,10 @@ Revision History
 #define _DXE_MAIN_H_\r
 \r
 \r
-//\r
-// The package level header files this module uses\r
-//\r
+\r
 #include <PiDxe.h>\r
 #include <FrameworkPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
+\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/GuidedSectionExtraction.h>\r
 #include <Protocol/SectionExtraction.h>\r
@@ -43,7 +39,7 @@ Revision History
 #include <Protocol/PlatformDriverOverride.h>\r
 #include <Protocol/Variable.h>\r
 #include <Guid/MemoryTypeInformation.h>\r
-#include <Guid/FirmwareFileSystem.h>\r
+#include <Guid/FirmwareFileSystem2.h>\r
 #include <Guid/HobList.h>\r
 #include <Protocol/Timer.h>\r
 #include <Protocol/SimpleFileSystem.h>\r
@@ -52,7 +48,7 @@ Revision History
 #include <Protocol/RealTimeClock.h>\r
 #include <Guid/Apriori.h>\r
 #include <Protocol/WatchdogTimer.h>\r
-#include <Protocol/FirmwareVolume.h>\r
+#include <Protocol/FirmwareVolume2.h>\r
 #include <Protocol/MonotonicCounter.h>\r
 #include <Guid/DxeServices.h>\r
 #include <Guid/MemoryAllocationHob.h>\r
@@ -74,9 +70,7 @@ Revision History
 #include <Protocol/BusSpecificDriverOverride.h>\r
 #include <Protocol/Performance.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
+\r
 #include <Library/DxeCoreEntryPoint.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiLib.h>\r
@@ -85,9 +79,9 @@ Revision History
 #include <Library/PerformanceLib.h>\r
 #include <Library/UefiDecompressLib.h>\r
 #include <Library/CustomDecompressLib.h>\r
-#include <Library/PeCoffLoaderLib.h>\r
 #include <Library/CacheMaintenanceLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/PeCoffLib.h>\r
 \r
 #include "DebugImageInfo.h"\r
 #include "Library.h"\r
@@ -161,7 +155,7 @@ typedef struct {
   EFI_HANDLE                      FvHandle;\r
   EFI_GUID                        FileName;\r
   EFI_DEVICE_PATH_PROTOCOL        *FvFileDevicePath;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL   *Fv;\r
 \r
   VOID                            *Depex;\r
   UINTN                           DepexSize;\r
@@ -208,7 +202,6 @@ extern EFI_DXE_SERVICES                         *gDxeCoreDS;
 extern EFI_HANDLE                               gDxeCoreImageHandle;\r
 \r
 extern EFI_DECOMPRESS_PROTOCOL                  gEfiDecompress;\r
-extern EFI_PEI_PE_COFF_LOADER_PROTOCOL          *gEfiPeiPeCoffLoader;\r
 \r
 extern EFI_RUNTIME_ARCH_PROTOCOL                *gRuntime;\r
 extern EFI_CPU_ARCH_PROTOCOL                    *gCpu;\r