On Fri, Jun 21, 2024 at 15:39:01 +0200, Marcin Juszkiewicz wrote:
> uncrustify is required in EDK2 repository. SbsaQemu (and other platforms
> in edk2-platforms) code was free from using it IIRC.
>
> Reformat all files to make new contributions easier. We can recommend
> formatting sources without generating extra work for developers.
>
> Signed-off-by: Marcin Juszkiewicz <[email protected]>
Everything in here except one thing is improvement.
> ---
> .../Include/Library/QemuOpenFwCfgLib.h | 7 +-
> .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.h | 50 +-
> .../Include/IndustryStandard/SbsaQemuAcpi.h | 86 +--
> .../SbsaQemuPlatformVersion.h | 2 +-
> .../Include/IndustryStandard/SbsaQemuSmc.h | 14 +-
> .../Include/Library/HardwareInfoLib.h | 8 +-
> .../BoardBootManagerLib/BoardBootManager.c | 14 +-
> .../Library/PeiReportFvLib/PeiReportFvLib.c | 237 ++++-----
> .../QemuOpenBoardPkg/PlatformInitPei/Memory.c | 4 +-
> .../Qemu/SbsaQemu/OemMiscLib/OemMiscLib.c | 78 +--
> .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 490 +++++++++---------
> .../SbsaQemuHighMemDxe/SbsaQemuHighMemDxe.c | 8 +-
> .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 88 ++--
> .../SbsaQemuSmbiosDxe/SbsaQemuSmbiosDxe.c | 94 ++--
> .../SbsaQemuHardwareInfoLib.c | 66 +--
> .../Library/SbsaQemuLib/SbsaQemuLib.c | 23 +-
> .../Library/SbsaQemuLib/SbsaQemuMem.c | 49 +-
> .../SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c | 14 +-
> .../SbsaQemuPciHostBridgeLib.c | 90 ++--
> 19 files changed, 735 insertions(+), 687 deletions(-)
>
> --- a/Platform/Qemu/QemuOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
> +++ b/Platform/Qemu/QemuOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
> @@ -16,7 +16,7 @@
> #include <Ppi/FirmwareVolumeInfo2.h>
>
> // Use a FV pointer PCD to get a pointer to the FileSystemGuid in the FV
> header
> -#define PCD_TO_FV_HEADER_FILE_SYSTEM_GUID(Pcd)
> (&((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN) PcdGet32 (Pcd))->FileSystemGuid)
> +#define PCD_TO_FV_HEADER_FILE_SYSTEM_GUID(Pcd)
> (&((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN) PcdGet32 (Pcd))->FileSystemGuid)
>
> /**
> Reports FVs necessary for MinPlarform pre-memory initialization
> @@ -38,13 +38,14 @@ ReportPreMemFv (
>
> DEBUG_CODE (
> for (Index = 0; Status == EFI_SUCCESS; Index++) {
> - Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid,
> Index, &Descriptor, (VOID**) &Ppi);
> - if (!EFI_ERROR (Status)) {
> - FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) Ppi->FvInfo;
> - DEBUG ((DEBUG_INFO, "Found FV at 0x%x, size 0x%x\n", FvHeader,
> FvHeader->FvLength));
> - }
> + Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid,
> Index, &Descriptor, (VOID **)&Ppi);
> + if (!EFI_ERROR (Status)) {
> + FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)Ppi->FvInfo;
> + DEBUG ((DEBUG_INFO, "Found FV at 0x%x, size 0x%x\n", FvHeader,
> FvHeader->FvLength));
Uncrustify gets this hunk wrong.
> }
> - );
> + }
> +
> + );
And this too.
Michael, do you have any known tweaks for this format?
Marcin, since the point was to clean up SbsaQemu, maybe you could
re-run this without including QemuOpenBoardPkg?
Regards,
Leif
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119672): https://edk2.groups.io/g/devel/message/119672
Mute This Topic: https://groups.io/mt/106798688/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
