Clean up some data type mismatches.

[mirror_edk2.git] / Tools / Source / TianoTools / PeiRebase / PeiRebaseExe.c

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