Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/cbf23e8e3ef1
branches: trunk
changeset: 827767:cbf23e8e3ef1
user: christos <christos%NetBSD.org@localhost>
date: Sun Nov 12 03:02:35 2017 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/dist/common/dmtbdump.c | 1031 +++++++----
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 175 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 66 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 71 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 4 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 868 ++++++---
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 7 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 30 +-
sys/external/bsd/acpica/dist/compiler/aslopt.c | 2 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 14 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 4 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 241 +--
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 8 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 1 -
sys/external/bsd/acpica/dist/compiler/dtparser.y | 1 -
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 3 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 1 -
sys/external/bsd/acpica/dist/compiler/dtutils.c | 153 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 1 -
sys/external/bsd/acpica/dist/compiler/prutils.c | 4 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 124 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 199 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 17 +-
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 3 +-
sys/external/bsd/acpica/dist/events/evregion.c | 11 +
sys/external/bsd/acpica/dist/include/acapps.h | 5 +
sys/external/bsd/acpica/dist/include/acdebug.h | 6 +
sys/external/bsd/acpica/dist/include/acdisasm.h | 28 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 4 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 15 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 2 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 5 +
sys/external/bsd/acpica/dist/include/acpixf.h | 6 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 179 +-
sys/external/bsd/acpica/dist/include/actypes.h | 2 +
sys/external/bsd/acpica/dist/include/acutils.h | 14 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 14 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 253 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 11 +-
sys/external/bsd/acpica/dist/utilities/utmutex.c | 7 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 2 +-
41 files changed, 2083 insertions(+), 1509 deletions(-)
diffs (truncated from 6298 to 300 lines):
diff -r 9f3abe4e7b42 -r cbf23e8e3ef1 sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Sun Nov 12 03:02:15 2017 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Sun Nov 12 03:02:35 2017 +0000
@@ -515,7 +515,7 @@
{
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;
@@ -528,13 +528,13 @@
/* 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;
@@ -542,7 +542,7 @@
/* The actual type is the lower 7 bits of Type */
- Type = (UINT8) (SubTable->Header.Type & 0x7F);
+ Type = (UINT8) (Subtable->Header.Type & 0x7F);
switch (Type)
{
@@ -555,9 +555,9 @@
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;
@@ -565,9 +565,9 @@
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;
@@ -579,20 +579,20 @@
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;
@@ -654,15 +654,15 @@
/* 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);
}
}
@@ -685,7 +685,7 @@
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);
@@ -700,12 +700,12 @@
/* 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;
@@ -713,9 +713,9 @@
/* 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);
}
}
@@ -738,9 +738,9 @@
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;
@@ -752,14 +752,14 @@
/* 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;
@@ -779,19 +779,19 @@
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;
@@ -801,7 +801,7 @@
/* Resource-specific info buffer */
- InfoLength = SubSubTable->Length - SubSubOffset;
+ InfoLength = SubSubtable->Length - SubSubOffset;
if (InfoLength)
{
Status = AcpiDmDumpTable (Length,
@@ -816,16 +816,16 @@
/* 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);
}
}
@@ -848,7 +848,7 @@
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;
@@ -867,12 +867,12 @@
/* 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;
@@ -880,15 +880,15 @@
/* 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;
@@ -897,15 +897,15 @@
/* 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;
Home |
Main Index |
Thread Index |
Old Index