From 429309e0c6b74792d679681a8edd0d5ae0ff850c Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:53:50 -0800 Subject: ArmPkg: Apply uncrustify changes REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the ArmPkg package Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Andrew Fish --- .../SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 151 +++++++++++---------- 1 file changed, 78 insertions(+), 73 deletions(-) (limited to 'ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c') diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c index 2506c03..b49c4b7 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c @@ -18,27 +18,26 @@ #include "SmbiosMisc.h" - typedef struct { - CONST CHAR8* MonthStr; - UINT32 MonthInt; + CONST CHAR8 *MonthStr; + UINT32 MonthInt; } MONTH_DESCRIPTION; STATIC CONST -MONTH_DESCRIPTION mMonthDescription[] = { - { "Jan", 1 }, - { "Feb", 2 }, - { "Mar", 3 }, - { "Apr", 4 }, - { "May", 5 }, - { "Jun", 6 }, - { "Jul", 7 }, - { "Aug", 8 }, - { "Sep", 9 }, +MONTH_DESCRIPTION mMonthDescription[] = { + { "Jan", 1 }, + { "Feb", 2 }, + { "Mar", 3 }, + { "Apr", 4 }, + { "May", 5 }, + { "Jun", 6 }, + { "Jul", 7 }, + { "Aug", 8 }, + { "Sep", 9 }, { "Oct", 10 }, { "Nov", 11 }, { "Dec", 12 }, - { "???", 1 }, // Use 1 as default month + { "???", 1 }, // Use 1 as default month }; /** @@ -55,7 +54,7 @@ Base2ToByteWith64KUnit ( IN UINTN Value ) { - UINT8 Size; + UINT8 Size; Size = ((Value + (SIZE_64KB - 1)) >> 16); @@ -69,12 +68,12 @@ Base2ToByteWith64KUnit ( **/ VOID GetReleaseTime ( - OUT EFI_TIME *Time + OUT EFI_TIME *Time ) { - CONST CHAR8 *ReleaseDate = __DATE__; - CONST CHAR8 *ReleaseTime = __TIME__; - UINTN i; + CONST CHAR8 *ReleaseDate = __DATE__; + CONST CHAR8 *ReleaseTime = __TIME__; + UINTN i; for (i = 0; i < 12; i++) { if (AsciiStrnCmp (ReleaseDate, mMonthDescription[i].MonthStr, 3) == 0) { @@ -82,10 +81,10 @@ GetReleaseTime ( } } - Time->Month = mMonthDescription[i].MonthInt; - Time->Day = AsciiStrDecimalToUintn (ReleaseDate + 4); - Time->Year = AsciiStrDecimalToUintn (ReleaseDate + 7); - Time->Hour = AsciiStrDecimalToUintn (ReleaseTime); + Time->Month = mMonthDescription[i].MonthInt; + Time->Day = AsciiStrDecimalToUintn (ReleaseDate + 4); + Time->Year = AsciiStrDecimalToUintn (ReleaseDate + 7); + Time->Hour = AsciiStrDecimalToUintn (ReleaseTime); Time->Minute = AsciiStrDecimalToUintn (ReleaseTime + 3); Time->Second = AsciiStrDecimalToUintn (ReleaseTime + 6); } @@ -101,23 +100,24 @@ GetBiosReleaseDate ( VOID ) { - CHAR16 *ReleaseDate; - EFI_TIME BuildTime; + CHAR16 *ReleaseDate; + EFI_TIME BuildTime; ReleaseDate = AllocateZeroPool ((sizeof (CHAR16)) * SMBIOS_STRING_MAX_LENGTH); if (ReleaseDate == NULL) { - return NULL; + return NULL; } GetReleaseTime (&BuildTime); - (VOID)UnicodeSPrintAsciiFormat (ReleaseDate, - (sizeof (CHAR16)) * SMBIOS_STRING_MAX_LENGTH, - "%02d/%02d/%4d", - BuildTime.Month, - BuildTime.Day, - BuildTime.Year - ); + (VOID)UnicodeSPrintAsciiFormat ( + ReleaseDate, + (sizeof (CHAR16)) * SMBIOS_STRING_MAX_LENGTH, + "%02d/%02d/%4d", + BuildTime.Month, + BuildTime.Day, + BuildTime.Year + ); return ReleaseDate; } @@ -133,14 +133,13 @@ GetBiosVersion ( VOID ) { - CHAR16 *ReleaseString; + CHAR16 *ReleaseString; ReleaseString = (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString); return ReleaseString; } - /** This function makes boot time changes to the contents of the MiscBiosVendor (Type 0) record. @@ -153,23 +152,22 @@ GetBiosVersion ( @retval EFI_OUT_OF_RESOURCES Failed to allocate required memory. **/ -SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) -{ - CHAR8 *OptionalStrStart; - CHAR8 *StrStart; - UINTN VendorStrLen; - UINTN VerStrLen; - UINTN DateStrLen; - UINTN BiosPhysicalSize; - CHAR16 *Vendor; - CHAR16 *Version; - CHAR16 *ReleaseDate; - CHAR16 *Char16String; - EFI_STATUS Status; - EFI_STRING_ID TokenToUpdate; - EFI_STRING_ID TokenToGet; - SMBIOS_TABLE_TYPE0 *SmbiosRecord; - SMBIOS_TABLE_TYPE0 *InputData; +SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) { + CHAR8 *OptionalStrStart; + CHAR8 *StrStart; + UINTN VendorStrLen; + UINTN VerStrLen; + UINTN DateStrLen; + UINTN BiosPhysicalSize; + CHAR16 *Vendor; + CHAR16 *Version; + CHAR16 *ReleaseDate; + CHAR16 *Char16String; + EFI_STATUS Status; + EFI_STRING_ID TokenToUpdate; + EFI_STRING_ID TokenToGet; + SMBIOS_TABLE_TYPE0 *SmbiosRecord; + SMBIOS_TABLE_TYPE0 *InputData; // // First check for invalid parameters. @@ -180,20 +178,20 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) InputData = (SMBIOS_TABLE_TYPE0 *)RecordData; - Vendor = (CHAR16 *) PcdGetPtr (PcdFirmwareVendor); + Vendor = (CHAR16 *)PcdGetPtr (PcdFirmwareVendor); if (StrLen (Vendor) > 0) { TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VENDOR); HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Vendor, NULL); } - Version = GetBiosVersion(); + Version = GetBiosVersion (); if (StrLen (Version) > 0) { TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VERSION); HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); } else { - Version = (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString); + Version = (CHAR16 *)PcdGetPtr (PcdFirmwareVersionString); if (StrLen (Version) > 0) { TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VERSION); HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); @@ -201,22 +199,22 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) } Char16String = GetBiosReleaseDate (); - if (StrLen(Char16String) > 0) { + if (StrLen (Char16String) > 0) { TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_RELEASE_DATE); HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Char16String, NULL); } - TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VENDOR); - Vendor = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); + TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VENDOR); + Vendor = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); VendorStrLen = StrLen (Vendor); TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VERSION); - Version = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); - VerStrLen = StrLen (Version); + Version = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); + VerStrLen = StrLen (Version); - TokenToGet = STRING_TOKEN (STR_MISC_BIOS_RELEASE_DATE); + TokenToGet = STRING_TOKEN (STR_MISC_BIOS_RELEASE_DATE); ReleaseDate = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); - DateStrLen = StrLen (ReleaseDate); + DateStrLen = StrLen (ReleaseDate); // // Now update the BiosPhysicalSize @@ -226,9 +224,11 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) // // Two zeros following the last string. // - SmbiosRecord = AllocateZeroPool (sizeof (SMBIOS_TABLE_TYPE0) + VendorStrLen + 1 + - VerStrLen + 1 + - DateStrLen + 1 + 1); + SmbiosRecord = AllocateZeroPool ( + sizeof (SMBIOS_TABLE_TYPE0) + VendorStrLen + 1 + + VerStrLen + 1 + + DateStrLen + 1 + 1 + ); if (SmbiosRecord == NULL) { Status = EFI_OUT_OF_RESOURCES; goto Exit; @@ -236,7 +236,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) (VOID)CopyMem (SmbiosRecord, InputData, sizeof (SMBIOS_TABLE_TYPE0)); - SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE0); + SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE0); SmbiosRecord->BiosSegment = (UINT16)(FixedPcdGet32 (PcdFdBaseAddress) / SIZE_64KB); if (BiosPhysicalSize < SIZE_16MB) { SmbiosRecord->BiosSize = Base2ToByteWith64KUnit (BiosPhysicalSize) - 1; @@ -251,13 +251,13 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) } } - SmbiosRecord->SystemBiosMajorRelease = (UINT8) (PcdGet16 (PcdSystemBiosRelease) >> 8); - SmbiosRecord->SystemBiosMinorRelease = (UINT8) (PcdGet16 (PcdSystemBiosRelease) & 0xFF); + SmbiosRecord->SystemBiosMajorRelease = (UINT8)(PcdGet16 (PcdSystemBiosRelease) >> 8); + SmbiosRecord->SystemBiosMinorRelease = (UINT8)(PcdGet16 (PcdSystemBiosRelease) & 0xFF); SmbiosRecord->EmbeddedControllerFirmwareMajorRelease = (UINT16) - (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) >> 8); + (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) >> 8); SmbiosRecord->EmbeddedControllerFirmwareMinorRelease = (UINT16) - (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) & 0xFF); + (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) & 0xFF); OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); UnicodeStrToAsciiStrS (Vendor, OptionalStrStart, VendorStrLen + 1); @@ -268,10 +268,15 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) // // Now we have got the full smbios record, call smbios protocol to add this record. // - Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); + Status = SmbiosMiscAddRecord ((UINT8 *)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n", - __FUNCTION__, DEBUG_LINE_NUMBER, Status)); + DEBUG (( + DEBUG_ERROR, + "[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n", + __FUNCTION__, + DEBUG_LINE_NUMBER, + Status + )); } FreePool (SmbiosRecord); -- cgit v1.1