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
committed by
mergify[bot]
mergify[bot]
parent
c411b485b6
commit
47d20b54f9
@ -17,10 +17,10 @@
|
||||
#include "PpttParser.h"
|
||||
|
||||
// Local variables
|
||||
STATIC CONST UINT8* ProcessorTopologyStructureType;
|
||||
STATIC CONST UINT8* ProcessorTopologyStructureLength;
|
||||
STATIC CONST UINT32* NumberOfPrivateResources;
|
||||
STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
|
||||
STATIC CONST UINT8 *ProcessorTopologyStructureType;
|
||||
STATIC CONST UINT8 *ProcessorTopologyStructureLength;
|
||||
STATIC CONST UINT32 *NumberOfPrivateResources;
|
||||
STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
|
||||
|
||||
/**
|
||||
This function validates the Cache Type Structure (Type 1) 'Number of sets'
|
||||
@ -34,12 +34,13 @@ STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
ValidateCacheNumberOfSets (
|
||||
IN UINT8* Ptr,
|
||||
IN VOID* Context
|
||||
IN UINT8 *Ptr,
|
||||
IN VOID *Context
|
||||
)
|
||||
{
|
||||
UINT32 NumberOfSets;
|
||||
NumberOfSets = *(UINT32*)Ptr;
|
||||
UINT32 NumberOfSets;
|
||||
|
||||
NumberOfSets = *(UINT32 *)Ptr;
|
||||
|
||||
if (NumberOfSets == 0) {
|
||||
IncrementErrorCount ();
|
||||
@ -47,12 +48,12 @@ ValidateCacheNumberOfSets (
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
|
||||
#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
|
||||
if (NumberOfSets > PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX) {
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"\nERROR: When ARMv8.3-CCIDX is implemented the maximum cache number of "
|
||||
L"sets must be less than or equal to %d",
|
||||
L"sets must be less than or equal to %d",
|
||||
PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX
|
||||
);
|
||||
return;
|
||||
@ -62,14 +63,14 @@ ValidateCacheNumberOfSets (
|
||||
IncrementWarningCount ();
|
||||
Print (
|
||||
L"\nWARNING: Without ARMv8.3-CCIDX, the maximum cache number of sets "
|
||||
L"must be less than or equal to %d. Ignore this message if "
|
||||
L"ARMv8.3-CCIDX is implemented",
|
||||
L"must be less than or equal to %d. Ignore this message if "
|
||||
L"ARMv8.3-CCIDX is implemented",
|
||||
PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX
|
||||
);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
@ -84,12 +85,13 @@ STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
ValidateCacheAssociativity (
|
||||
IN UINT8* Ptr,
|
||||
IN VOID* Context
|
||||
IN UINT8 *Ptr,
|
||||
IN VOID *Context
|
||||
)
|
||||
{
|
||||
UINT8 Associativity;
|
||||
Associativity = *(UINT8*)Ptr;
|
||||
UINT8 Associativity;
|
||||
|
||||
Associativity = *(UINT8 *)Ptr;
|
||||
|
||||
if (Associativity == 0) {
|
||||
IncrementErrorCount ();
|
||||
@ -109,25 +111,26 @@ STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
ValidateCacheLineSize (
|
||||
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: ARM Architecture Reference Manual ARMv8 (D.a)
|
||||
// Section D12.2.25: CCSIDR_EL1, Current Cache Size ID Register
|
||||
// LineSize, bits [2:0]
|
||||
// (Log2(Number of bytes in cache line)) - 4.
|
||||
|
||||
UINT16 LineSize;
|
||||
LineSize = *(UINT16*)Ptr;
|
||||
UINT16 LineSize;
|
||||
LineSize = *(UINT16 *)Ptr;
|
||||
|
||||
if ((LineSize < PPTT_ARM_CACHE_LINE_SIZE_MIN) ||
|
||||
(LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX)) {
|
||||
(LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX))
|
||||
{
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"\nERROR: The cache line size must be between %d and %d bytes"
|
||||
L" on ARM Platforms.",
|
||||
L" on ARM Platforms.",
|
||||
PPTT_ARM_CACHE_LINE_SIZE_MIN,
|
||||
PPTT_ARM_CACHE_LINE_SIZE_MAX
|
||||
);
|
||||
@ -138,7 +141,8 @@ ValidateCacheLineSize (
|
||||
IncrementErrorCount ();
|
||||
Print (L"\nERROR: The cache line size is not a power of 2.");
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
@ -152,15 +156,16 @@ STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
ValidateCacheAttributes (
|
||||
IN UINT8* Ptr,
|
||||
IN VOID* Context
|
||||
IN UINT8 *Ptr,
|
||||
IN VOID *Context
|
||||
)
|
||||
{
|
||||
// Reference: Advanced Configuration and Power Interface (ACPI) Specification
|
||||
// Version 6.2 Errata A, September 2017
|
||||
// Table 5-153: Cache Type Structure
|
||||
UINT8 Attributes;
|
||||
Attributes = *(UINT8*)Ptr;
|
||||
UINT8 Attributes;
|
||||
|
||||
Attributes = *(UINT8 *)Ptr;
|
||||
|
||||
if ((Attributes & 0xE0) != 0) {
|
||||
IncrementErrorCount ();
|
||||
@ -175,67 +180,67 @@ ValidateCacheAttributes (
|
||||
/**
|
||||
An ACPI_PARSER array describing the ACPI PPTT Table.
|
||||
**/
|
||||
STATIC CONST ACPI_PARSER PpttParser[] = {
|
||||
STATIC CONST ACPI_PARSER PpttParser[] = {
|
||||
PARSE_ACPI_HEADER (&AcpiHdrInfo)
|
||||
};
|
||||
|
||||
/**
|
||||
An ACPI_PARSER array describing the processor topology structure header.
|
||||
**/
|
||||
STATIC CONST ACPI_PARSER ProcessorTopologyStructureHeaderParser[] = {
|
||||
{L"Type", 1, 0, NULL, NULL, (VOID**)&ProcessorTopologyStructureType,
|
||||
NULL, NULL},
|
||||
{L"Length", 1, 1, NULL, NULL, (VOID**)&ProcessorTopologyStructureLength,
|
||||
NULL, NULL},
|
||||
{L"Reserved", 2, 2, NULL, NULL, NULL, NULL, NULL}
|
||||
STATIC CONST ACPI_PARSER ProcessorTopologyStructureHeaderParser[] = {
|
||||
{ L"Type", 1, 0, NULL, NULL, (VOID **)&ProcessorTopologyStructureType,
|
||||
NULL, NULL },
|
||||
{ L"Length", 1, 1, NULL, NULL, (VOID **)&ProcessorTopologyStructureLength,
|
||||
NULL, NULL },
|
||||
{ L"Reserved", 2, 2, NULL, NULL, NULL, NULL,NULL }
|
||||
};
|
||||
|
||||
/**
|
||||
An ACPI_PARSER array describing the Processor Hierarchy Node Structure - Type 0.
|
||||
**/
|
||||
STATIC CONST ACPI_PARSER ProcessorHierarchyNodeStructureParser[] = {
|
||||
{L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
|
||||
{L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
STATIC CONST ACPI_PARSER ProcessorHierarchyNodeStructureParser[] = {
|
||||
{ L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL },
|
||||
{ L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
|
||||
{L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Parent", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"ACPI Processor ID", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Number of private resources", 4, 16, L"%d", NULL,
|
||||
(VOID**)&NumberOfPrivateResources, NULL, NULL}
|
||||
{ L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Parent", 4, 8, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"ACPI Processor ID", 4, 12, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Number of private resources", 4, 16, L"%d", NULL,
|
||||
(VOID **)&NumberOfPrivateResources, NULL, NULL }
|
||||
};
|
||||
|
||||
/**
|
||||
An ACPI_PARSER array describing the Cache Type Structure - Type 1.
|
||||
**/
|
||||
STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = {
|
||||
{L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
|
||||
{L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = {
|
||||
{ L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL },
|
||||
{ L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
|
||||
{L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets, NULL},
|
||||
{L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity, NULL},
|
||||
{L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NULL},
|
||||
{L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL}
|
||||
{ L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets, NULL },
|
||||
{ L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity, NULL },
|
||||
{ L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NULL },
|
||||
{ L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL }
|
||||
};
|
||||
|
||||
/**
|
||||
An ACPI_PARSER array describing the ID Type Structure - Type 2.
|
||||
**/
|
||||
STATIC CONST ACPI_PARSER IdStructureParser[] = {
|
||||
{L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
|
||||
{L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
STATIC CONST ACPI_PARSER IdStructureParser[] = {
|
||||
{ L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL },
|
||||
{ L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
|
||||
{L"VENDOR_ID", 4, 4, NULL, Dump4Chars, NULL, NULL, NULL},
|
||||
{L"LEVEL_1_ID", 8, 8, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"LEVEL_2_ID", 8, 16, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"MAJOR_REV", 2, 24, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"MINOR_REV", 2, 26, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"SPIN_REV", 2, 28, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{ L"VENDOR_ID", 4, 4, NULL, Dump4Chars, NULL, NULL, NULL },
|
||||
{ L"LEVEL_1_ID", 8, 8, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"LEVEL_2_ID", 8, 16, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"MAJOR_REV", 2, 24, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"MINOR_REV", 2, 26, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"SPIN_REV", 2, 28, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
};
|
||||
|
||||
/**
|
||||
@ -248,13 +253,13 @@ STATIC CONST ACPI_PARSER IdStructureParser[] = {
|
||||
STATIC
|
||||
VOID
|
||||
DumpProcessorHierarchyNodeStructure (
|
||||
IN UINT8* Ptr,
|
||||
IN UINT8 *Ptr,
|
||||
IN UINT8 Length
|
||||
)
|
||||
{
|
||||
UINT32 Offset;
|
||||
UINT32 Index;
|
||||
CHAR16 Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
|
||||
UINT32 Offset;
|
||||
UINT32 Index;
|
||||
CHAR16 Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
|
||||
|
||||
Offset = ParseAcpi (
|
||||
TRUE,
|
||||
@ -281,8 +286,8 @@ DumpProcessorHierarchyNodeStructure (
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Invalid Number of Private Resources. " \
|
||||
L"PrivateResourceCount = %d. RemainingBufferLength = %d. " \
|
||||
L"Parsing of this structure aborted.\n",
|
||||
L"PrivateResourceCount = %d. RemainingBufferLength = %d. " \
|
||||
L"Parsing of this structure aborted.\n",
|
||||
*NumberOfPrivateResources,
|
||||
Length - Offset
|
||||
);
|
||||
@ -304,7 +309,7 @@ DumpProcessorHierarchyNodeStructure (
|
||||
PrintFieldName (4, Buffer);
|
||||
Print (
|
||||
L"0x%x\n",
|
||||
*((UINT32*)(Ptr + Offset))
|
||||
*((UINT32 *)(Ptr + Offset))
|
||||
);
|
||||
|
||||
Offset += sizeof (UINT32);
|
||||
@ -321,7 +326,7 @@ DumpProcessorHierarchyNodeStructure (
|
||||
STATIC
|
||||
VOID
|
||||
DumpCacheTypeStructure (
|
||||
IN UINT8* Ptr,
|
||||
IN UINT8 *Ptr,
|
||||
IN UINT8 Length
|
||||
)
|
||||
{
|
||||
@ -344,8 +349,8 @@ DumpCacheTypeStructure (
|
||||
STATIC
|
||||
VOID
|
||||
DumpIDStructure (
|
||||
IN UINT8* Ptr,
|
||||
IN UINT8 Length
|
||||
IN UINT8 *Ptr,
|
||||
IN UINT8 Length
|
||||
)
|
||||
{
|
||||
ParseAcpi (
|
||||
@ -378,14 +383,14 @@ DumpIDStructure (
|
||||
VOID
|
||||
EFIAPI
|
||||
ParseAcpiPptt (
|
||||
IN BOOLEAN Trace,
|
||||
IN UINT8* Ptr,
|
||||
IN UINT32 AcpiTableLength,
|
||||
IN UINT8 AcpiTableRevision
|
||||
IN BOOLEAN Trace,
|
||||
IN UINT8 *Ptr,
|
||||
IN UINT32 AcpiTableLength,
|
||||
IN UINT8 AcpiTableRevision
|
||||
)
|
||||
{
|
||||
UINT32 Offset;
|
||||
UINT8* ProcessorTopologyStructurePtr;
|
||||
UINT32 Offset;
|
||||
UINT8 *ProcessorTopologyStructurePtr;
|
||||
|
||||
if (!Trace) {
|
||||
return;
|
||||
@ -416,11 +421,12 @@ ParseAcpiPptt (
|
||||
// Check if the values used to control the parsing logic have been
|
||||
// successfully read.
|
||||
if ((ProcessorTopologyStructureType == NULL) ||
|
||||
(ProcessorTopologyStructureLength == NULL)) {
|
||||
(ProcessorTopologyStructureLength == NULL))
|
||||
{
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Insufficient remaining table buffer length to read the " \
|
||||
L"processor topology structure header. Length = %d.\n",
|
||||
L"processor topology structure header. Length = %d.\n",
|
||||
AcpiTableLength - Offset
|
||||
);
|
||||
return;
|
||||
@ -428,11 +434,12 @@ ParseAcpiPptt (
|
||||
|
||||
// Validate Processor Topology Structure length
|
||||
if ((*ProcessorTopologyStructureLength == 0) ||
|
||||
((Offset + (*ProcessorTopologyStructureLength)) > AcpiTableLength)) {
|
||||
((Offset + (*ProcessorTopologyStructureLength)) > AcpiTableLength))
|
||||
{
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Invalid Processor Topology Structure length. " \
|
||||
L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
|
||||
L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
|
||||
*ProcessorTopologyStructureLength,
|
||||
Offset,
|
||||
AcpiTableLength
|
||||
@ -466,13 +473,13 @@ ParseAcpiPptt (
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Unknown processor topology structure:"
|
||||
L" Type = %d, Length = %d\n",
|
||||
L" Type = %d, Length = %d\n",
|
||||
*ProcessorTopologyStructureType,
|
||||
*ProcessorTopologyStructureLength
|
||||
);
|
||||
}
|
||||
|
||||
ProcessorTopologyStructurePtr += *ProcessorTopologyStructureLength;
|
||||
Offset += *ProcessorTopologyStructureLength;
|
||||
Offset += *ProcessorTopologyStructureLength;
|
||||
} // while
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user