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
@ -14,17 +14,17 @@
|
||||
#include "AcpiTableParser.h"
|
||||
|
||||
// Local variables pointing to the table fields
|
||||
STATIC CONST UINT32* OffsetDbgDeviceInfo;
|
||||
STATIC CONST UINT32* NumberDbgDeviceInfo;
|
||||
STATIC CONST UINT16* DbgDevInfoLen;
|
||||
STATIC CONST UINT8* GasCount;
|
||||
STATIC CONST UINT16* NameSpaceStringLength;
|
||||
STATIC CONST UINT16* NameSpaceStringOffset;
|
||||
STATIC CONST UINT16* OEMDataLength;
|
||||
STATIC CONST UINT16* OEMDataOffset;
|
||||
STATIC CONST UINT16* BaseAddrRegOffset;
|
||||
STATIC CONST UINT16* AddrSizeOffset;
|
||||
STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
|
||||
STATIC CONST UINT32 *OffsetDbgDeviceInfo;
|
||||
STATIC CONST UINT32 *NumberDbgDeviceInfo;
|
||||
STATIC CONST UINT16 *DbgDevInfoLen;
|
||||
STATIC CONST UINT8 *GasCount;
|
||||
STATIC CONST UINT16 *NameSpaceStringLength;
|
||||
STATIC CONST UINT16 *NameSpaceStringOffset;
|
||||
STATIC CONST UINT16 *OEMDataLength;
|
||||
STATIC CONST UINT16 *OEMDataOffset;
|
||||
STATIC CONST UINT16 *BaseAddrRegOffset;
|
||||
STATIC CONST UINT16 *AddrSizeOffset;
|
||||
STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
|
||||
|
||||
/**
|
||||
This function validates the NameSpace string length.
|
||||
@ -37,64 +37,64 @@ STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
ValidateNameSpaceStrLen (
|
||||
IN UINT8* Ptr,
|
||||
IN VOID* Context
|
||||
IN UINT8 *Ptr,
|
||||
IN VOID *Context
|
||||
)
|
||||
{
|
||||
UINT16 NameSpaceStrLen;
|
||||
UINT16 NameSpaceStrLen;
|
||||
|
||||
NameSpaceStrLen = *(UINT16*)Ptr;
|
||||
NameSpaceStrLen = *(UINT16 *)Ptr;
|
||||
|
||||
if (NameSpaceStrLen < 2) {
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"\nERROR: NamespaceString Length = %d. If no Namespace device exists, " \
|
||||
L"NamespaceString[] must contain a period '.'",
|
||||
L"NamespaceString[] must contain a period '.'",
|
||||
NameSpaceStrLen
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// An ACPI_PARSER array describing the ACPI DBG2 table.
|
||||
STATIC CONST ACPI_PARSER Dbg2Parser[] = {
|
||||
STATIC CONST ACPI_PARSER Dbg2Parser[] = {
|
||||
PARSE_ACPI_HEADER (&AcpiHdrInfo),
|
||||
{L"OffsetDbgDeviceInfo", 4, 36, L"0x%x", NULL,
|
||||
(VOID**)&OffsetDbgDeviceInfo, NULL, NULL},
|
||||
{L"NumberDbgDeviceInfo", 4, 40, L"%d", NULL,
|
||||
(VOID**)&NumberDbgDeviceInfo, NULL, NULL}
|
||||
{ L"OffsetDbgDeviceInfo", 4, 36, L"0x%x", NULL,
|
||||
(VOID **)&OffsetDbgDeviceInfo, NULL, NULL },
|
||||
{ L"NumberDbgDeviceInfo", 4, 40, L"%d", NULL,
|
||||
(VOID **)&NumberDbgDeviceInfo, NULL, NULL }
|
||||
};
|
||||
|
||||
/// An ACPI_PARSER array describing the debug device information structure
|
||||
/// header.
|
||||
STATIC CONST ACPI_PARSER DbgDevInfoHeaderParser[] = {
|
||||
{L"Revision", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Length", 2, 1, L"%d", NULL, (VOID**)&DbgDevInfoLen, NULL, NULL}
|
||||
STATIC CONST ACPI_PARSER DbgDevInfoHeaderParser[] = {
|
||||
{ L"Revision", 1, 0, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Length", 2, 1, L"%d", NULL, (VOID **)&DbgDevInfoLen, NULL, NULL }
|
||||
};
|
||||
|
||||
/// An ACPI_PARSER array describing the debug device information.
|
||||
STATIC CONST ACPI_PARSER DbgDevInfoParser[] = {
|
||||
{L"Revision", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
|
||||
STATIC CONST ACPI_PARSER DbgDevInfoParser[] = {
|
||||
{ L"Revision", 1, 0, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL },
|
||||
|
||||
{L"Generic Address Registers Count", 1, 3, L"0x%x", NULL,
|
||||
(VOID**)&GasCount, NULL, NULL},
|
||||
{L"NameSpace String Length", 2, 4, L"%d", NULL,
|
||||
(VOID**)&NameSpaceStringLength, ValidateNameSpaceStrLen, NULL},
|
||||
{L"NameSpace String Offset", 2, 6, L"0x%x", NULL,
|
||||
(VOID**)&NameSpaceStringOffset, NULL, NULL},
|
||||
{L"OEM Data Length", 2, 8, L"%d", NULL, (VOID**)&OEMDataLength,
|
||||
NULL, NULL},
|
||||
{L"OEM Data Offset", 2, 10, L"0x%x", NULL, (VOID**)&OEMDataOffset,
|
||||
NULL, NULL},
|
||||
{ L"Generic Address Registers Count", 1, 3, L"0x%x", NULL,
|
||||
(VOID **)&GasCount, NULL, NULL },
|
||||
{ L"NameSpace String Length", 2, 4, L"%d", NULL,
|
||||
(VOID **)&NameSpaceStringLength, ValidateNameSpaceStrLen, NULL },
|
||||
{ L"NameSpace String Offset", 2, 6, L"0x%x", NULL,
|
||||
(VOID **)&NameSpaceStringOffset, NULL, NULL },
|
||||
{ L"OEM Data Length", 2, 8, L"%d", NULL, (VOID **)&OEMDataLength,
|
||||
NULL, NULL },
|
||||
{ L"OEM Data Offset", 2, 10, L"0x%x", NULL, (VOID **)&OEMDataOffset,
|
||||
NULL, NULL },
|
||||
|
||||
{L"Port Type", 2, 12, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Port SubType", 2, 14, L"0x%x", NULL, NULL, NULL, NULL},
|
||||
{L"Reserved", 2, 16, L"%x", NULL, NULL, NULL, NULL},
|
||||
{ L"Port Type", 2, 12, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Port SubType", 2, 14, L"0x%x", NULL, NULL, NULL, NULL },
|
||||
{ L"Reserved", 2, 16, L"%x", NULL, NULL, NULL, NULL },
|
||||
|
||||
{L"Base Address Register Offset", 2, 18, L"0x%x", NULL,
|
||||
(VOID**)&BaseAddrRegOffset, NULL, NULL},
|
||||
{L"Address Size Offset", 2, 20, L"0x%x", NULL,
|
||||
(VOID**)&AddrSizeOffset, NULL, NULL}
|
||||
{ L"Base Address Register Offset", 2, 18, L"0x%x", NULL,
|
||||
(VOID **)&BaseAddrRegOffset, NULL, NULL },
|
||||
{ L"Address Size Offset", 2, 20, L"0x%x", NULL,
|
||||
(VOID **)&AddrSizeOffset, NULL, NULL }
|
||||
};
|
||||
|
||||
/**
|
||||
@ -107,8 +107,8 @@ STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
DumpDbgDeviceInfo (
|
||||
IN UINT8* Ptr,
|
||||
IN UINT16 Length
|
||||
IN UINT8 *Ptr,
|
||||
IN UINT16 Length
|
||||
)
|
||||
{
|
||||
UINT16 Index;
|
||||
@ -131,21 +131,23 @@ DumpDbgDeviceInfo (
|
||||
(OEMDataLength == NULL) ||
|
||||
(OEMDataOffset == NULL) ||
|
||||
(BaseAddrRegOffset == NULL) ||
|
||||
(AddrSizeOffset == NULL)) {
|
||||
(AddrSizeOffset == NULL))
|
||||
{
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Insufficient Debug Device Information Structure length. " \
|
||||
L"Length = %d.\n",
|
||||
L"Length = %d.\n",
|
||||
Length
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// GAS
|
||||
Index = 0;
|
||||
Index = 0;
|
||||
Offset = *BaseAddrRegOffset;
|
||||
while ((Index++ < *GasCount) &&
|
||||
(Offset < Length)) {
|
||||
(Offset < Length))
|
||||
{
|
||||
PrintFieldName (4, L"BaseAddressRegister");
|
||||
Offset += (UINT16)DumpGasStruct (
|
||||
Ptr + Offset,
|
||||
@ -160,7 +162,7 @@ DumpDbgDeviceInfo (
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Invalid GAS count. GasCount = %d. RemainingBufferLength = %d. " \
|
||||
L"Parsing of the Debug Device Information structure aborted.\n",
|
||||
L"Parsing of the Debug Device Information structure aborted.\n",
|
||||
*GasCount,
|
||||
Length - *AddrSizeOffset
|
||||
);
|
||||
@ -168,39 +170,45 @@ DumpDbgDeviceInfo (
|
||||
}
|
||||
|
||||
// Address Size
|
||||
Index = 0;
|
||||
Index = 0;
|
||||
Offset = *AddrSizeOffset;
|
||||
while ((Index++ < *GasCount) &&
|
||||
(Offset < Length)) {
|
||||
(Offset < Length))
|
||||
{
|
||||
PrintFieldName (4, L"Address Size");
|
||||
Print (L"0x%x\n", *((UINT32*)(Ptr + Offset)));
|
||||
Print (L"0x%x\n", *((UINT32 *)(Ptr + Offset)));
|
||||
Offset += sizeof (UINT32);
|
||||
}
|
||||
|
||||
// NameSpace String
|
||||
Index = 0;
|
||||
Index = 0;
|
||||
Offset = *NameSpaceStringOffset;
|
||||
PrintFieldName (4, L"NameSpace String");
|
||||
while ((Index++ < *NameSpaceStringLength) &&
|
||||
(Offset < Length)) {
|
||||
(Offset < Length))
|
||||
{
|
||||
Print (L"%c", *(Ptr + Offset));
|
||||
Offset++;
|
||||
}
|
||||
|
||||
Print (L"\n");
|
||||
|
||||
// OEM Data
|
||||
if (*OEMDataOffset != 0) {
|
||||
Index = 0;
|
||||
Index = 0;
|
||||
Offset = *OEMDataOffset;
|
||||
PrintFieldName (4, L"OEM Data");
|
||||
while ((Index++ < *OEMDataLength) &&
|
||||
(Offset < Length)) {
|
||||
(Offset < Length))
|
||||
{
|
||||
Print (L"%x ", *(Ptr + Offset));
|
||||
if ((Index & 7) == 0) {
|
||||
Print (L"\n%-*s ", OUTPUT_FIELD_COLUMN_WIDTH, L"");
|
||||
}
|
||||
|
||||
Offset++;
|
||||
}
|
||||
|
||||
Print (L"\n");
|
||||
}
|
||||
}
|
||||
@ -220,14 +228,14 @@ DumpDbgDeviceInfo (
|
||||
VOID
|
||||
EFIAPI
|
||||
ParseAcpiDbg2 (
|
||||
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;
|
||||
UINT32 Index;
|
||||
UINT32 Offset;
|
||||
UINT32 Index;
|
||||
|
||||
if (!Trace) {
|
||||
return;
|
||||
@ -245,7 +253,8 @@ ParseAcpiDbg2 (
|
||||
// Check if the values used to control the parsing logic have been
|
||||
// successfully read.
|
||||
if ((OffsetDbgDeviceInfo == NULL) ||
|
||||
(NumberDbgDeviceInfo == NULL)) {
|
||||
(NumberDbgDeviceInfo == NULL))
|
||||
{
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Insufficient table length. AcpiTableLength = %d\n",
|
||||
@ -255,10 +264,9 @@ ParseAcpiDbg2 (
|
||||
}
|
||||
|
||||
Offset = *OffsetDbgDeviceInfo;
|
||||
Index = 0;
|
||||
Index = 0;
|
||||
|
||||
while (Index++ < *NumberDbgDeviceInfo) {
|
||||
|
||||
// Parse the Debug Device Information Structure header to obtain Length
|
||||
ParseAcpi (
|
||||
FALSE,
|
||||
@ -275,8 +283,8 @@ ParseAcpiDbg2 (
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Insufficient remaining table buffer length to read the " \
|
||||
L"Debug Device Information structure's 'Length' field. " \
|
||||
L"RemainingTableBufferLength = %d.\n",
|
||||
L"Debug Device Information structure's 'Length' field. " \
|
||||
L"RemainingTableBufferLength = %d.\n",
|
||||
AcpiTableLength - Offset
|
||||
);
|
||||
return;
|
||||
@ -284,11 +292,12 @@ ParseAcpiDbg2 (
|
||||
|
||||
// Validate Debug Device Information Structure length
|
||||
if ((*DbgDevInfoLen == 0) ||
|
||||
((Offset + (*DbgDevInfoLen)) > AcpiTableLength)) {
|
||||
((Offset + (*DbgDevInfoLen)) > AcpiTableLength))
|
||||
{
|
||||
IncrementErrorCount ();
|
||||
Print (
|
||||
L"ERROR: Invalid Debug Device Information Structure length. " \
|
||||
L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
|
||||
L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
|
||||
*DbgDevInfoLen,
|
||||
Offset,
|
||||
AcpiTableLength
|
||||
|
||||
Reference in New Issue
Block a user