Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys merge new acpica
details: https://anonhg.NetBSD.org/src/rev/c8e6e8ace4fe
branches: trunk
changeset: 342809:c8e6e8ace4fe
user: christos <christos%NetBSD.org@localhost>
date: Sat Jan 09 21:14:12 2016 +0000
description:
merge new acpica
diffstat:
sys/dev/acpi/acpica/OsdMisc.c | 11 +-
sys/dev/acpi/acpica/OsdSchedule.c | 7 +-
sys/external/bsd/acpica/conf/files.acpica | 4 +-
sys/external/bsd/acpica/dist/common/dmtbdump.c | 341 +-
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 17 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 40 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 18 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 7 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 37 +-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 7 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 16 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 98 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 64 +-
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 11 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 3 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 8 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 58 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 50 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 437 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 32 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 57 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 3 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 3494 +---------
sys/external/bsd/acpica/dist/compiler/dtutils.c | 2 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/prutils.c | 5 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 113 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 189 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 83 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 329 +-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 31 +-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 160 +-
sys/external/bsd/acpica/dist/debugger/dbtest.c | 38 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 36 +-
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 30 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 40 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 12 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c | 24 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c | 16 +-
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 134 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 53 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 84 +-
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 47 +-
sys/external/bsd/acpica/dist/events/evregion.c | 2 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 121 +-
sys/external/bsd/acpica/dist/events/evxface.c | 12 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 54 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 462 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 53 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 7 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 18 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 25 +-
sys/external/bsd/acpica/dist/include/acapps.h | 95 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 39 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 42 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 16 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 34 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 2 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 60 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 14 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 11 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 5 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 49 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 2 +-
sys/external/bsd/acpica/dist/include/actables.h | 26 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 4 +-
sys/external/bsd/acpica/dist/include/actypes.h | 10 +-
sys/external/bsd/acpica/dist/include/acutils.h | 22 +-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 4 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 14 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 43 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 21 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 12 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 39 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 26 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 58 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 2 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 4 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 20 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsutils.c | 67 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 17 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 11 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 16 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 54 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 107 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 22 +-
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 26 +-
sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c | 17 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 696 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 43 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 10 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 36 +-
sys/external/bsd/acpica/dist/utilities/utmutex.c | 33 +-
sys/external/bsd/acpica/dist/utilities/utobject.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 16 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 83 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 10 +-
106 files changed, 2994 insertions(+), 5968 deletions(-)
diffs (truncated from 16355 to 300 lines):
diff -r 97e8bbf2af64 -r c8e6e8ace4fe sys/dev/acpi/acpica/OsdMisc.c
--- a/sys/dev/acpi/acpica/OsdMisc.c Sat Jan 09 21:13:51 2016 +0000
+++ b/sys/dev/acpi/acpica/OsdMisc.c Sat Jan 09 21:14:12 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.14 2013/12/27 20:55:59 christos Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.15 2016/01/09 21:14:42 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.14 2013/12/27 20:55:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.15 2016/01/09 21:14:42 christos Exp $");
#include "opt_acpi.h"
#include "opt_ddb.h"
@@ -198,17 +198,10 @@
acpi_osd_debugger(void)
{
#ifdef ACPI_DEBUG
- static int beenhere;
ACPI_PARSE_OBJECT obj;
label_t acpi_jmpbuf;
label_t *savejmp;
- if (beenhere == 0) {
- printf("Initializing ACPICA debugger...\n");
- AcpiDbInitialize();
- beenhere = 1;
- }
-
printf("Entering ACPICA debugger...\n");
savejmp = db_recover;
setjmp(&acpi_jmpbuf);
diff -r 97e8bbf2af64 -r c8e6e8ace4fe sys/dev/acpi/acpica/OsdSchedule.c
--- a/sys/dev/acpi/acpica/OsdSchedule.c Sat Jan 09 21:13:51 2016 +0000
+++ b/sys/dev/acpi/acpica/OsdSchedule.c Sat Jan 09 21:14:12 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSchedule.c,v 1.17 2013/12/27 18:53:25 christos Exp $ */
+/* $NetBSD: OsdSchedule.c,v 1.18 2016/01/09 21:14:42 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.17 2013/12/27 18:53:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.18 2016/01/09 21:14:42 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -113,9 +113,6 @@
case OSL_NOTIFY_HANDLER:
pri = 3;
break;
- case OSL_DEBUGGER_THREAD:
- pri = 0;
- break;
default:
return AE_BAD_PARAMETER;
}
diff -r 97e8bbf2af64 -r c8e6e8ace4fe sys/external/bsd/acpica/conf/files.acpica
--- a/sys/external/bsd/acpica/conf/files.acpica Sat Jan 09 21:13:51 2016 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica Sat Jan 09 21:14:12 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.11 2015/08/28 02:33:59 uebayasi Exp $
+# $NetBSD: files.acpica,v 1.12 2016/01/09 21:14:12 christos Exp $
define acpica
makeoptions acpi CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -14,7 +14,6 @@
file debugger/dbconvert.c acpica & acpi_debug & ddb
file debugger/dbdisply.c acpica & acpi_debug & ddb
file debugger/dbexec.c acpica & acpi_debug & ddb
-file debugger/dbfileio.c acpica & acpi_debug & ddb
file debugger/dbhistry.c acpica & acpi_debug & ddb
file debugger/dbinput.c acpica & acpi_debug & ddb
file debugger/dbmethod.c acpica & acpi_debug & ddb
@@ -96,6 +95,7 @@
file executer/exstoren.c acpica
file executer/exstorob.c acpica
file executer/exsystem.c acpica
+file executer/extrace.c acpica
file executer/exutils.c acpica
# hardware/
diff -r 97e8bbf2af64 -r c8e6e8ace4fe sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Jan 09 21:13:51 2016 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Jan 09 21:14:12 2016 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -178,6 +178,7 @@
{
AcpiOsPrintf ("%c", Buffer[i]);
}
+
AcpiOsPrintf ("\"\n");
return;
@@ -222,7 +223,7 @@
/* Validate the first checksum */
Checksum = AcpiDmGenerateChecksum (Rsdp, sizeof (ACPI_RSDP_COMMON),
- Rsdp->Checksum);
+ Rsdp->Checksum);
if (Checksum != Rsdp->Checksum)
{
AcpiOsPrintf ("/* Incorrect Checksum above, should be 0x%2.2X */\n",
@@ -243,7 +244,7 @@
/* Validate the extended checksum over entire RSDP */
Checksum = AcpiDmGenerateChecksum (Rsdp, sizeof (ACPI_TABLE_RSDP),
- Rsdp->ExtendedChecksum);
+ Rsdp->ExtendedChecksum);
if (Checksum != Rsdp->ExtendedChecksum)
{
AcpiOsPrintf (
@@ -361,7 +362,8 @@
/* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt1);
if (ACPI_FAILURE (Status))
{
return;
@@ -372,7 +374,8 @@
if ((Table->Length > ACPI_FADT_V1_SIZE) &&
(Table->Length <= ACPI_FADT_V2_SIZE))
{
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt2);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt2);
if (ACPI_FAILURE (Status))
{
return;
@@ -383,7 +386,8 @@
else if (Table->Length > ACPI_FADT_V2_SIZE)
{
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt3);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt3);
if (ACPI_FAILURE (Status))
{
return;
@@ -393,7 +397,8 @@
if (Table->Length > ACPI_FADT_V3_SIZE)
{
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt5);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt5);
if (ACPI_FAILURE (Status))
{
return;
@@ -404,7 +409,8 @@
if (Table->Length > ACPI_FADT_V3_SIZE)
{
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt6);
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt6);
if (ACPI_FAILURE (Status))
{
return;
@@ -485,7 +491,8 @@
}
AcpiOsPrintf (
- "\n// ACPI Warning: FADT revision %X does not match length: found %X expected %X\n",
+ "\n// ACPI Warning: FADT revision %X does not match length: "
+ "found %X expected %X\n",
Revision, Length, ExpectedLength);
}
@@ -527,7 +534,7 @@
/* Common subtable header */
Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Header.Length, AcpiDmTableInfoAsfHdr);
+ SubTable->Header.Length, AcpiDmTableInfoAsfHdr);
if (ACPI_FAILURE (Status))
{
return;
@@ -579,12 +586,13 @@
default:
- AcpiOsPrintf ("\n**** Unknown ASF subtable type 0x%X\n", SubTable->Header.Type);
+ AcpiOsPrintf ("\n**** Unknown ASF subtable type 0x%X\n",
+ SubTable->Header.Type);
return;
}
Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
- SubTable->Header.Length, InfoTable);
+ SubTable->Header.Length, InfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -601,7 +609,7 @@
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Table->Length, DataOffset,
- DataTable, DataLength, DataInfoTable);
+ DataTable, DataLength, DataInfoTable);
if (ACPI_FAILURE (Status))
{
return;
@@ -624,9 +632,12 @@
AcpiOsPrintf ("%2.2X ", *DataTable);
DataTable++;
DataOffset++;
+
if (DataOffset > Table->Length)
{
- AcpiOsPrintf ("**** ACPI table terminates in the middle of a data structure! (ASF! table)\n");
+ AcpiOsPrintf (
+ "**** ACPI table terminates in the middle of a "
+ "data structure! (ASF! table)\n");
return;
}
}
@@ -650,7 +661,8 @@
}
Offset += SubTable->Header.Length;
- SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable, SubTable->Header.Length);
+ SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable,
+ SubTable->Header.Length);
}
}
@@ -693,7 +705,7 @@
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Header.Length, AcpiDmTableInfoCpep0);
+ SubTable->Header.Length, AcpiDmTableInfoCpep0);
if (ACPI_FAILURE (Status))
{
return;
@@ -703,7 +715,7 @@
Offset += SubTable->Header.Length;
SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, SubTable,
- SubTable->Header.Length);
+ SubTable->Header.Length);
}
}
@@ -747,7 +759,7 @@
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoCsrt0);
+ SubTable->Length, AcpiDmTableInfoCsrt0);
if (ACPI_FAILURE (Status))
{
return;
@@ -761,7 +773,7 @@
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + SubOffset, SharedInfoTable,
- sizeof (ACPI_CSRT_SHARED_INFO), AcpiDmTableInfoCsrt1);
+ sizeof (ACPI_CSRT_SHARED_INFO), AcpiDmTableInfoCsrt1);
if (ACPI_FAILURE (Status))
{
return;
@@ -779,7 +791,7 @@
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubTable,
- SubSubTable->Length, AcpiDmTableInfoCsrt2);
+ SubSubTable->Length, AcpiDmTableInfoCsrt2);
if (ACPI_FAILURE (Status))
{
return;
@@ -793,8 +805,8 @@
if (InfoLength)
{
Status = AcpiDmDumpTable (Length,
- Offset + SubOffset + SubSubOffset, Table,
- InfoLength, AcpiDmTableInfoCsrt2a);
+ Offset + SubOffset + SubSubOffset, Table,
+ InfoLength, AcpiDmTableInfoCsrt2a);
if (ACPI_FAILURE (Status))
{
Home |
Main Index |
Thread Index |
Old Index