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