Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Image / Image.c

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 6ac537b42f8b1a68c76be1620c58520d47a3c094..23f26d3813e2b01c6d5ec72c43dc5addccbf73cd 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -36,15 +36,14 @@ PeiLoadImageLoadImageWrapper (
   OUT    UINT64                       *ImageSizeArg,     OPTIONAL\r
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,\r
   OUT    UINT32                       *AuthenticationState\r
-  )\r
-;\r
+  );\r
 \r
-STATIC EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {\r
+EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {\r
   PeiLoadImageLoadImageWrapper\r
 };\r
 \r
 \r
-STATIC EFI_PEI_PPI_DESCRIPTOR     gPpiLoadFilePpiList = {\r
+EFI_PEI_PPI_DESCRIPTOR     gPpiLoadFilePpiList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiPeiLoadFilePpiGuid,\r
   &mPeiLoadImagePpi\r
@@ -72,7 +71,17 @@ PeiImageRead (
   OUT    VOID    *Buffer\r
   )\r
 {\r
-  CopyMem (Buffer, (VOID *)((UINTN) FileHandle + FileOffset), *ReadSize);\r
+  CHAR8 *Destination8;\r
+  CHAR8 *Source8;\r
+  UINTN Length;\r
+\r
+  Destination8  = Buffer;\r
+  Source8       = (CHAR8 *) ((UINTN) FileHandle + FileOffset);\r
+  Length        = *ReadSize;\r
+  while ((Length--) > 0) {\r
+    *(Destination8++) = *(Source8++);\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -206,7 +215,7 @@ LoadAndRelocatePeCoffImage (
 **/\r
 EFI_STATUS\r
 PeiLoadImageLoadImage (\r
-  IN     EFI_PEI_SERVICES             **PeiServices,\r
+  IN     CONST EFI_PEI_SERVICES       **PeiServices,\r
   IN     EFI_PEI_FILE_HANDLE          FileHandle,\r
   OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL\r
   OUT    UINT64                       *ImageSizeArg,     OPTIONAL\r
@@ -411,7 +420,7 @@ PeiLoadImageLoadImageWrapper (
 **/\r
 EFI_STATUS\r
 PeiLoadImage (\r
-  IN     EFI_PEI_SERVICES             **PeiServices,\r
+  IN     CONST EFI_PEI_SERVICES       **PeiServices,\r
   IN     EFI_PEI_FILE_HANDLE          FileHandle,\r
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,\r
   OUT    UINT32                       *AuthenticationState\r