From aa79b0b3799e95bc21e0df32a135cc5a4d749e4b Mon Sep 17 00:00:00 2001
From: jji4 <jji4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 3 Dec 2008 08:52:39 +0000
Subject: Global variables have been moved backward ahead of functions. Only a
 few cases were left due to its module structure.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6816 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Core/Pei/Image/Image.c       | 23 ---------------
 MdeModulePkg/Core/Pei/PeiMain.h           | 47 +++++++++++++++++++++++++++++--
 MdeModulePkg/Core/Pei/Security/Security.c | 18 ------------
 3 files changed, 45 insertions(+), 43 deletions(-)

(limited to 'MdeModulePkg/Core')

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 23e9ee58d6..e02f7f1367 100644
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -14,29 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "PeiMain.h"
 
-/**
-  The wrapper function of PeiLoadImageLoadImage().
-
-  @param This            - Pointer to EFI_PEI_LOAD_FILE_PPI.
-  @param FileHandle      - Pointer to the FFS file header of the image.
-  @param ImageAddressArg - Pointer to PE/TE image.
-  @param ImageSizeArg    - Size of PE/TE image.
-  @param EntryPoint      - Pointer to entry point of specified image file for output.
-  @param AuthenticationState - Pointer to attestation authentication state of image.
-
-  @return Status of PeiLoadImageLoadImage().
-
-**/
-EFI_STATUS
-EFIAPI
-PeiLoadImageLoadImageWrapper (
-  IN     CONST EFI_PEI_LOAD_FILE_PPI  *This,
-  IN     EFI_PEI_FILE_HANDLE          FileHandle,
-  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL
-  OUT    UINT64                       *ImageSizeArg,     OPTIONAL
-  OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,
-  OUT    UINT32                       *AuthenticationState
-  );
 
 EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {
   PeiLoadImageLoadImageWrapper
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 983c102ec0..1a5201c1d1 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -284,8 +284,8 @@ PeiDispatcher (
   @param PrivateData     PeiCore's private data structure
   @param OldCoreData     Old data from SecCore
                          NULL if being run in non-permament memory mode.
-  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size 
-  											 and location of temporary RAM, the stack location and the BFV location.
+  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size
+                         and location of temporary RAM, the stack location and the BFV location.
 
 **/
 VOID
@@ -1023,4 +1023,47 @@ ProcessFvFile (
   OUT UINT32                 *AuthenticationState
   );
 
+/**
+  The wrapper function of PeiLoadImageLoadImage().
+
+  @param This            - Pointer to EFI_PEI_LOAD_FILE_PPI.
+  @param FileHandle      - Pointer to the FFS file header of the image.
+  @param ImageAddressArg - Pointer to PE/TE image.
+  @param ImageSizeArg    - Size of PE/TE image.
+  @param EntryPoint      - Pointer to entry point of specified image file for output.
+  @param AuthenticationState - Pointer to attestation authentication state of image.
+
+  @return Status of PeiLoadImageLoadImage().
+
+**/
+EFI_STATUS
+EFIAPI
+PeiLoadImageLoadImageWrapper (
+  IN     CONST EFI_PEI_LOAD_FILE_PPI  *This,
+  IN     EFI_PEI_FILE_HANDLE          FileHandle,
+  OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL
+  OUT    UINT64                       *ImageSizeArg,     OPTIONAL
+  OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,
+  OUT    UINT32                       *AuthenticationState
+  );
+
+/**
+
+  Provide a callback for when the security PPI is installed.
+
+  @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.
+  @param NotifyDescriptor   The descriptor for the notification event.
+  @param Ppi                Pointer to the PPI in question.
+
+  @return Always success
+
+**/
+EFI_STATUS
+EFIAPI
+SecurityPpiNotifyCallback (
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,
+  IN VOID                       *Ppi
+  );
+
 #endif
diff --git a/MdeModulePkg/Core/Pei/Security/Security.c b/MdeModulePkg/Core/Pei/Security/Security.c
index 27c4f52f1b..12924bf720 100644
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/MdeModulePkg/Core/Pei/Security/Security.c
@@ -14,24 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "PeiMain.h"
 
-/**
-
-  Provide a callback for when the security PPI is installed.
-
-  @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.
-  @param NotifyDescriptor   The descriptor for the notification event.
-  @param Ppi                Pointer to the PPI in question.
-
-  @return Always success
-
-**/
-EFI_STATUS
-EFIAPI
-SecurityPpiNotifyCallback (
-  IN EFI_PEI_SERVICES           **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,
-  IN VOID                       *Ppi
-  );
 
 EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {
    EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
-- 
cgit v1.2.3