X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FTianoTools%2FPeiRebase%2FPeiRebaseExe.c;fp=Tools%2FSource%2FTianoTools%2FPeiRebase%2FPeiRebaseExe.c;h=7dc95d60afd4182abb9a0ecb8afe680c32643e4e;hb=4df60ea54fd2ee5bf97586f453165ab3533a1aec;hp=e9511644a67f46dac7d3a0aa15ed8d09e0449040;hpb=51d48c2666aac102c522f38609d6017f6fcdd6b1;p=mirror_edk2.git

diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
index e9511644a6..7dc95d60af 100644
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
@@ -29,7 +29,6 @@ Abstract:
 #include <string.h>
 #include "CommonLib.h"
 #include "ParseInf.h"
-// #include <Guid/PeiPeCoffLoader.h>
 #include "FvLib.h"
 
 #include "EfiUtilityMsgs.h"
@@ -38,8 +37,6 @@ Abstract:
 
 #include "PeiRebaseExe.h"
 
-extern PEI_PE_COFF_LOADER_PROTOCOL  mPeCoffLoader;
-
 EFI_STATUS
 ReadHeader (
   IN FILE       *InputFile,
@@ -491,7 +488,7 @@ Returns:
 --*/
 {
   EFI_STATUS                            Status;
-  EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;
+  PE_COFF_LOADER_IMAGE_CONTEXT          ImageContext;
   UINTN                                 MemoryImagePointer;
   UINTN                                 MemoryImagePointerAligned;
   EFI_PHYSICAL_ADDRESS                  ImageAddress;
@@ -570,9 +567,9 @@ Returns:
     //
     memset (&ImageContext, 0, sizeof (ImageContext));
     ImageContext.Handle     = (VOID *) ((UINTN) CurrentPe32Section.Pe32Section + sizeof (EFI_PE32_SECTION));
-    ImageContext.ImageRead  = (EFI_PEI_PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;
+    ImageContext.ImageRead  = (PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;
 
-    Status                  = mPeCoffLoader.GetImageInfo (&mPeCoffLoader, &ImageContext);
+    Status                  = PeCoffLoaderGetImageInfo (&ImageContext);
 
     if (EFI_ERROR (Status)) {
       Error (NULL, 0, 0, "GetImageInfo() call failed on rebase", FileGuidString);
@@ -593,7 +590,7 @@ Returns:
 
     ImageContext.ImageAddress = MemoryImagePointerAligned;
 
-    Status                    = mPeCoffLoader.LoadImage (&mPeCoffLoader, &ImageContext);
+    Status                    = PeCoffLoaderLoadImage (&ImageContext);
     if (EFI_ERROR (Status)) {
       Error (NULL, 0, 0, "LoadImage() call failed on rebase", FileGuidString);
       free ((VOID *) MemoryImagePointer);
@@ -601,7 +598,7 @@ Returns:
     }
 
     ImageContext.DestinationAddress = NewPe32BaseAddress;
-    Status                          = mPeCoffLoader.RelocateImage (&mPeCoffLoader, &ImageContext);
+    Status                          = PeCoffLoaderRelocateImage (&ImageContext);
     if (EFI_ERROR (Status)) {
       Error (NULL, 0, 0, "RelocateImage() call failed on rebase", FileGuidString);
       free ((VOID *) MemoryImagePointer);
@@ -802,9 +799,9 @@ Returns:
     //
     memset (&ImageContext, 0, sizeof (ImageContext));
     ImageContext.Handle     = (VOID *) TEBuffer;
-    ImageContext.ImageRead  = (EFI_PEI_PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;
+    ImageContext.ImageRead  = (PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;
 
-    Status                  = mPeCoffLoader.GetImageInfo (&mPeCoffLoader, &ImageContext);
+    Status                  = PeCoffLoaderGetImageInfo (&ImageContext);
 
     if (EFI_ERROR (Status)) {
       Error (NULL, 0, 0, "GetImageInfo() call failed on rebase of TE image", FileGuidString);
@@ -825,7 +822,7 @@ Returns:
     
 
     ImageContext.ImageAddress = MemoryImagePointerAligned;
-    Status                    = mPeCoffLoader.LoadImage (&mPeCoffLoader, &ImageContext);
+    Status                    = PeCoffLoaderLoadImage (&ImageContext);
     if (EFI_ERROR (Status)) {
       Error (NULL, 0, 0, "LoadImage() call failed on rebase of TE image", FileGuidString);
       free (TEBuffer);
@@ -834,7 +831,7 @@ Returns:
     }
 
     ImageContext.DestinationAddress = NewPe32BaseAddress;
-    Status                          = mPeCoffLoader.RelocateImage (&mPeCoffLoader, &ImageContext);
+    Status                          = PeCoffLoaderRelocateImage (&ImageContext);
     if (EFI_ERROR (Status)) {
       Error (NULL, 0, 0, "RelocateImage() call failed on rebase of TE image", FileGuidString);
       free ((VOID *) MemoryImagePointer);