aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/common/dmtbdump.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2017-09-29 23:02:49 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2017-09-29 23:02:49 +0000
commitc39c15e23f7155ec7ad56f993e9e454f513fa561 (patch)
treedc85d94fea926a660b87e0ed430fcd96489db2e8 /sys/contrib/dev/acpica/common/dmtbdump.c
parente8b437ef9acd737bfd18dc34562cce4e195e71b8 (diff)
parent2c673001fb88105f2d160032c4d4b76cb518e37f (diff)
Merge ACPICA 20170929.
Notes
Notes: svn path=/head/; revision=324109
Diffstat (limited to 'sys/contrib/dev/acpica/common/dmtbdump.c')
-rw-r--r--sys/contrib/dev/acpica/common/dmtbdump.c1024
1 files changed, 652 insertions, 372 deletions
diff --git a/sys/contrib/dev/acpica/common/dmtbdump.c b/sys/contrib/dev/acpica/common/dmtbdump.c
index 5510e36d1969..bb82bfdfacc0 100644
--- a/sys/contrib/dev/acpica/common/dmtbdump.c
+++ b/sys/contrib/dev/acpica/common/dmtbdump.c
@@ -623,7 +623,7 @@ AcpiDmDumpAsf (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_HEADER);
- ACPI_ASF_INFO *SubTable;
+ ACPI_ASF_INFO *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
ACPI_DMTABLE_INFO *DataInfoTable = NULL;
UINT8 *DataTable = NULL;
@@ -636,13 +636,13 @@ AcpiDmDumpAsf (
/* No main table, only subtables */
- SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Header.Length, AcpiDmTableInfoAsfHdr);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
if (ACPI_FAILURE (Status))
{
return;
@@ -650,7 +650,7 @@ AcpiDmDumpAsf (
/* The actual type is the lower 7 bits of Type */
- Type = (UINT8) (SubTable->Header.Type & 0x7F);
+ Type = (UINT8) (Subtable->Header.Type & 0x7F);
switch (Type)
{
@@ -663,9 +663,9 @@ AcpiDmDumpAsf (
InfoTable = AcpiDmTableInfoAsf1;
DataInfoTable = AcpiDmTableInfoAsf1a;
- DataTable = ACPI_ADD_PTR (UINT8, SubTable, sizeof (ACPI_ASF_ALERT));
- DataCount = ACPI_CAST_PTR (ACPI_ASF_ALERT, SubTable)->Alerts;
- DataLength = ACPI_CAST_PTR (ACPI_ASF_ALERT, SubTable)->DataLength;
+ DataTable = ACPI_ADD_PTR (UINT8, Subtable, sizeof (ACPI_ASF_ALERT));
+ DataCount = ACPI_CAST_PTR (ACPI_ASF_ALERT, Subtable)->Alerts;
+ DataLength = ACPI_CAST_PTR (ACPI_ASF_ALERT, Subtable)->DataLength;
DataOffset = Offset + sizeof (ACPI_ASF_ALERT);
break;
@@ -673,9 +673,9 @@ AcpiDmDumpAsf (
InfoTable = AcpiDmTableInfoAsf2;
DataInfoTable = AcpiDmTableInfoAsf2a;
- DataTable = ACPI_ADD_PTR (UINT8, SubTable, sizeof (ACPI_ASF_REMOTE));
- DataCount = ACPI_CAST_PTR (ACPI_ASF_REMOTE, SubTable)->Controls;
- DataLength = ACPI_CAST_PTR (ACPI_ASF_REMOTE, SubTable)->DataLength;
+ DataTable = ACPI_ADD_PTR (UINT8, Subtable, sizeof (ACPI_ASF_REMOTE));
+ DataCount = ACPI_CAST_PTR (ACPI_ASF_REMOTE, Subtable)->Controls;
+ DataLength = ACPI_CAST_PTR (ACPI_ASF_REMOTE, Subtable)->DataLength;
DataOffset = Offset + sizeof (ACPI_ASF_REMOTE);
break;
@@ -687,20 +687,20 @@ AcpiDmDumpAsf (
case ACPI_ASF_TYPE_ADDRESS:
InfoTable = AcpiDmTableInfoAsf4;
- DataTable = ACPI_ADD_PTR (UINT8, SubTable, sizeof (ACPI_ASF_ADDRESS));
- DataLength = ACPI_CAST_PTR (ACPI_ASF_ADDRESS, SubTable)->Devices;
+ DataTable = ACPI_ADD_PTR (UINT8, Subtable, sizeof (ACPI_ASF_ADDRESS));
+ DataLength = ACPI_CAST_PTR (ACPI_ASF_ADDRESS, Subtable)->Devices;
DataOffset = Offset + sizeof (ACPI_ASF_ADDRESS);
break;
default:
AcpiOsPrintf ("\n**** Unknown ASF subtable type 0x%X\n",
- SubTable->Header.Type);
+ Subtable->Header.Type);
return;
}
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Header.Length, InfoTable);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Header.Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -762,15 +762,15 @@ AcpiDmDumpAsf (
/* Point to next subtable */
- if (!SubTable->Header.Length)
+ if (!Subtable->Header.Length)
{
AcpiOsPrintf ("Invalid zero subtable header length\n");
return;
}
- Offset += SubTable->Header.Length;
- SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable,
- SubTable->Header.Length);
+ Offset += Subtable->Header.Length;
+ Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable,
+ Subtable->Header.Length);
}
}
@@ -793,7 +793,7 @@ AcpiDmDumpCpep (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_CPEP_POLLING *SubTable;
+ ACPI_CPEP_POLLING *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_CPEP);
@@ -808,12 +808,12 @@ AcpiDmDumpCpep (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
while (Offset < Table->Length)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Header.Length, AcpiDmTableInfoCpep0);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Header.Length, AcpiDmTableInfoCpep0);
if (ACPI_FAILURE (Status))
{
return;
@@ -821,9 +821,9 @@ AcpiDmDumpCpep (
/* Point to next subtable */
- Offset += SubTable->Header.Length;
- SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, SubTable,
- SubTable->Header.Length);
+ Offset += Subtable->Header.Length;
+ Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Subtable,
+ Subtable->Header.Length);
}
}
@@ -846,9 +846,9 @@ AcpiDmDumpCsrt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_CSRT_GROUP *SubTable;
+ ACPI_CSRT_GROUP *Subtable;
ACPI_CSRT_SHARED_INFO *SharedInfoTable;
- ACPI_CSRT_DESCRIPTOR *SubSubTable;
+ ACPI_CSRT_DESCRIPTOR *SubSubtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
UINT32 SubOffset;
@@ -860,14 +860,14 @@ AcpiDmDumpCsrt (
/* Subtables (Resource Groups) */
- SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
while (Offset < Table->Length)
{
/* Resource group subtable */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoCsrt0);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoCsrt0);
if (ACPI_FAILURE (Status))
{
return;
@@ -887,19 +887,19 @@ AcpiDmDumpCsrt (
return;
}
- SubOffset += SubTable->SharedInfoLength;
+ SubOffset += Subtable->SharedInfoLength;
/* Sub-Subtables (Resource Descriptors) */
- SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
+ SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
Offset + SubOffset);
- while ((SubOffset < SubTable->Length) &&
+ while ((SubOffset < Subtable->Length) &&
((Offset + SubOffset) < Table->Length))
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubTable,
- SubSubTable->Length, AcpiDmTableInfoCsrt2);
+ Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
+ SubSubtable->Length, AcpiDmTableInfoCsrt2);
if (ACPI_FAILURE (Status))
{
return;
@@ -909,7 +909,7 @@ AcpiDmDumpCsrt (
/* Resource-specific info buffer */
- InfoLength = SubSubTable->Length - SubSubOffset;
+ InfoLength = SubSubtable->Length - SubSubOffset;
if (InfoLength)
{
Status = AcpiDmDumpTable (Length,
@@ -924,16 +924,16 @@ AcpiDmDumpCsrt (
/* Point to next sub-subtable */
- SubOffset += SubSubTable->Length;
- SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubTable,
- SubSubTable->Length);
+ SubOffset += SubSubtable->Length;
+ SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
+ SubSubtable->Length);
}
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable,
- SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
+ Subtable->Length);
}
}
@@ -956,7 +956,7 @@ AcpiDmDumpDbg2 (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_DBG2_DEVICE *SubTable;
+ ACPI_DBG2_DEVICE *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_DBG2);
UINT32 i;
@@ -975,12 +975,12 @@ AcpiDmDumpDbg2 (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
while (Offset < Table->Length)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoDbg2Device);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoDbg2Device);
if (ACPI_FAILURE (Status))
{
return;
@@ -988,15 +988,15 @@ AcpiDmDumpDbg2 (
/* Dump the BaseAddress array */
- for (i = 0; i < SubTable->RegisterCount; i++)
+ for (i = 0; i < Subtable->RegisterCount; i++)
{
- ArrayOffset = SubTable->BaseAddressOffset +
+ ArrayOffset = Subtable->BaseAddressOffset +
(sizeof (ACPI_GENERIC_ADDRESS) * i);
AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) SubTable + ArrayOffset;
+ Array = (UINT8 *) Subtable + ArrayOffset;
Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
- SubTable->Length, AcpiDmTableInfoDbg2Addr);
+ Subtable->Length, AcpiDmTableInfoDbg2Addr);
if (ACPI_FAILURE (Status))
{
return;
@@ -1005,15 +1005,15 @@ AcpiDmDumpDbg2 (
/* Dump the AddressSize array */
- for (i = 0; i < SubTable->RegisterCount; i++)
+ for (i = 0; i < Subtable->RegisterCount; i++)
{
- ArrayOffset = SubTable->AddressSizeOffset +
+ ArrayOffset = Subtable->AddressSizeOffset +
(sizeof (UINT32) * i);
AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) SubTable + ArrayOffset;
+ Array = (UINT8 *) Subtable + ArrayOffset;
Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
- SubTable->Length, AcpiDmTableInfoDbg2Size);
+ Subtable->Length, AcpiDmTableInfoDbg2Size);
if (ACPI_FAILURE (Status))
{
return;
@@ -1023,12 +1023,12 @@ AcpiDmDumpDbg2 (
/* Dump the Namestring (required) */
AcpiOsPrintf ("\n");
- ArrayOffset = SubTable->NamepathOffset;
+ ArrayOffset = Subtable->NamepathOffset;
AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) SubTable + ArrayOffset;
+ Array = (UINT8 *) Subtable + ArrayOffset;
Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
- SubTable->Length, AcpiDmTableInfoDbg2Name);
+ Subtable->Length, AcpiDmTableInfoDbg2Name);
if (ACPI_FAILURE (Status))
{
return;
@@ -1036,10 +1036,10 @@ AcpiDmDumpDbg2 (
/* Dump the OemData (optional) */
- if (SubTable->OemDataOffset)
+ if (Subtable->OemDataOffset)
{
- Status = AcpiDmDumpTable (Length, Offset + SubTable->OemDataOffset,
- Table, SubTable->OemDataLength,
+ Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
+ Table, Subtable->OemDataLength,
AcpiDmTableInfoDbg2OemData);
if (ACPI_FAILURE (Status))
{
@@ -1049,9 +1049,9 @@ AcpiDmDumpDbg2 (
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, SubTable,
- SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
+ Subtable->Length);
}
}
@@ -1074,7 +1074,7 @@ AcpiDmDumpDmar (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_DMAR_HEADER *SubTable;
+ ACPI_DMAR_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_DMAR);
ACPI_DMTABLE_INFO *InfoTable;
@@ -1094,14 +1094,14 @@ AcpiDmDumpDmar (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoDmarHdr);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoDmarHdr);
if (ACPI_FAILURE (Status))
{
return;
@@ -1109,7 +1109,7 @@ AcpiDmDumpDmar (
AcpiOsPrintf ("\n");
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_DMAR_TYPE_HARDWARE_UNIT:
@@ -1144,12 +1144,12 @@ AcpiDmDumpDmar (
default:
AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
- SubTable->Type);
+ Subtable->Type);
return;
}
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -1158,16 +1158,16 @@ AcpiDmDumpDmar (
/*
* Dump the optional device scope entries
*/
- if ((SubTable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
- (SubTable->Type == ACPI_DMAR_TYPE_NAMESPACE))
+ if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
+ (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
{
/* These types do not support device scopes */
goto NextSubtable;
}
- ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, SubTable, ScopeOffset);
- while (ScopeOffset < SubTable->Length)
+ ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
+ while (ScopeOffset < Subtable->Length)
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
@@ -1208,9 +1208,9 @@ AcpiDmDumpDmar (
NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, SubTable,
- SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
+ Subtable->Length);
}
}
@@ -1343,7 +1343,7 @@ AcpiDmDumpEinj (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_WHEA_HEADER *SubTable;
+ ACPI_WHEA_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_EINJ);
@@ -1358,11 +1358,11 @@ AcpiDmDumpEinj (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
while (Offset < Table->Length)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
sizeof (ACPI_WHEA_HEADER), AcpiDmTableInfoEinj0);
if (ACPI_FAILURE (Status))
{
@@ -1372,7 +1372,7 @@ AcpiDmDumpEinj (
/* Point to next subtable (each subtable is of fixed length) */
Offset += sizeof (ACPI_WHEA_HEADER);
- SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Subtable,
sizeof (ACPI_WHEA_HEADER));
}
}
@@ -1396,7 +1396,7 @@ AcpiDmDumpErst (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_WHEA_HEADER *SubTable;
+ ACPI_WHEA_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_ERST);
@@ -1411,11 +1411,11 @@ AcpiDmDumpErst (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
while (Offset < Table->Length)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
sizeof (ACPI_WHEA_HEADER), AcpiDmTableInfoErst0);
if (ACPI_FAILURE (Status))
{
@@ -1425,7 +1425,7 @@ AcpiDmDumpErst (
/* Point to next subtable (each subtable is of fixed length) */
Offset += sizeof (ACPI_WHEA_HEADER);
- SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Subtable,
sizeof (ACPI_WHEA_HEADER));
}
}
@@ -1449,7 +1449,7 @@ AcpiDmDumpFpdt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_FPDT_HEADER *SubTable;
+ ACPI_FPDT_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
ACPI_DMTABLE_INFO *InfoTable;
@@ -1459,20 +1459,20 @@ AcpiDmDumpFpdt (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoFpdtHdr);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoFpdtHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_FPDT_TYPE_BOOT:
@@ -1487,31 +1487,31 @@ AcpiDmDumpFpdt (
default:
AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- if (!SubTable->Length)
+ if (!Subtable->Length)
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
}
- goto NextSubTable;
+ goto NextSubtable;
}
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, SubTable,
- SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable,
+ Subtable->Length);
}
}
@@ -1534,11 +1534,11 @@ AcpiDmDumpGtdt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_GTDT_HEADER *SubTable;
+ ACPI_GTDT_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_GTDT);
ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubTableLength;
+ UINT32 SubtableLength;
UINT32 GtCount;
ACPI_GTDT_TIMER_ENTRY *GtxTable;
@@ -1553,34 +1553,34 @@ AcpiDmDumpGtdt (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoGtdtHdr);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoGtdtHdr);
if (ACPI_FAILURE (Status))
{
return;
}
GtCount = 0;
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_GTDT_TYPE_TIMER_BLOCK:
- SubTableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
+ SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
- SubTable))->TimerCount;
+ Subtable))->TimerCount;
InfoTable = AcpiDmTableInfoGtdt0;
break;
case ACPI_GTDT_TYPE_WATCHDOG:
- SubTableLength = sizeof (ACPI_GTDT_WATCHDOG);
+ SubtableLength = sizeof (ACPI_GTDT_WATCHDOG);
InfoTable = AcpiDmTableInfoGtdt1;
break;
@@ -1590,12 +1590,12 @@ AcpiDmDumpGtdt (
/* Cannot continue on unknown type - no length */
AcpiOsPrintf ("\n**** Unknown GTDT subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
return;
}
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -1603,15 +1603,15 @@ AcpiDmDumpGtdt (
/* Point to end of current subtable (each subtable above is of fixed length) */
- Offset += SubTableLength;
+ Offset += SubtableLength;
/* If there are any Gt Timer Blocks from above, dump them now */
if (GtCount)
{
GtxTable = ACPI_ADD_PTR (
- ACPI_GTDT_TIMER_ENTRY, SubTable, SubTableLength);
- SubTableLength += GtCount * sizeof (ACPI_GTDT_TIMER_ENTRY);
+ ACPI_GTDT_TIMER_ENTRY, Subtable, SubtableLength);
+ SubtableLength += GtCount * sizeof (ACPI_GTDT_TIMER_ENTRY);
while (GtCount)
{
@@ -1630,7 +1630,7 @@ AcpiDmDumpGtdt (
/* Point to next subtable */
- SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, SubTable, SubTableLength);
+ Subtable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Subtable, SubtableLength);
}
}
@@ -1653,11 +1653,11 @@ AcpiDmDumpHest (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_HEST_HEADER *SubTable;
+ ACPI_HEST_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_HEST);
ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubTableLength;
+ UINT32 SubtableLength;
UINT32 BankCount;
ACPI_HEST_IA_ERROR_BANK *BankTable;
@@ -1672,70 +1672,70 @@ AcpiDmDumpHest (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
while (Offset < Table->Length)
{
BankCount = 0;
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_HEST_TYPE_IA32_CHECK:
InfoTable = AcpiDmTableInfoHest0;
- SubTableLength = sizeof (ACPI_HEST_IA_MACHINE_CHECK);
+ SubtableLength = sizeof (ACPI_HEST_IA_MACHINE_CHECK);
BankCount = (ACPI_CAST_PTR (ACPI_HEST_IA_MACHINE_CHECK,
- SubTable))->NumHardwareBanks;
+ Subtable))->NumHardwareBanks;
break;
case ACPI_HEST_TYPE_IA32_CORRECTED_CHECK:
InfoTable = AcpiDmTableInfoHest1;
- SubTableLength = sizeof (ACPI_HEST_IA_CORRECTED);
+ SubtableLength = sizeof (ACPI_HEST_IA_CORRECTED);
BankCount = (ACPI_CAST_PTR (ACPI_HEST_IA_CORRECTED,
- SubTable))->NumHardwareBanks;
+ Subtable))->NumHardwareBanks;
break;
case ACPI_HEST_TYPE_IA32_NMI:
InfoTable = AcpiDmTableInfoHest2;
- SubTableLength = sizeof (ACPI_HEST_IA_NMI);
+ SubtableLength = sizeof (ACPI_HEST_IA_NMI);
break;
case ACPI_HEST_TYPE_AER_ROOT_PORT:
InfoTable = AcpiDmTableInfoHest6;
- SubTableLength = sizeof (ACPI_HEST_AER_ROOT);
+ SubtableLength = sizeof (ACPI_HEST_AER_ROOT);
break;
case ACPI_HEST_TYPE_AER_ENDPOINT:
InfoTable = AcpiDmTableInfoHest7;
- SubTableLength = sizeof (ACPI_HEST_AER);
+ SubtableLength = sizeof (ACPI_HEST_AER);
break;
case ACPI_HEST_TYPE_AER_BRIDGE:
InfoTable = AcpiDmTableInfoHest8;
- SubTableLength = sizeof (ACPI_HEST_AER_BRIDGE);
+ SubtableLength = sizeof (ACPI_HEST_AER_BRIDGE);
break;
case ACPI_HEST_TYPE_GENERIC_ERROR:
InfoTable = AcpiDmTableInfoHest9;
- SubTableLength = sizeof (ACPI_HEST_GENERIC);
+ SubtableLength = sizeof (ACPI_HEST_GENERIC);
break;
case ACPI_HEST_TYPE_GENERIC_ERROR_V2:
InfoTable = AcpiDmTableInfoHest10;
- SubTableLength = sizeof (ACPI_HEST_GENERIC_V2);
+ SubtableLength = sizeof (ACPI_HEST_GENERIC_V2);
break;
case ACPI_HEST_TYPE_IA32_DEFERRED_CHECK:
InfoTable = AcpiDmTableInfoHest11;
- SubTableLength = sizeof (ACPI_HEST_IA_DEFERRED_CHECK);
+ SubtableLength = sizeof (ACPI_HEST_IA_DEFERRED_CHECK);
BankCount = (ACPI_CAST_PTR (ACPI_HEST_IA_DEFERRED_CHECK,
- SubTable))->NumHardwareBanks;
+ Subtable))->NumHardwareBanks;
break;
default:
@@ -1743,13 +1743,13 @@ AcpiDmDumpHest (
/* Cannot continue on unknown type - no length */
AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
return;
}
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTableLength, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ SubtableLength, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -1757,15 +1757,15 @@ AcpiDmDumpHest (
/* Point to end of current subtable (each subtable above is of fixed length) */
- Offset += SubTableLength;
+ Offset += SubtableLength;
/* If there are any (fixed-length) Error Banks from above, dump them now */
if (BankCount)
{
- BankTable = ACPI_ADD_PTR (ACPI_HEST_IA_ERROR_BANK, SubTable,
- SubTableLength);
- SubTableLength += BankCount * sizeof (ACPI_HEST_IA_ERROR_BANK);
+ BankTable = ACPI_ADD_PTR (ACPI_HEST_IA_ERROR_BANK, Subtable,
+ SubtableLength);
+ SubtableLength += BankCount * sizeof (ACPI_HEST_IA_ERROR_BANK);
while (BankCount)
{
@@ -1785,7 +1785,7 @@ AcpiDmDumpHest (
/* Point to next subtable */
- SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, SubTable, SubTableLength);
+ Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Subtable, SubtableLength);
}
}
@@ -1811,7 +1811,7 @@ AcpiDmDumpHmat (
ACPI_HMAT_LOCALITY *HmatLocality;
ACPI_HMAT_CACHE *HmatCache;
UINT32 Offset;
- UINT32 SubTableOffset;
+ UINT32 SubtableOffset;
UINT32 Length;
ACPI_DMTABLE_INFO *InfoTable;
UINT32 i, j;
@@ -1829,7 +1829,7 @@ AcpiDmDumpHmat (
while (Offset < Table->Length)
{
AcpiOsPrintf ("\n");
- SubTableOffset = 0;
+ SubtableOffset = 0;
/* Dump HMAT structure header */
@@ -1873,7 +1873,7 @@ AcpiDmDumpHmat (
/* Attempt to continue */
- goto NextSubTable;
+ goto NextSubtable;
}
/* Dump HMAT structure body */
@@ -1897,11 +1897,11 @@ AcpiDmDumpHmat (
case ACPI_HMAT_TYPE_LOCALITY:
HmatLocality = ACPI_CAST_PTR (ACPI_HMAT_LOCALITY, HmatStruct);
- SubTableOffset = sizeof (ACPI_HMAT_LOCALITY);
+ SubtableOffset = sizeof (ACPI_HMAT_LOCALITY);
/* Dump initiator proximity domains */
- if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ if ((UINT32)(HmatStruct->Length - SubtableOffset) <
(UINT32)(HmatLocality->NumberOfInitiatorPDs * 4))
{
AcpiOsPrintf ("Invalid initiator proximity domain number\n");
@@ -1909,15 +1909,15 @@ AcpiDmDumpHmat (
}
for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
{
- Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
4, AcpiDmTableInfoHmat1a);
- SubTableOffset += 4;
+ SubtableOffset += 4;
}
/* Dump target proximity domains */
- if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ if ((UINT32)(HmatStruct->Length - SubtableOffset) <
(UINT32)(HmatLocality->NumberOfTargetPDs * 4))
{
AcpiOsPrintf ("Invalid target proximity domain number\n");
@@ -1925,15 +1925,15 @@ AcpiDmDumpHmat (
}
for (i = 0; i < HmatLocality->NumberOfTargetPDs; i++)
{
- Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
4, AcpiDmTableInfoHmat1b);
- SubTableOffset += 4;
+ SubtableOffset += 4;
}
/* Dump latency/bandwidth entris */
- if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ if ((UINT32)(HmatStruct->Length - SubtableOffset) <
(UINT32)(HmatLocality->NumberOfInitiatorPDs *
HmatLocality->NumberOfTargetPDs * 2))
{
@@ -1944,10 +1944,10 @@ AcpiDmDumpHmat (
{
for (j = 0; j < HmatLocality->NumberOfTargetPDs; j++)
{
- Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
2, AcpiDmTableInfoHmat1c);
- SubTableOffset += 2;
+ SubtableOffset += 2;
}
}
break;
@@ -1955,11 +1955,11 @@ AcpiDmDumpHmat (
case ACPI_HMAT_TYPE_CACHE:
HmatCache = ACPI_CAST_PTR (ACPI_HMAT_CACHE, HmatStruct);
- SubTableOffset = sizeof (ACPI_HMAT_CACHE);
+ SubtableOffset = sizeof (ACPI_HMAT_CACHE);
/* Dump SMBIOS handles */
- if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ if ((UINT32)(HmatStruct->Length - SubtableOffset) <
(UINT32)(HmatCache->NumberOfSMBIOSHandles * 2))
{
AcpiOsPrintf ("Invalid SMBIOS handle number\n");
@@ -1967,10 +1967,10 @@ AcpiDmDumpHmat (
}
for (i = 0; i < HmatCache->NumberOfSMBIOSHandles; i++)
{
- Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
- ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
2, AcpiDmTableInfoHmat2a);
- SubTableOffset += 2;
+ SubtableOffset += 2;
}
break;
@@ -1979,7 +1979,7 @@ AcpiDmDumpHmat (
break;
}
-NextSubTable:
+NextSubtable:
/* Point to next HMAT structure subtable */
Offset += (HmatStruct->Length);
@@ -2104,7 +2104,7 @@ AcpiDmDumpIort (
AcpiOsPrintf ("Invalid zero length IORT node\n");
return;
}
- goto NextSubTable;
+ goto NextSubtable;
}
/* Dump the node subtable header */
@@ -2227,7 +2227,7 @@ AcpiDmDumpIort (
NodeOffset += Length;
}
-NextSubTable:
+NextSubtable:
/* Point to next node subtable */
Offset += IortNode->Length;
@@ -2260,7 +2260,7 @@ AcpiDmDumpIvrs (
UINT32 EntryLength;
UINT32 EntryType;
ACPI_IVRS_DE_HEADER *DeviceEntry;
- ACPI_IVRS_HEADER *SubTable;
+ ACPI_IVRS_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
@@ -2274,20 +2274,20 @@ AcpiDmDumpIvrs (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoIvrsHdr);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoIvrsHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_IVRS_TYPE_HARDWARE:
@@ -2304,23 +2304,23 @@ AcpiDmDumpIvrs (
default:
AcpiOsPrintf ("\n**** Unknown IVRS subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- if (!SubTable->Length)
+ if (!Subtable->Length)
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
}
- goto NextSubTable;
+ goto NextSubtable;
}
/* Dump the subtable */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -2328,13 +2328,13 @@ AcpiDmDumpIvrs (
/* The hardware subtable can contain multiple device entries */
- if (SubTable->Type == ACPI_IVRS_TYPE_HARDWARE)
+ if (Subtable->Type == ACPI_IVRS_TYPE_HARDWARE)
{
EntryOffset = Offset + sizeof (ACPI_IVRS_HARDWARE);
- DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, SubTable,
+ DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
sizeof (ACPI_IVRS_HARDWARE));
- while (EntryOffset < (Offset + SubTable->Length))
+ while (EntryOffset < (Offset + Subtable->Length))
{
AcpiOsPrintf ("\n");
/*
@@ -2409,11 +2409,11 @@ AcpiDmDumpIvrs (
}
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, SubTable, SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
}
}
@@ -2438,33 +2438,33 @@ AcpiDmDumpLpit (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_LPIT_HEADER *SubTable;
+ ACPI_LPIT_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_LPIT);
ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubTableLength;
+ UINT32 SubtableLength;
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
sizeof (ACPI_LPIT_HEADER), AcpiDmTableInfoLpitHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_LPIT_TYPE_NATIVE_CSTATE:
InfoTable = AcpiDmTableInfoLpit0;
- SubTableLength = sizeof (ACPI_LPIT_NATIVE);
+ SubtableLength = sizeof (ACPI_LPIT_NATIVE);
break;
default:
@@ -2472,12 +2472,12 @@ AcpiDmDumpLpit (
/* Cannot continue on unknown type - no length */
AcpiOsPrintf ("\n**** Unknown LPIT subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
return;
}
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTableLength, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ SubtableLength, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -2487,8 +2487,8 @@ AcpiDmDumpLpit (
/* Point to next subtable */
- Offset += SubTableLength;
- SubTable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, SubTable, SubTableLength);
+ Offset += SubtableLength;
+ Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Subtable, SubtableLength);
}
}
@@ -2511,7 +2511,7 @@ AcpiDmDumpMadt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_SUBTABLE_HEADER *SubTable;
+ ACPI_SUBTABLE_HEADER *Subtable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_MADT);
ACPI_DMTABLE_INFO *InfoTable;
@@ -2527,20 +2527,20 @@ AcpiDmDumpMadt (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoMadtHdr);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoMadtHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_MADT_TYPE_LOCAL_APIC:
@@ -2625,32 +2625,32 @@ AcpiDmDumpMadt (
default:
AcpiOsPrintf ("\n**** Unknown MADT subtable type 0x%X\n\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- if (!SubTable->Length)
+ if (!Subtable->Length)
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
}
- goto NextSubTable;
+ goto NextSubtable;
}
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, SubTable,
- SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable,
+ Subtable->Length);
}
}
@@ -2673,7 +2673,7 @@ AcpiDmDumpMcfg (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MCFG);
- ACPI_MCFG_ALLOCATION *SubTable;
+ ACPI_MCFG_ALLOCATION *Subtable;
/* Main table */
@@ -2686,7 +2686,7 @@ AcpiDmDumpMcfg (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
while (Offset < Table->Length)
{
if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
@@ -2697,7 +2697,7 @@ AcpiDmDumpMcfg (
}
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
if (ACPI_FAILURE (Status))
{
@@ -2707,7 +2707,7 @@ AcpiDmDumpMcfg (
/* Point to next subtable (each subtable is of fixed length) */
Offset += sizeof (ACPI_MCFG_ALLOCATION);
- SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Subtable,
sizeof (ACPI_MCFG_ALLOCATION));
}
}
@@ -2731,11 +2731,11 @@ AcpiDmDumpMpst (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MPST);
- ACPI_MPST_POWER_NODE *SubTable0;
- ACPI_MPST_POWER_STATE *SubTable0A;
- ACPI_MPST_COMPONENT *SubTable0B;
- ACPI_MPST_DATA_HDR *SubTable1;
- ACPI_MPST_POWER_DATA *SubTable2;
+ ACPI_MPST_POWER_NODE *Subtable0;
+ ACPI_MPST_POWER_STATE *Subtable0A;
+ ACPI_MPST_COMPONENT *Subtable0B;
+ ACPI_MPST_DATA_HDR *Subtable1;
+ ACPI_MPST_POWER_DATA *Subtable2;
UINT16 SubtableCount;
UINT32 PowerStateCount;
UINT32 ComponentCount;
@@ -2752,12 +2752,12 @@ AcpiDmDumpMpst (
/* Subtable: Memory Power Node(s) */
SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
- SubTable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
+ Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
while ((Offset < Table->Length) && SubtableCount)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable0,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
if (ACPI_FAILURE (Status))
{
@@ -2766,33 +2766,33 @@ AcpiDmDumpMpst (
/* Extract the sub-subtable counts */
- PowerStateCount = SubTable0->NumPowerStates;
- ComponentCount = SubTable0->NumPhysicalComponents;
+ PowerStateCount = Subtable0->NumPowerStates;
+ ComponentCount = Subtable0->NumPhysicalComponents;
Offset += sizeof (ACPI_MPST_POWER_NODE);
/* Sub-subtables - Memory Power State Structure(s) */
- SubTable0A = ACPI_ADD_PTR (ACPI_MPST_POWER_STATE, SubTable0,
+ Subtable0A = ACPI_ADD_PTR (ACPI_MPST_POWER_STATE, Subtable0,
sizeof (ACPI_MPST_POWER_NODE));
while (PowerStateCount)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable0A,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
if (ACPI_FAILURE (Status))
{
return;
}
- SubTable0A++;
+ Subtable0A++;
PowerStateCount--;
Offset += sizeof (ACPI_MPST_POWER_STATE);
}
/* Sub-subtables - Physical Component ID Structure(s) */
- SubTable0B = ACPI_CAST_PTR (ACPI_MPST_COMPONENT, SubTable0A);
+ Subtable0B = ACPI_CAST_PTR (ACPI_MPST_COMPONENT, Subtable0A);
if (ComponentCount)
{
@@ -2801,14 +2801,14 @@ AcpiDmDumpMpst (
while (ComponentCount)
{
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable0B,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
if (ACPI_FAILURE (Status))
{
return;
}
- SubTable0B++;
+ Subtable0B++;
ComponentCount--;
Offset += sizeof (ACPI_MPST_COMPONENT);
}
@@ -2816,42 +2816,42 @@ AcpiDmDumpMpst (
/* Point to next Memory Power Node subtable */
SubtableCount--;
- SubTable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, SubTable0,
+ Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
sizeof (ACPI_MPST_POWER_NODE) +
- (sizeof (ACPI_MPST_POWER_STATE) * SubTable0->NumPowerStates) +
- (sizeof (ACPI_MPST_COMPONENT) * SubTable0->NumPhysicalComponents));
+ (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
+ (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
}
/* Subtable: Count of Memory Power State Characteristic structures */
AcpiOsPrintf ("\n");
- SubTable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, SubTable0);
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable1,
+ Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
if (ACPI_FAILURE (Status))
{
return;
}
- SubtableCount = SubTable1->CharacteristicsCount;
+ SubtableCount = Subtable1->CharacteristicsCount;
Offset += sizeof (ACPI_MPST_DATA_HDR);
/* Subtable: Memory Power State Characteristics structure(s) */
- SubTable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, SubTable1,
+ Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
sizeof (ACPI_MPST_DATA_HDR));
while ((Offset < Table->Length) && SubtableCount)
{
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable2,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
if (ACPI_FAILURE (Status))
{
return;
}
- SubTable2++;
+ Subtable2++;
SubtableCount--;
Offset += sizeof (ACPI_MPST_POWER_DATA);
}
@@ -2876,7 +2876,7 @@ AcpiDmDumpMsct (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MSCT);
- ACPI_MSCT_PROXIMITY *SubTable;
+ ACPI_MSCT_PROXIMITY *Subtable;
/* Main table */
@@ -2889,13 +2889,13 @@ AcpiDmDumpMsct (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
if (ACPI_FAILURE (Status))
{
@@ -2905,7 +2905,7 @@ AcpiDmDumpMsct (
/* Point to next subtable */
Offset += sizeof (ACPI_MSCT_PROXIMITY);
- SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Subtable,
sizeof (ACPI_MSCT_PROXIMITY));
}
}
@@ -2929,7 +2929,7 @@ AcpiDmDumpMtmr (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MTMR);
- ACPI_MTMR_ENTRY *SubTable;
+ ACPI_MTMR_ENTRY *Subtable;
/* Main table */
@@ -2942,13 +2942,13 @@ AcpiDmDumpMtmr (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
if (ACPI_FAILURE (Status))
{
@@ -2958,7 +2958,7 @@ AcpiDmDumpMtmr (
/* Point to next subtable */
Offset += sizeof (ACPI_MTMR_ENTRY);
- SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Subtable,
sizeof (ACPI_MTMR_ENTRY));
}
}
@@ -2984,7 +2984,7 @@ AcpiDmDumpNfit (
UINT32 Offset = sizeof (ACPI_TABLE_NFIT);
UINT32 FieldOffset = 0;
UINT32 Length;
- ACPI_NFIT_HEADER *SubTable;
+ ACPI_NFIT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
ACPI_NFIT_INTERLEAVE *Interleave = NULL;
ACPI_NFIT_SMBIOS *SmbiosInfo = NULL;
@@ -3002,20 +3002,20 @@ AcpiDmDumpNfit (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* NFIT subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoNfitHdr);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoNfitHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
@@ -3032,13 +3032,13 @@ AcpiDmDumpNfit (
/* Has a variable number of 32-bit values at the end */
InfoTable = AcpiDmTableInfoNfit2;
- Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, SubTable);
+ Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
FieldOffset = sizeof (ACPI_NFIT_INTERLEAVE);
break;
case ACPI_NFIT_TYPE_SMBIOS:
- SmbiosInfo = ACPI_CAST_PTR (ACPI_NFIT_SMBIOS, SubTable);
+ SmbiosInfo = ACPI_CAST_PTR (ACPI_NFIT_SMBIOS, Subtable);
InfoTable = AcpiDmTableInfoNfit3;
break;
@@ -3057,27 +3057,27 @@ AcpiDmDumpNfit (
/* Has a variable number of 64-bit addresses at the end */
InfoTable = AcpiDmTableInfoNfit6;
- Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, SubTable);
+ Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
FieldOffset = sizeof (ACPI_NFIT_FLUSH_ADDRESS) - sizeof (UINT64);
break;
default:
AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- if (!SubTable->Length)
+ if (!Subtable->Length)
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
}
- goto NextSubTable;
+ goto NextSubtable;
}
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -3085,7 +3085,7 @@ AcpiDmDumpNfit (
/* Per-subtable variable-length fields */
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_NFIT_TYPE_INTERLEAVE:
@@ -3105,7 +3105,7 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_SMBIOS:
- Length = SubTable->Length -
+ Length = Subtable->Length -
sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
if (Length)
@@ -3142,11 +3142,11 @@ AcpiDmDumpNfit (
break;
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, SubTable, SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
}
}
@@ -3169,7 +3169,7 @@ AcpiDmDumpPcct (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_PCCT_SUBSPACE *SubTable;
+ ACPI_PCCT_SUBSPACE *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_PCCT);
@@ -3185,20 +3185,20 @@ AcpiDmDumpPcct (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Header.Length, AcpiDmTableInfoPcctHdr);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Header.Type)
+ switch (Subtable->Header.Type)
{
case ACPI_PCCT_TYPE_GENERIC_SUBSPACE:
@@ -3229,13 +3229,67 @@ AcpiDmDumpPcct (
AcpiOsPrintf (
"\n**** Unexpected or unknown PCCT subtable type 0x%X\n\n",
- SubTable->Header.Type);
+ Subtable->Header.Type);
+ return;
+ }
+
+ AcpiOsPrintf ("\n");
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Header.Length, InfoTable);
+ if (ACPI_FAILURE (Status))
+ {
return;
}
+ /* Point to next subtable */
+
+ Offset += Subtable->Header.Length;
+ Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Subtable,
+ Subtable->Header.Length);
+ }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: AcpiDmDumpPdtt
+ *
+ * PARAMETERS: Table - A PDTT table
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Format the contents of a Pdtt. This is a variable-length
+ * table that contains an open-ended number of IDs
+ * at the end of the table.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpPdtt (
+ ACPI_TABLE_HEADER *Table)
+{
+ ACPI_STATUS Status;
+ ACPI_PDTT_CHANNEL *Subtable;
+ UINT32 Length = Table->Length;
+ UINT32 Offset = sizeof (ACPI_TABLE_PDTT);
+
+
+ /* Main table */
+
+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPdtt);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ /* Subtables. Currently there is only one type, but can be multiples */
+
+ Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);
+ while (Offset < Table->Length)
+ {
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Header.Length, InfoTable);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ sizeof (ACPI_PDTT_CHANNEL), AcpiDmTableInfoPdtt0);
if (ACPI_FAILURE (Status))
{
return;
@@ -3243,9 +3297,9 @@ AcpiDmDumpPcct (
/* Point to next subtable */
- Offset += SubTable->Header.Length;
- SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, SubTable,
- SubTable->Header.Length);
+ Offset += sizeof (ACPI_PDTT_CHANNEL);
+ Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Subtable,
+ sizeof (ACPI_PDTT_CHANNEL));
}
}
@@ -3268,9 +3322,9 @@ AcpiDmDumpPmtt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_PMTT_HEADER *SubTable;
- ACPI_PMTT_HEADER *MemSubTable;
- ACPI_PMTT_HEADER *DimmSubTable;
+ ACPI_PMTT_HEADER *Subtable;
+ ACPI_PMTT_HEADER *MemSubtable;
+ ACPI_PMTT_HEADER *DimmSubtable;
ACPI_PMTT_DOMAIN *DomainArray;
UINT32 Length = Table->Length;
UINT32 Offset = sizeof (ACPI_TABLE_PMTT);
@@ -3290,14 +3344,14 @@ AcpiDmDumpPmtt (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoPmttHdr);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoPmttHdr);
if (ACPI_FAILURE (Status))
{
return;
@@ -3305,18 +3359,18 @@ AcpiDmDumpPmtt (
/* Only Socket subtables are expected at this level */
- if (SubTable->Type != ACPI_PMTT_TYPE_SOCKET)
+ if (Subtable->Type != ACPI_PMTT_TYPE_SOCKET)
{
AcpiOsPrintf (
"\n**** Unexpected or unknown PMTT subtable type 0x%X\n\n",
- SubTable->Type);
+ Subtable->Type);
return;
}
/* Dump the fixed-length portion of the subtable */
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoPmtt0);
+ Status = AcpiDmDumpTable (Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoPmtt0);
if (ACPI_FAILURE (Status))
{
return;
@@ -3325,18 +3379,18 @@ AcpiDmDumpPmtt (
/* Walk the memory controller subtables */
MemOffset = sizeof (ACPI_PMTT_SOCKET);
- MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, SubTable,
+ MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
sizeof (ACPI_PMTT_SOCKET));
while (((Offset + MemOffset) < Table->Length) &&
- (MemOffset < SubTable->Length))
+ (MemOffset < Subtable->Length))
{
/* Common subtable header */
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length,
- Offset + MemOffset, MemSubTable,
- MemSubTable->Length, AcpiDmTableInfoPmttHdr);
+ Offset + MemOffset, MemSubtable,
+ MemSubtable->Length, AcpiDmTableInfoPmttHdr);
if (ACPI_FAILURE (Status))
{
return;
@@ -3344,19 +3398,19 @@ AcpiDmDumpPmtt (
/* Only memory controller subtables are expected at this level */
- if (MemSubTable->Type != ACPI_PMTT_TYPE_CONTROLLER)
+ if (MemSubtable->Type != ACPI_PMTT_TYPE_CONTROLLER)
{
AcpiOsPrintf (
"\n**** Unexpected or unknown PMTT subtable type 0x%X\n\n",
- MemSubTable->Type);
+ MemSubtable->Type);
return;
}
/* Dump the fixed-length portion of the controller subtable */
Status = AcpiDmDumpTable (Length,
- Offset + MemOffset, MemSubTable,
- MemSubTable->Length, AcpiDmTableInfoPmtt1);
+ Offset + MemOffset, MemSubtable,
+ MemSubtable->Length, AcpiDmTableInfoPmtt1);
if (ACPI_FAILURE (Status))
{
return;
@@ -3364,13 +3418,13 @@ AcpiDmDumpPmtt (
/* Walk the variable count of proximity domains */
- DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubTable)->DomainCount;
+ DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
- DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubTable,
+ DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
sizeof (ACPI_PMTT_CONTROLLER));
while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
- ((MemOffset + DomainOffset) < SubTable->Length) &&
+ ((MemOffset + DomainOffset) < Subtable->Length) &&
DomainCount)
{
Status = AcpiDmDumpTable (Length,
@@ -3395,18 +3449,18 @@ AcpiDmDumpPmtt (
/* Walk the physical component (DIMM) subtables */
DimmOffset = DomainOffset;
- DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubTable,
+ DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
DomainOffset);
while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
- (DimmOffset < MemSubTable->Length))
+ (DimmOffset < MemSubtable->Length))
{
/* Common subtable header */
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length,
- Offset + MemOffset + DimmOffset, DimmSubTable,
- DimmSubTable->Length, AcpiDmTableInfoPmttHdr);
+ Offset + MemOffset + DimmOffset, DimmSubtable,
+ DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
if (ACPI_FAILURE (Status))
{
return;
@@ -3414,19 +3468,19 @@ AcpiDmDumpPmtt (
/* Only DIMM subtables are expected at this level */
- if (DimmSubTable->Type != ACPI_PMTT_TYPE_DIMM)
+ if (DimmSubtable->Type != ACPI_PMTT_TYPE_DIMM)
{
AcpiOsPrintf (
"\n**** Unexpected or unknown PMTT subtable type 0x%X\n\n",
- DimmSubTable->Type);
+ DimmSubtable->Type);
return;
}
/* Dump the fixed-length DIMM subtable */
Status = AcpiDmDumpTable (Length,
- Offset + MemOffset + DimmOffset, DimmSubTable,
- DimmSubTable->Length, AcpiDmTableInfoPmtt2);
+ Offset + MemOffset + DimmOffset, DimmSubtable,
+ DimmSubtable->Length, AcpiDmTableInfoPmtt2);
if (ACPI_FAILURE (Status))
{
return;
@@ -3434,23 +3488,23 @@ AcpiDmDumpPmtt (
/* Point to next DIMM subtable */
- DimmOffset += DimmSubTable->Length;
- DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
- DimmSubTable, DimmSubTable->Length);
+ DimmOffset += DimmSubtable->Length;
+ DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+ DimmSubtable, DimmSubtable->Length);
}
/* Point to next Controller subtable */
- MemOffset += MemSubTable->Length;
- MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
- MemSubTable, MemSubTable->Length);
+ MemOffset += MemSubtable->Length;
+ MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+ MemSubtable, MemSubtable->Length);
}
/* Point to next Socket subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
- SubTable, SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+ Subtable, Subtable->Length);
}
}
@@ -3473,10 +3527,10 @@ AcpiDmDumpPptt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_SUBTABLE_HEADER *SubTable;
+ ACPI_SUBTABLE_HEADER *Subtable;
ACPI_PPTT_PROCESSOR *PpttProcessor;
UINT8 Length;
- UINT8 SubTableOffset;
+ UINT8 SubtableOffset;
UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
ACPI_DMTABLE_INFO *InfoTable;
UINT32 i;
@@ -3493,20 +3547,20 @@ AcpiDmDumpPptt (
/* Common subtable header */
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
- if (SubTable->Length < sizeof (ACPI_SUBTABLE_HEADER))
+ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+ if (Subtable->Length < sizeof (ACPI_SUBTABLE_HEADER))
{
AcpiOsPrintf ("Invalid subtable length\n");
return;
}
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoPpttHdr);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoPpttHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_PPTT_TYPE_PROCESSOR:
@@ -3529,35 +3583,35 @@ AcpiDmDumpPptt (
default:
AcpiOsPrintf ("\n**** Unknown PPTT subtable type 0x%X\n\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- goto NextSubTable;
+ goto NextSubtable;
}
- if (SubTable->Length < Length)
+ if (Subtable->Length < Length)
{
AcpiOsPrintf ("Invalid subtable length\n");
return;
}
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
}
- SubTableOffset = Length;
+ SubtableOffset = Length;
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_PPTT_TYPE_PROCESSOR:
- PpttProcessor = ACPI_CAST_PTR (ACPI_PPTT_PROCESSOR, SubTable);
+ PpttProcessor = ACPI_CAST_PTR (ACPI_PPTT_PROCESSOR, Subtable);
/* Dump SMBIOS handles */
- if ((UINT8)(SubTable->Length - SubTableOffset) <
+ if ((UINT8)(Subtable->Length - SubtableOffset) <
(UINT8)(PpttProcessor->NumberOfPrivResources * 4))
{
AcpiOsPrintf ("Invalid private resource number\n");
@@ -3565,10 +3619,10 @@ AcpiDmDumpPptt (
}
for (i = 0; i < PpttProcessor->NumberOfPrivResources; i++)
{
- Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
- ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, SubTable, SubTableOffset),
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
+ ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
4, AcpiDmTableInfoPptt0a);
- SubTableOffset += 4;
+ SubtableOffset += 4;
}
break;
@@ -3577,10 +3631,10 @@ AcpiDmDumpPptt (
break;
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
+ Offset += Subtable->Length;
}
}
@@ -3603,7 +3657,7 @@ AcpiDmDumpS3pt (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_S3PT);
- ACPI_FPDT_HEADER *SubTable;
+ ACPI_FPDT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -3616,20 +3670,20 @@ AcpiDmDumpS3pt (
return 0;
}
- SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
while (Offset < S3ptTable->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (S3ptTable->Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoS3ptHdr);
+ Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoS3ptHdr);
if (ACPI_FAILURE (Status))
{
return 0;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_S3PT_TYPE_RESUME:
@@ -3644,37 +3698,205 @@ AcpiDmDumpS3pt (
default:
AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- if (!SubTable->Length)
+ if (!Subtable->Length)
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return 0;
}
- goto NextSubTable;
+ goto NextSubtable;
}
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (S3ptTable->Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return 0;
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, SubTable, SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
}
return (S3ptTable->Length);
}
+
+/*******************************************************************************
+ *
+ * FUNCTION: AcpiDmDumpSdev
+ *
+ * PARAMETERS: Table - A SDEV table
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Format the contents of a SDEV. This is a variable-length
+ * table that contains variable strings and vendor data.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpSdev (
+ ACPI_TABLE_HEADER *Table)
+{
+ ACPI_STATUS Status;
+ ACPI_SDEV_HEADER *Subtable;
+ ACPI_SDEV_PCIE *Pcie;
+ ACPI_SDEV_NAMESPACE *Namesp;
+ ACPI_DMTABLE_INFO *InfoTable;
+ UINT32 Length = Table->Length;
+ UINT32 Offset = sizeof (ACPI_TABLE_SDEV);
+ UINT16 PathOffset;
+ UINT16 PathLength;
+ UINT16 VendorDataOffset;
+ UINT16 VendorDataLength;
+
+
+ /* Main table */
+
+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSdev);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ /* Subtables */
+
+ Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
+ while (Offset < Table->Length)
+ {
+ /* Common subtable header */
+
+ AcpiOsPrintf ("\n");
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoSdevHdr);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ switch (Subtable->Type)
+ {
+ case ACPI_SDEV_TYPE_NAMESPACE_DEVICE:
+
+ InfoTable = AcpiDmTableInfoSdev0;
+ break;
+
+ case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
+
+ InfoTable = AcpiDmTableInfoSdev1;
+ break;
+
+ default:
+ goto NextSubtable;
+ }
+
+ AcpiOsPrintf ("\n");
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ switch (Subtable->Type)
+ {
+ case ACPI_SDEV_TYPE_NAMESPACE_DEVICE:
+
+ /* Dump the PCIe device ID(s) */
+
+ Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
+ PathOffset = Namesp->DeviceIdOffset;
+ PathLength = Namesp->DeviceIdLength;
+
+ if (PathLength)
+ {
+ Status = AcpiDmDumpTable (Table->Length, 0,
+ ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
+ PathLength, AcpiDmTableInfoSdev0a);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+ }
+
+ /* Dump the vendor-specific data */
+
+ VendorDataLength =
+ Namesp->VendorDataLength;
+ VendorDataOffset =
+ Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
+
+ if (VendorDataLength)
+ {
+ Status = AcpiDmDumpTable (Table->Length, 0,
+ ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
+ VendorDataLength, AcpiDmTableInfoSdev1b);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+ }
+ break;
+
+ case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
+
+ /* PCI path substructures */
+
+ Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
+ PathOffset = Pcie->PathOffset;
+ PathLength = Pcie->PathLength;
+
+ while (PathLength)
+ {
+ Status = AcpiDmDumpTable (Table->Length,
+ PathOffset + Offset,
+ ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
+ sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ PathOffset += sizeof (ACPI_SDEV_PCIE_PATH);
+ PathLength -= sizeof (ACPI_SDEV_PCIE_PATH);
+ }
+
+ /* VendorData */
+
+ VendorDataLength = Pcie->VendorDataLength;
+ VendorDataOffset = Pcie->PathOffset + Pcie->PathLength;
+
+ if (VendorDataLength)
+ {
+ Status = AcpiDmDumpTable (Table->Length, 0,
+ ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
+ VendorDataLength, AcpiDmTableInfoSdev1b);
+ }
+ break;
+
+ default:
+ goto NextSubtable;
+ }
+
+NextSubtable:
+ /* Point to next subtable */
+
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Subtable,
+ Subtable->Length);
+ }
+}
+
+
/*******************************************************************************
*
* FUNCTION: AcpiDmDumpSlic
@@ -3794,7 +4016,7 @@ AcpiDmDumpSrat (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_SRAT);
- ACPI_SUBTABLE_HEADER *SubTable;
+ ACPI_SUBTABLE_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
@@ -3808,20 +4030,20 @@ AcpiDmDumpSrat (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoSratHdr);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, AcpiDmTableInfoSratHdr);
if (ACPI_FAILURE (Status))
{
return;
}
- switch (SubTable->Type)
+ switch (Subtable->Type)
{
case ACPI_SRAT_TYPE_CPU_AFFINITY:
@@ -3850,32 +4072,32 @@ AcpiDmDumpSrat (
default:
AcpiOsPrintf ("\n**** Unknown SRAT subtable type 0x%X\n",
- SubTable->Type);
+ Subtable->Type);
/* Attempt to continue */
- if (!SubTable->Length)
+ if (!Subtable->Length)
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
}
- goto NextSubTable;
+ goto NextSubtable;
}
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Length, InfoTable);
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
}
-NextSubTable:
+NextSubtable:
/* Point to next subtable */
- Offset += SubTable->Length;
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, SubTable,
- SubTable->Length);
+ Offset += Subtable->Length;
+ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable,
+ Subtable->Length);
}
}
@@ -3954,7 +4176,7 @@ AcpiDmDumpTcpa (
UINT32 Offset = sizeof (ACPI_TABLE_TCPA_HDR);
ACPI_TABLE_TCPA_HDR *CommonHeader = ACPI_CAST_PTR (
ACPI_TABLE_TCPA_HDR, Table);
- ACPI_TABLE_TCPA_HDR *SubTable = ACPI_ADD_PTR (
+ ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR (
ACPI_TABLE_TCPA_HDR, Table, Offset);
ACPI_STATUS Status;
@@ -3976,13 +4198,13 @@ AcpiDmDumpTcpa (
{
case ACPI_TCPA_CLIENT_TABLE:
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
Table->Length - Offset, AcpiDmTableInfoTcpaClient);
break;
case ACPI_TCPA_SERVER_TABLE:
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
Table->Length - Offset, AcpiDmTableInfoTcpaServer);
break;
@@ -4003,6 +4225,64 @@ AcpiDmDumpTcpa (
/*******************************************************************************
*
+ * FUNCTION: AcpiDmDumpTpm2
+ *
+ * PARAMETERS: Table - A TPM2 table
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Format the contents of a TPM2.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpTpm2 (
+ ACPI_TABLE_HEADER *Table)
+{
+ UINT32 Offset = sizeof (ACPI_TABLE_TPM2);
+ ACPI_TABLE_TPM2 *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM2, Table);
+ ACPI_TPM2_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset);
+ ACPI_TPM2_ARM_SMC *ArmSubtable;
+ ACPI_STATUS Status;
+
+
+ /* Main table */
+
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm2);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ AcpiOsPrintf ("\n");
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Table->Length - Offset, AcpiDmTableInfoTpm2a);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ switch (CommonHeader->StartMethod)
+ {
+ case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
+
+ ArmSubtable = ACPI_ADD_PTR (ACPI_TPM2_ARM_SMC, Subtable,
+ sizeof (ACPI_TPM2_TRAILER));
+ Offset += sizeof (ACPI_TPM2_TRAILER);
+
+ AcpiOsPrintf ("\n");
+ Status = AcpiDmDumpTable (Table->Length, Offset, ArmSubtable,
+ Table->Length - Offset, AcpiDmTableInfoTpm211);
+ break;
+
+ default:
+ break;
+ }
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: AcpiDmDumpVrtc
*
* PARAMETERS: Table - A VRTC table
@@ -4019,7 +4299,7 @@ AcpiDmDumpVrtc (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
- ACPI_VRTC_ENTRY *SubTable;
+ ACPI_VRTC_ENTRY *Subtable;
/* Main table */
@@ -4032,13 +4312,13 @@ AcpiDmDumpVrtc (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
if (ACPI_FAILURE (Status))
{
@@ -4048,7 +4328,7 @@ AcpiDmDumpVrtc (
/* Point to next subtable */
Offset += sizeof (ACPI_VRTC_ENTRY);
- SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Subtable,
sizeof (ACPI_VRTC_ENTRY));
}
}
@@ -4072,7 +4352,7 @@ AcpiDmDumpWdat (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_WDAT);
- ACPI_WDAT_ENTRY *SubTable;
+ ACPI_WDAT_ENTRY *Subtable;
/* Main table */
@@ -4085,13 +4365,13 @@ AcpiDmDumpWdat (
/* Subtables */
- SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
+ Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
while (Offset < Table->Length)
{
/* Common subtable header */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+ Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
if (ACPI_FAILURE (Status))
{
@@ -4101,7 +4381,7 @@ AcpiDmDumpWdat (
/* Point to next subtable */
Offset += sizeof (ACPI_WDAT_ENTRY);
- SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, SubTable,
+ Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Subtable,
sizeof (ACPI_WDAT_ENTRY));
}
}
@@ -4125,7 +4405,7 @@ AcpiDmDumpWpbt (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- ACPI_TABLE_WPBT *SubTable;
+ ACPI_TABLE_WPBT *Subtable;
UINT32 Length = Table->Length;
UINT16 ArgumentsLength;
@@ -4140,8 +4420,8 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */
- SubTable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
- ArgumentsLength = SubTable->ArgumentsLength;
+ Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
+ ArgumentsLength = Subtable->ArgumentsLength;
/* Dump the arguments buffer */
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 13:40:29 +0000