ShellPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the ShellPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:13 -08:00
committed by mergify[bot]
parent c411b485b6
commit 47d20b54f9
211 changed files with 30269 additions and 27004 deletions

View File

@ -13,7 +13,7 @@
#include "AcpiTableParser.h"
// Local Variables
STATIC CONST UINT64* XsdtAddress;
STATIC CONST UINT64 *XsdtAddress;
/**
This function validates the RSDT Address.
@ -26,19 +26,19 @@ STATIC
VOID
EFIAPI
ValidateRsdtAddress (
IN UINT8* Ptr,
IN VOID* Context
IN UINT8 *Ptr,
IN VOID *Context
)
{
#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
// Reference: Server Base Boot Requirements System Software on ARM Platforms
// Section: 4.2.1.1 RSDP
// Root System Description Pointer (RSDP), ACPI ? 5.2.5.
// - Within the RSDP, the RsdtAddress field must be null (zero) and the
// XsdtAddresss MUST be a valid, non-null, 64-bit value.
UINT32 RsdtAddr;
UINT32 RsdtAddr;
RsdtAddr = *(UINT32*)Ptr;
RsdtAddr = *(UINT32 *)Ptr;
if (RsdtAddr != 0) {
IncrementErrorCount ();
@ -47,7 +47,8 @@ ValidateRsdtAddress (
RsdtAddr
);
}
#endif
#endif
}
/**
@ -61,19 +62,19 @@ STATIC
VOID
EFIAPI
ValidateXsdtAddress (
IN UINT8* Ptr,
IN VOID* Context
IN UINT8 *Ptr,
IN VOID *Context
)
{
#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
// Reference: Server Base Boot Requirements System Software on ARM Platforms
// Section: 4.2.1.1 RSDP
// Root System Description Pointer (RSDP), ACPI ? 5.2.5.
// - Within the RSDP, the RsdtAddress field must be null (zero) and the
// XsdtAddresss MUST be a valid, non-null, 64-bit value.
UINT64 XsdtAddr;
UINT64 XsdtAddr;
XsdtAddr = *(UINT64*)Ptr;
XsdtAddr = *(UINT64 *)Ptr;
if (XsdtAddr == 0) {
IncrementErrorCount ();
@ -82,23 +83,24 @@ ValidateXsdtAddress (
XsdtAddr
);
}
#endif
#endif
}
/**
An array describing the ACPI RSDP Table.
**/
STATIC CONST ACPI_PARSER RsdpParser[] = {
{L"Signature", 8, 0, NULL, Dump8Chars, NULL, NULL, NULL},
{L"Checksum", 1, 8, L"0x%x", NULL, NULL, NULL, NULL},
{L"Oem ID", 6, 9, NULL, Dump6Chars, NULL, NULL, NULL},
{L"Revision", 1, 15, L"%d", NULL, NULL, NULL, NULL},
{L"RSDT Address", 4, 16, L"0x%x", NULL, NULL, ValidateRsdtAddress, NULL},
{L"Length", 4, 20, L"%d", NULL, NULL, NULL, NULL},
{L"XSDT Address", 8, 24, L"0x%lx", NULL, (VOID**)&XsdtAddress,
ValidateXsdtAddress, NULL},
{L"Extended Checksum", 1, 32, L"0x%x", NULL, NULL, NULL, NULL},
{L"Reserved", 3, 33, L"%x %x %x", Dump3Chars, NULL, NULL, NULL}
STATIC CONST ACPI_PARSER RsdpParser[] = {
{ L"Signature", 8, 0, NULL, Dump8Chars, NULL, NULL, NULL },
{ L"Checksum", 1, 8, L"0x%x", NULL, NULL, NULL, NULL },
{ L"Oem ID", 6, 9, NULL, Dump6Chars, NULL, NULL, NULL },
{ L"Revision", 1, 15, L"%d", NULL, NULL, NULL, NULL },
{ L"RSDT Address", 4, 16, L"0x%x", NULL, NULL, ValidateRsdtAddress, NULL },
{ L"Length", 4, 20, L"%d", NULL, NULL, NULL, NULL },
{ L"XSDT Address", 8, 24, L"0x%lx", NULL, (VOID **)&XsdtAddress,
ValidateXsdtAddress, NULL },
{ L"Extended Checksum", 1, 32, L"0x%x", NULL, NULL, NULL, NULL },
{ L"Reserved", 3, 33, L"%x %x %x", Dump3Chars, NULL, NULL, NULL }
};
/**
@ -118,10 +120,10 @@ STATIC CONST ACPI_PARSER RsdpParser[] = {
VOID
EFIAPI
ParseAcpiRsdp (
IN BOOLEAN Trace,
IN UINT8* Ptr,
IN UINT32 AcpiTableLength,
IN UINT8 AcpiTableRevision
IN BOOLEAN Trace,
IN UINT8 *Ptr,
IN UINT32 AcpiTableLength,
IN UINT8 AcpiTableRevision
)
{
if (Trace) {
@ -144,7 +146,7 @@ ParseAcpiRsdp (
IncrementErrorCount ();
Print (
L"ERROR: Insufficient table length. AcpiTableLength = %d." \
L"RSDP parsing aborted.\n",
L"RSDP parsing aborted.\n",
AcpiTableLength
);
return;
@ -160,5 +162,5 @@ ParseAcpiRsdp (
return;
}
ProcessAcpiTable ((UINT8*)(UINTN)(*XsdtAddress));
ProcessAcpiTable ((UINT8 *)(UINTN)(*XsdtAddress));
}