From edcfaa96a79bfd9d3c6d4c9353339c1b395cc178 Mon Sep 17 00:00:00 2001 From: Mikhail Krichanov Date: Thu, 31 Aug 2023 17:28:56 +0300 Subject: [PATCH] MdeModulePkg/Core: Fixed code style. --- MdeModulePkg/Core/Dxe/Image/Image.c | 2 +- MdeModulePkg/Core/Pei/Image/Image.c | 43 ++++++++++++++--------------- MdeModulePkg/Core/Pei/PeiMain.h | 6 ++-- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c index 73a3205e37..6b5c716c0d 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -428,7 +428,7 @@ GetUefiImageFixLoadingAssignedAddress ( Status = CheckAndMarkFixLoadingMemoryUsageBitMap (FixLoadingAddress, ImageDestSize); *LoadAddress = FixLoadingAddress; - DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED INFO: Loading module at fixed address 0x%11p. Status = %r \n", (VOID *)(UINTN)FixLoadingAddress, Status)); + DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED INFO: Loading module at fixed address 0x%11p. Status = %r \n", (VOID *)(UINTN)FixLoadingAddress, Status)); return Status; } diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c index 277e2806d7..eb7c644e0a 100644 --- a/MdeModulePkg/Core/Pei/Image/Image.c +++ b/MdeModulePkg/Core/Pei/Image/Image.c @@ -154,31 +154,31 @@ GetUefiImageFixLoadingAssignedAddress ( **/ EFI_STATUS LoadAndRelocateUefiImage ( - IN EFI_PEI_FILE_HANDLE FileHandle, - IN VOID *Pe32Data, - IN UINT32 Pe32DataSize, - OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT *ImageContext, - OUT EFI_PHYSICAL_ADDRESS *ImageAddress, - OUT UINTN *DebugBase + IN EFI_PEI_FILE_HANDLE FileHandle, + IN VOID *Pe32Data, + IN UINT32 Pe32DataSize, + OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT *ImageContext, + OUT EFI_PHYSICAL_ADDRESS *ImageAddress, + OUT UINTN *DebugBase ) { EFI_STATUS Status; BOOLEAN Success; PEI_CORE_INSTANCE *Private; - UINT32 ImageSize; - UINT32 ImageAlignment; - UINT64 ValueInSectionHeader; + UINT32 ImageSize; + UINT32 ImageAlignment; + UINT64 ValueInSectionHeader; BOOLEAN IsXipImage; EFI_STATUS ReturnStatus; BOOLEAN IsS3Boot; BOOLEAN IsPeiModule; BOOLEAN IsRegisterForShadow; EFI_FV_FILE_INFO FileInfo; - UINT32 DestinationPages; - UINT32 DestinationSize; - EFI_PHYSICAL_ADDRESS Destination; - UINT16 Machine; - BOOLEAN LoadDynamically; + UINT32 DestinationPages; + UINT32 DestinationSize; + EFI_PHYSICAL_ADDRESS Destination; + UINT16 Machine; + BOOLEAN LoadDynamically; Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ()); @@ -357,12 +357,12 @@ LoadAndRelocateUefiImage ( **/ EFI_STATUS LoadAndRelocateUefiImageInPlace ( - IN VOID *Pe32Data, + IN VOID *Pe32Data, IN VOID *ImageAddress, IN UINT32 ImageSize ) { - EFI_STATUS Status; + EFI_STATUS Status; UEFI_IMAGE_LOADER_IMAGE_CONTEXT ImageContext; ASSERT (Pe32Data != ImageAddress); @@ -455,11 +455,11 @@ PeiLoadImageLoadImage ( OUT UINT32 *AuthenticationState ) { - EFI_STATUS Status; - VOID *Pe32Data; - UINT32 Pe32DataSize; - EFI_PHYSICAL_ADDRESS ImageAddress; - UINTN DebugBase; + EFI_STATUS Status; + VOID *Pe32Data; + UINT32 Pe32DataSize; + EFI_PHYSICAL_ADDRESS ImageAddress; + UINTN DebugBase; UEFI_IMAGE_LOADER_IMAGE_CONTEXT ImageContext; *EntryPoint = 0; @@ -541,7 +541,6 @@ PeiLoadImageLoadImage ( EfiFileName, sizeof (EfiFileName) ); - if (!RETURN_ERROR (Status)) { DEBUG ((DEBUG_INFO | DEBUG_LOAD, "%a", EfiFileName)); } diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h index 3db917e4bb..0552725a48 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.h +++ b/MdeModulePkg/Core/Pei/PeiMain.h @@ -1428,7 +1428,7 @@ InitializeImageServices ( **/ EFI_STATUS LoadAndRelocateUefiImageInPlace ( - IN VOID *Pe32Data, + IN VOID *Pe32Data, IN VOID *ImageAddress, IN UINT32 ImageSize ); @@ -1446,8 +1446,8 @@ LoadAndRelocateUefiImageInPlace ( EFI_STATUS PeiGetPe32Data ( IN EFI_PEI_FILE_HANDLE FileHandle, - OUT VOID **Pe32Data, - OUT UINT32 *Pe32DataSize + OUT VOID **Pe32Data, + OUT UINT32 *Pe32DataSize ); /**