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 merge conflicts
details: https://anonhg.NetBSD.org/src/rev/0b3871bf4d2a
branches: trunk
changeset: 339963:0b3871bf4d2a
user: christos <christos%NetBSD.org@localhost>
date: Tue Aug 18 10:39:46 2015 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/conf/files.acpica | 6 +-
sys/external/bsd/acpica/dist/common/dmtbdump.c | 874 +++++++++-
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 542 +++++-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 10 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 17 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 3 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 15 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 6 +-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 38 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 117 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 65 +
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 52 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 56 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 9 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 55 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 487 +++-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 83 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 12 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 15 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 9 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 890 +++++++++-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 17 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 16 +-
sys/external/bsd/acpica/dist/compiler/prutils.c | 38 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 102 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 13 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 14 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 41 +-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 28 +-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 16 +-
sys/external/bsd/acpica/dist/debugger/dbtest.c | 20 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 7 +-
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 8 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 89 +-
sys/external/bsd/acpica/dist/disassembler/dmobject.c | 576 ------
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 20 +-
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 14 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 2 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 407 ++++-
sys/external/bsd/acpica/dist/executer/exdump.c | 16 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 133 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 35 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 116 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 5 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 34 +
sys/external/bsd/acpica/dist/include/aclocal.h | 30 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 10 +
sys/external/bsd/acpica/dist/include/acnamesp.h | 22 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 9 +
sys/external/bsd/acpica/dist/include/acpixf.h | 40 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 219 ++-
sys/external/bsd/acpica/dist/include/actypes.h | 52 +-
sys/external/bsd/acpica/dist/include/acutils.h | 168 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 17 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 7 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 38 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 98 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 3 -
sys/external/bsd/acpica/dist/resources/rsutils.c | 8 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 6 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 21 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 34 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 6 +-
sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c | 12 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 33 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 7 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 37 +
sys/external/bsd/acpica/dist/utilities/utmisc.c | 9 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 8 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 8 +-
76 files changed, 4514 insertions(+), 1536 deletions(-)
diffs (truncated from 9413 to 300 lines):
diff -r d81e41e55cb0 -r 0b3871bf4d2a sys/external/bsd/acpica/conf/files.acpica
--- a/sys/external/bsd/acpica/conf/files.acpica Tue Aug 18 10:38:31 2015 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica Tue Aug 18 10:39:46 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.8 2015/04/13 17:23:39 christos Exp $
+# $NetBSD: files.acpica,v 1.9 2015/08/18 10:39:46 christos Exp $
define acpica
makeoptions acpi CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -18,6 +18,7 @@
file external/bsd/acpica/dist/debugger/dbinput.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbmethod.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbnames.c acpica & acpi_debug & ddb
+file external/bsd/acpica/dist/debugger/dbobject.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbstats.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbtest.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbutils.c acpica & acpi_debug & ddb
@@ -28,7 +29,6 @@
file external/bsd/acpica/dist/disassembler/dmcstyle.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/disassembler/dmdeferred.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/disassembler/dmnames.c acpica & acpi_debug & ddb
-file external/bsd/acpica/dist/disassembler/dmobject.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/disassembler/dmopcode.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/disassembler/dmresrc.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/disassembler/dmresrcl.c acpica & acpi_debug & ddb
@@ -40,6 +40,7 @@
# dispatcher/
file external/bsd/acpica/dist/dispatcher/dsargs.c acpica
file external/bsd/acpica/dist/dispatcher/dscontrol.c acpica
+file external/bsd/acpica/dist/dispatcher/dsdebug.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/dispatcher/dsfield.c acpica
file external/bsd/acpica/dist/dispatcher/dsinit.c acpica
file external/bsd/acpica/dist/dispatcher/dsmethod.c acpica
@@ -192,6 +193,7 @@
file external/bsd/acpica/dist/utilities/utmath.c acpica
file external/bsd/acpica/dist/utilities/utmisc.c acpica
file external/bsd/acpica/dist/utilities/utmutex.c acpica
+file external/bsd/acpica/dist/utilities/utnonansi.c acpica
file external/bsd/acpica/dist/utilities/utobject.c acpica
file external/bsd/acpica/dist/utilities/utosi.c acpica
file external/bsd/acpica/dist/utilities/utownerid.c acpica
diff -r d81e41e55cb0 -r 0b3871bf4d2a sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Tue Aug 18 10:38:31 2015 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Tue Aug 18 10:39:46 2015 +0000
@@ -70,7 +70,6 @@
* AbsoluteOffset - Offset of buffer in the main ACPI table
* Header - Name of the buffer field (printed on the
* first line only.)
- * MultiLine - TRUE if a large, multi-line buffer
*
* RETURN: None
*
@@ -85,8 +84,7 @@
UINT32 BufferOffset,
UINT32 Length,
UINT32 AbsoluteOffset,
- char *Header,
- BOOLEAN MultiLine)
+ char *Header)
{
UINT8 *Buffer;
UINT32 i;
@@ -104,19 +102,12 @@
{
if (!(i % 16))
{
- if (MultiLine)
+ /* Insert a backslash - line continuation character */
+
+ if (Length > 16)
{
- /* Insert a backslash - line continuation character */
-
AcpiOsPrintf ("\\\n ");
}
- else
- {
- AcpiOsPrintf ("\n");
- AcpiDmLineHeader (AbsoluteOffset,
- ((Length - i) > 16) ? 16 : (Length - i), Header);
- Header = NULL;
- }
}
AcpiOsPrintf ("%.02X ", *Buffer);
@@ -131,6 +122,74 @@
/*******************************************************************************
*
+ * FUNCTION: AcpiDmDumpUnicode
+ *
+ * PARAMETERS: Table - ACPI Table or subtable
+ * BufferOffset - Offset of buffer from Table above
+ * ByteLength - Length of the buffer
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Validate and dump the contents of a buffer that contains
+ * unicode data. The output is a standard ASCII string. If it
+ * appears that the data is not unicode, the buffer is dumped
+ * as hex characters.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpUnicode (
+ void *Table,
+ UINT32 BufferOffset,
+ UINT32 ByteLength)
+{
+ UINT8 *Buffer;
+ UINT32 Length;
+ UINT32 i;
+
+
+ Buffer = ((UINT8 *) Table) + BufferOffset;
+ Length = ByteLength - 2; /* Last two bytes are the null terminator */
+
+ /* Ensure all low bytes are entirely printable ASCII */
+
+ for (i = 0; i < Length; i += 2)
+ {
+ if (!isprint (Buffer[i]))
+ {
+ goto DumpRawBuffer;
+ }
+ }
+
+ /* Ensure all high bytes are zero */
+
+ for (i = 1; i < Length; i += 2)
+ {
+ if (Buffer[i])
+ {
+ goto DumpRawBuffer;
+ }
+ }
+
+ /* Dump the buffer as a normal string */
+
+ AcpiOsPrintf ("\"");
+ for (i = 0; i < Length; i += 2)
+ {
+ AcpiOsPrintf ("%c", Buffer[i]);
+ }
+ AcpiOsPrintf ("\"\n");
+ return;
+
+DumpRawBuffer:
+ AcpiDmDumpBuffer (Table, BufferOffset, ByteLength,
+ BufferOffset, NULL);
+ AcpiOsPrintf ("\n");
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: AcpiDmDumpRsdp
*
* PARAMETERS: Table - A RSDP
@@ -149,11 +208,16 @@
ACPI_TABLE_RSDP *Rsdp = ACPI_CAST_PTR (ACPI_TABLE_RSDP, Table);
UINT32 Length = sizeof (ACPI_RSDP_COMMON);
UINT8 Checksum;
+ ACPI_STATUS Status;
/* Dump the common ACPI 1.0 portion */
- AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp1);
+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp1);
+ if (ACPI_FAILURE (Status))
+ {
+ return (Length);
+ }
/* Validate the first checksum */
@@ -170,7 +234,11 @@
if (Rsdp->Revision > 0)
{
Length = Rsdp->Length;
- AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp2);
+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp2);
+ if (ACPI_FAILURE (Status))
+ {
+ return (Length);
+ }
/* Validate the extended checksum over entire RSDP */
@@ -288,30 +356,59 @@
AcpiDmDumpFadt (
ACPI_TABLE_HEADER *Table)
{
+ ACPI_STATUS Status;
+
/* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
/* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
if ((Table->Length > ACPI_FADT_V1_SIZE) &&
(Table->Length <= ACPI_FADT_V2_SIZE))
{
- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt2);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt2);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
}
/* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
else if (Table->Length > ACPI_FADT_V2_SIZE)
{
- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt3);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt3);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
/* Check for FADT revision 5 fields and up (ACPI 5.0+) */
if (Table->Length > ACPI_FADT_V3_SIZE)
{
- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt5);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt5);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+ }
+
+ /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
+
+ if (Table->Length > ACPI_FADT_V3_SIZE)
+ {
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt6);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
}
}
@@ -693,10 +790,17 @@
/* Resource-specific info buffer */
InfoLength = SubSubTable->Length - SubSubOffset;
-
- AcpiDmDumpBuffer (SubSubTable, SubSubOffset, InfoLength,
- Offset + SubOffset + SubSubOffset, "ResourceInfo", FALSE);
- SubSubOffset += InfoLength;
+ if (InfoLength)
+ {
+ Status = AcpiDmDumpTable (Length,
+ Offset + SubOffset + SubSubOffset, Table,
+ InfoLength, AcpiDmTableInfoCsrt2a);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+ SubSubOffset += InfoLength;
+ }
/* Point to next sub-subtable */
@@ -814,8 +918,13 @@
if (SubTable->OemDataOffset)
{
- AcpiDmDumpBuffer (SubTable, SubTable->OemDataOffset, SubTable->OemDataLength,
- Offset + SubTable->OemDataOffset, "OEM Data", FALSE);
+ Status = AcpiDmDumpTable (Length, Offset + SubTable->OemDataOffset,
+ Table, SubTable->OemDataLength,
+ AcpiDmTableInfoDbg2OemData);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
}
/* Point to next subtable */
@@ -840,7 +949,6 @@
*
******************************************************************************/
-
void
AcpiDmDumpDmar (
Home |
Main Index |
Thread Index |
Old Index