Module Name: src
Committed By: christos
Date: Sat Mar 28 19:49:28 UTC 2020
Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
dmtbinfo.c
src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
aslcompiler.h aslcompiler.l aslerror.c aslfileio.c aslfiles.c
aslload.c asllookup.c aslopcodes.c aslopt.c asloptions.c
aslpredef.c aslprepkg.c aslsupport.l asltree.c aslutils.c
aslwalks.c aslxref.c dtcompile.c dtcompilerparser.y dtfield.c
dtparser.y dtsubtable.c dttable.c dtutils.c prparser.y prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbdisply.c dbexec.c
dbinput.c dbmethod.c dbnames.c dbtest.c dbutils.c
src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c dmcstyle.c
dmresrc.c dmresrcl.c dmresrcl2.c dmwalk.c
src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
dspkginit.c dsutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
evxface.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c
exdump.c
src/sys/external/bsd/acpica/dist/hardware: hwesleep.c hwregs.c
hwsleep.c hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acapps.h acdebug.h acdisasm.h
acexcep.h acglobal.h acinterp.h aclocal.h acmacros.h acnamesp.h
acoutput.h acpiosxf.h acpixf.h acresrc.h actables.h actbl1.h
actypes.h acutils.h amlresrc.h
src/sys/external/bsd/acpica/dist/include/platform: acgcc.h acnetbsd.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c nsrepair2.c nsxfeval.c nsxfname.c
src/sys/external/bsd/acpica/dist/os_specific/service_layers:
oslinuxtbl.c
src/sys/external/bsd/acpica/dist/parser: psopcode.c psopinfo.c
src/sys/external/bsd/acpica/dist/resources: rsdump.c rsdumpinfo.c
rsutils.c rsxface.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c
tbutils.c tbxface.c tbxfload.c tbxfroot.c
src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utcache.c utdebug.c
utdecode.c utdelete.c uteval.c utglobal.c utmisc.c utmutex.c
utnonansi.c utobject.c utosi.c utprint.c uttrack.c utuuid.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \
src/sys/external/bsd/acpica/dist/compiler/aslwalks.c \
src/sys/external/bsd/acpica/dist/compiler/dttable.c \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
src/sys/external/bsd/acpica/dist/compiler/asltree.c \
src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/aslfileio.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/asllookup.c \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c \
src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/compiler/aslopt.c
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c \
src/sys/external/bsd/acpica/dist/debugger/dbutils.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/debugger/dbdisply.c \
src/sys/external/bsd/acpica/dist/debugger/dbexec.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/debugger/dbtest.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c \
src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \
src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c \
src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/events/evrgnini.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/events/evxface.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/executer/exdebug.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/executer/exdump.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/hardware/hwesleep.c \
src/sys/external/bsd/acpica/dist/hardware/hwregs.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/include/acapps.h
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/include/acdebug.h \
src/sys/external/bsd/acpica/dist/include/acmacros.h
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/include/acexcep.h \
src/sys/external/bsd/acpica/dist/include/acresrc.h
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/include/acglobal.h \
src/sys/external/bsd/acpica/dist/include/aclocal.h \
src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/include/acinterp.h \
src/sys/external/bsd/acpica/dist/include/actables.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/acnamesp.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/include/acpiosxf.h \
src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/include/amlresrc.h
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/acpica/dist/include/platform/acgcc.h
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/namespace/nsdump.c \
src/sys/external/bsd/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/namespace/nseval.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/parser/psopcode.c \
src/sys/external/bsd/acpica/dist/parser/psopinfo.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/resources/rsdump.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/resources/rsutils.c \
src/sys/external/bsd/acpica/dist/resources/rsxface.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/tables/tbdata.c \
src/sys/external/bsd/acpica/dist/tables/tbfadt.c \
src/sys/external/bsd/acpica/dist/tables/tbinstal.c \
src/sys/external/bsd/acpica/dist/tables/tbxface.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/utilities/utcache.c \
src/sys/external/bsd/acpica/dist/utilities/utosi.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/utilities/utdecode.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.c \
src/sys/external/bsd/acpica/dist/utilities/utnonansi.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/utilities/uteval.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/utilities/utglobal.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/utilities/utmisc.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/utilities/utmutex.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/acpica/dist/utilities/utobject.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/utilities/utprint.c \
src/sys/external/bsd/acpica/dist/utilities/utuuid.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/utilities/uttrack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/common/dmtables.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtables.c:1.3 src/sys/external/bsd/acpica/dist/common/dmtables.c:1.4
--- src/sys/external/bsd/acpica/dist/common/dmtables.c:1.3 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/common/dmtables.c Sat Mar 28 15:49:25 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -398,7 +398,6 @@ AdParseTable (
AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
- ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
AcpiUtSetIntegerWidth (Table->Revision);
Index: src/sys/external/bsd/acpica/dist/common/dmtbdump.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.11 src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.12
--- src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.11 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Mar 28 15:49:25 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.17 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.18
--- src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.17 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/common/dmtbinfo.c Sat Mar 28 15:49:25 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c:1.13 src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c:1.14
--- src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c:1.13 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
#include "aslcompiler.h"
#include "aslcompiler.y.h"
+#include "acnamesp.h"
#include <string.h>
@@ -313,6 +314,7 @@ AnCheckMethodReturnValue (
{
ACPI_PARSE_OBJECT *OwningOp;
ACPI_NAMESPACE_NODE *Node;
+ char *ExternalPath;
Node = ArgOp->Asl.Node;
@@ -327,18 +329,19 @@ AnCheckMethodReturnValue (
/* Examine the parent op of this method */
OwningOp = Node->Op;
+ ExternalPath = AcpiNsGetNormalizedPathname (Node, TRUE);
+
if (OwningOp->Asl.CompileFlags & OP_METHOD_NO_RETVAL)
{
/* Method NEVER returns a value */
- AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, Op->Asl.ExternalName);
+ AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, ExternalPath);
}
else if (OwningOp->Asl.CompileFlags & OP_METHOD_SOME_NO_RETVAL)
{
/* Method SOMETIMES returns a value, SOMETIMES not */
- AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL,
- Op, Op->Asl.ExternalName);
+ AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL, Op, ExternalPath);
}
else if (!(ThisNodeBtype & RequiredBtypes))
{
@@ -362,6 +365,11 @@ AnCheckMethodReturnValue (
AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
}
}
+
+ if (ExternalPath)
+ {
+ ACPI_FREE (ExternalPath);
+ }
}
Index: src/sys/external/bsd/acpica/dist/compiler/aslwalks.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslwalks.c:1.13 src/sys/external/bsd/acpica/dist/compiler/aslwalks.c:1.14
--- src/sys/external/bsd/acpica/dist/compiler/aslwalks.c:1.13 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslwalks.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dttable.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.13 src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.14
--- src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.13 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dttable.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.13 src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.14
--- src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.13 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dtutils.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,8 @@ DtError (
/* Check if user wants to ignore this exception */
- if (AslIsExceptionIgnored (Level, MessageId))
+ if (AslIsExceptionIgnored (AslGbl_Files[ASL_FILE_INPUT].Filename,
+ FieldObject->Line, Level, MessageId))
{
return;
}
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompile.c:1.18 src/sys/external/bsd/acpica/dist/compiler/aslcompile.c:1.19
--- src/sys/external/bsd/acpica/dist/compiler/aslcompile.c:1.18 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -175,6 +175,7 @@ CmDoCompile (
LsDumpParseTree ();
+ UtEndEvent (Event);
UtEndEvent (FullCompile);
return (AE_OK);
@@ -539,7 +540,7 @@ void
AslCompilerFileHeader (
UINT32 FileId)
{
- struct tm *NewTime;
+ char *NewTime;
time_t Aclock;
char *Prefix = "";
@@ -583,13 +584,17 @@ AslCompilerFileHeader (
/* Compilation header with timestamp */
- (void) time (&Aclock);
- NewTime = localtime (&Aclock);
+ Aclock = time (NULL);
+ NewTime = ctime (&Aclock);
FlPrintFile (FileId,
- "%sCompilation of \"%s\" - %s%s\n",
- Prefix, AslGbl_Files[ASL_FILE_INPUT].Filename, asctime (NewTime),
- Prefix);
+ "%sCompilation of \"%s\" -",
+ Prefix, AslGbl_Files[ASL_FILE_INPUT].Filename);
+
+ if (NewTime)
+ {
+ FlPrintFile (FileId, " %s%s\n", NewTime, Prefix);
+ }
switch (FileId)
{
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.15 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.16
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.15 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -265,6 +265,15 @@ MtMethodAnalysisWalkEnd (
UINT32 Level,
void *Context);
+UINT32
+MtProcessTypeOp (
+ ACPI_PARSE_OBJECT *TypeOp);
+
+UINT8
+MtProcessParameterTypeList (
+ ACPI_PARSE_OBJECT *ParamTypeOp,
+ UINT32 *TypeList);
+
/*
* aslbtypes - bitfield data types
@@ -371,7 +380,7 @@ AslCheckExpectedExceptions (
void);
ACPI_STATUS
-AslExpectException (
+AslLogExpectedException (
char *MessageIdString);
ACPI_STATUS
@@ -384,10 +393,16 @@ AslDisableException (
BOOLEAN
AslIsExceptionIgnored (
+ char *Filename,
+ UINT32 LineNumber,
UINT8 Level,
UINT16 MessageId);
void
+AslLogExpectedExceptionByLine (
+ char *MessageIdString);
+
+void
AslCoreSubsystemError (
ACPI_PARSE_OBJECT *Op,
ACPI_STATUS Status,
@@ -1125,10 +1140,14 @@ UtDumpBasicOp (
ACPI_PARSE_OBJECT *Op,
UINT32 Level);
-void *
-UtGetParentMethod (
+ACPI_NAMESPACE_NODE *
+UtGetParentMethodNode (
ACPI_NAMESPACE_NODE *Node);
+ACPI_PARSE_OBJECT *
+UtGetParentMethodOp (
+ ACPI_PARSE_OBJECT *Op);
+
BOOLEAN
UtNodeIsDescendantOf (
ACPI_NAMESPACE_NODE *Node1,
Index: src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.15 src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.15 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslfiles.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.15 src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.15 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dtcompile.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtfield.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtfield.c:1.15 src/sys/external/bsd/acpica/dist/compiler/dtfield.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/dtfield.c:1.15 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dtfield.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.14 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.15
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.14 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Sat Mar 28 15:49:26 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,6 @@
#include <stdlib.h>
#include <string.h>
-YYSTYPE AslCompilerlval;
/*
* Generation: Use the following command line:
@@ -87,6 +86,7 @@ count (int type);
LeadNameChar [A-Za-z_]
DigitChar [0-9]
+ErrorCode [(][ ]*[1-9][0-9][0-9][0-9][ ]*[)]
OctalChar [0-7]
HexDigitChar [A-Fa-f0-9]
RootChar [\\]
@@ -584,7 +584,7 @@ NamePathTail [.]{NameSeg}
"IPMI" { count (0); return (PARSEOP_REGIONSPACE_IPMI); }
"GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */
"GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */
-"PlatformCommChannel" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
+"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
"FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
/* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
@@ -702,6 +702,22 @@ NamePathTail [.]{NameSeg}
"__LINE__" { count (0); return (PARSEOP___LINE__); }
"__PATH__" { count (0); return (PARSEOP___PATH__); }
"__METHOD__" { count (0); return (PARSEOP___METHOD__); }
+"__EXPECT__"{ErrorCode} { char *s;
+ int index = 0;
+ count (0);
+ while (!isdigit (AslCompilertext[index]))
+ {
+ index++;
+ }
+
+ /*
+ * The eror code is contained inside the
+ * {ErrorCode} pattern. Extract it and log it
+ * as the expected error code.
+ */
+ s = UtLocalCacheCalloc (ASL_ERROR_CODE_LENGTH + 1);
+ memcpy (s, AslCompilertext + index, ASL_ERROR_CODE_LENGTH);
+ AslLogExpectedExceptionByLine (s); }
{NameSeg} { char *s;
count (0);
Index: src/sys/external/bsd/acpica/dist/compiler/aslerror.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.14 src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.15
--- src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.14 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslerror.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,6 +54,8 @@ AeAddToErrorLog (
static BOOLEAN
AslIsExceptionExpected (
+ char *Filename,
+ UINT32 LineNumber,
UINT8 Level,
UINT16 MessageId);
@@ -62,7 +64,8 @@ AslIsExceptionDisabled (
UINT8 Level,
UINT16 MessageId);
-static void AslInitEnode (
+static void
+AslInitEnode (
ASL_ERROR_MSG **Enode,
UINT8 Level,
UINT16 MessageId,
@@ -643,7 +646,14 @@ AePrintSubError (
MainMessage = AeDecodeMessageId (Enode->MessageId);
- fprintf (OutputFile, " %s%s", MainMessage, "\n ");
+ fprintf (OutputFile, " %s", MainMessage);
+
+ if (Enode->Message)
+ {
+ fprintf (OutputFile, "(%s)", Enode->Message);
+ }
+
+ fprintf (OutputFile, "\n ");
(void) AePrintErrorSourceLine (OutputFile, Enode, &PrematureEOF, &Total);
fprintf (OutputFile, "\n");
}
@@ -841,7 +851,7 @@ AslCommonError (
{
/* Check if user wants to ignore this exception */
- if (AslIsExceptionIgnored (Level, MessageId))
+ if (AslIsExceptionIgnored (Filename, LogicalLineNumber, Level, MessageId))
{
return;
}
@@ -972,6 +982,8 @@ GetModifiedLevel (
BOOLEAN
AslIsExceptionIgnored (
+ char *Filename,
+ UINT32 LineNumber,
UINT8 Level,
UINT16 MessageId)
{
@@ -981,7 +993,8 @@ AslIsExceptionIgnored (
/* Note: this allows exception to be disabled and expected */
ExceptionIgnored = AslIsExceptionDisabled (Level, MessageId);
- ExceptionIgnored |= AslIsExceptionExpected (Level, MessageId);
+ ExceptionIgnored |=
+ AslIsExceptionExpected (Filename, LineNumber, Level, MessageId);
return (AslGbl_AllExceptionsDisabled || ExceptionIgnored);
}
@@ -989,7 +1002,7 @@ AslIsExceptionIgnored (
/*******************************************************************************
*
- * FUNCTION: AslCheckExpectException
+ * FUNCTION: AslCheckExpectedException
*
* PARAMETERS: none
*
@@ -1005,6 +1018,8 @@ AslCheckExpectedExceptions (
void)
{
UINT8 i;
+ ASL_EXPECTED_MSG_NODE *Current = AslGbl_ExpectedErrorCodeList;
+ ASL_LOCATION_NODE *LocationNode;
for (i = 0; i < AslGbl_ExpectedMessagesIndex; ++i)
@@ -1015,12 +1030,32 @@ AslCheckExpectedExceptions (
AslGbl_ExpectedMessages[i].MessageIdStr);
}
}
+
+ while (Current)
+ {
+ LocationNode = Current->LocationList;
+
+ while (LocationNode)
+ {
+ if (!LocationNode->MessageReceived)
+ {
+ AslCommonError (ASL_ERROR, ASL_MSG_EXCEPTION_NOT_RECEIVED,
+ LocationNode->LineNumber, LocationNode->LineNumber,
+ LocationNode->LogicalByteOffset, LocationNode->Column,
+ LocationNode->Filename, Current->MessageIdStr);
+ }
+
+ LocationNode = LocationNode->Next;
+ }
+
+ Current = Current->Next;
+ }
}
/*******************************************************************************
*
- * FUNCTION: AslExpectException
+ * FUNCTION: AslLogExpectedException
*
* PARAMETERS: MessageIdString - ID of excepted exception during compile
*
@@ -1033,7 +1068,7 @@ AslCheckExpectedExceptions (
******************************************************************************/
ACPI_STATUS
-AslExpectException (
+AslLogExpectedException (
char *MessageIdString)
{
UINT32 MessageId;
@@ -1069,6 +1104,61 @@ AslExpectException (
/*******************************************************************************
*
+ * FUNCTION: AslLogExpectedExceptionByLine
+ *
+ * PARAMETERS: MessageIdString - ID of excepted exception during compile
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Enter a message ID into the global expected messages table
+ * based on file and line number. If these messages are not raised
+ * during the compilation, throw an error.
+ *
+ ******************************************************************************/
+
+void
+AslLogExpectedExceptionByLine (
+ char *MessageIdString)
+{
+ ASL_LOCATION_NODE *NewErrorLocationNode;
+ ASL_EXPECTED_MSG_NODE *Current = AslGbl_ExpectedErrorCodeList;
+ UINT32 MessageId;
+
+
+ NewErrorLocationNode = UtLocalCalloc (sizeof (ASL_LOCATION_NODE));
+
+ NewErrorLocationNode->LineNumber = AslGbl_CurrentLineNumber;
+ NewErrorLocationNode->Filename = AslGbl_Files[ASL_FILE_INPUT].Filename;
+ NewErrorLocationNode->LogicalByteOffset = AslGbl_CurrentLineOffset;
+ NewErrorLocationNode->Column = AslGbl_CurrentColumn;
+
+ MessageId = (UINT32) strtoul (MessageIdString, NULL, 0);
+
+ /* search the existing list for a matching message ID */
+
+ while (Current && Current->MessageId != MessageId )
+ {
+ Current = Current->Next;
+ }
+ if (!Current)
+ {
+ /* ID was not found, create a new node for this message ID */
+
+ Current = UtLocalCalloc (sizeof (ASL_EXPECTED_MSG_NODE));
+
+ Current->Next = AslGbl_ExpectedErrorCodeList;
+ Current->MessageIdStr = MessageIdString;
+ Current->MessageId = MessageId;
+ AslGbl_ExpectedErrorCodeList = Current;
+ }
+
+ NewErrorLocationNode->Next = Current->LocationList;
+ Current->LocationList = NewErrorLocationNode;
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: AslDisableException
*
* PARAMETERS: MessageIdString - ID to be disabled
@@ -1157,6 +1247,7 @@ AslElevateException (
return (AE_OK);
}
+
/*******************************************************************************
*
* FUNCTION: AslIsExceptionDisabled
@@ -1173,9 +1264,13 @@ AslElevateException (
static BOOLEAN
AslIsExceptionExpected (
+ char *Filename,
+ UINT32 LineNumber,
UINT8 Level,
UINT16 MessageId)
{
+ ASL_EXPECTED_MSG_NODE *Current = AslGbl_ExpectedErrorCodeList;
+ ASL_LOCATION_NODE *CurrentErrorLocation;
UINT32 EncodedMessageId;
UINT32 i;
@@ -1193,6 +1288,28 @@ AslIsExceptionExpected (
}
}
+ while (Current && Current->MessageId != EncodedMessageId)
+ {
+ Current = Current->Next;
+ }
+ if (!Current)
+ {
+ return (FALSE);
+ }
+
+ CurrentErrorLocation = Current->LocationList;
+
+ while (CurrentErrorLocation)
+ {
+ if (!strcmp (CurrentErrorLocation->Filename, Filename) &&
+ CurrentErrorLocation->LineNumber == LineNumber)
+ {
+ return (CurrentErrorLocation->MessageReceived = TRUE);
+ }
+
+ CurrentErrorLocation = CurrentErrorLocation->Next;
+ }
+
return (FALSE);
}
@@ -1295,7 +1412,8 @@ AslDualParseOpError (
/* Check if user wants to ignore this exception */
- if (AslIsExceptionIgnored (Level, MainMsgId) || !MainOp)
+ if (!MainOp || AslIsExceptionIgnored (MainOp->Asl.Filename,
+ MainOp->Asl.LogicalLineNumber, Level, MainMsgId))
{
return;
}
Index: src/sys/external/bsd/acpica/dist/compiler/aslsupport.l
diff -u src/sys/external/bsd/acpica/dist/compiler/aslsupport.l:1.14 src/sys/external/bsd/acpica/dist/compiler/aslsupport.l:1.15
--- src/sys/external/bsd/acpica/dist/compiler/aslsupport.l:1.14 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslsupport.l Sat Mar 28 15:49:26 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/asltree.c
diff -u src/sys/external/bsd/acpica/dist/compiler/asltree.c:1.14 src/sys/external/bsd/acpica/dist/compiler/asltree.c:1.15
--- src/sys/external/bsd/acpica/dist/compiler/asltree.c:1.14 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/asltree.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.14 src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.15
--- src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.14 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dtparser.y Sat Mar 28 15:49:26 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/prparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.14 src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.15
--- src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.14 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/prparser.y Sat Mar 28 15:49:26 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslfileio.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslfileio.c:1.10 src/sys/external/bsd/acpica/dist/compiler/aslfileio.c:1.11
--- src/sys/external/bsd/acpica/dist/compiler/aslfileio.c:1.10 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslfileio.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslload.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.16 src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.16 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslload.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,15 @@ LdCheckSpecialNames (
ACPI_NAMESPACE_NODE *Node,
ACPI_PARSE_OBJECT *Op);
+static ACPI_STATUS
+LdAnalyzeExternals (
+ ACPI_NAMESPACE_NODE *Node,
+ ACPI_PARSE_OBJECT *Op,
+ ACPI_OBJECT_TYPE ExternalOpType,
+ ACPI_OBJECT_TYPE ObjectType,
+ ACPI_WALK_STATE *WalkState);
+
+
/*******************************************************************************
*
* FUNCTION: LdLoadNamespace
@@ -165,15 +174,15 @@ LdLoadFieldElements (
ACPI_PARSE_OBJECT *SourceRegion;
ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
+ char *ExternalPath;
SourceRegion = UtGetArg (Op, 0);
if (SourceRegion)
{
Status = AcpiNsLookup (WalkState->ScopeInfo,
- SourceRegion->Asl.Value.String,
- AmlType, ACPI_IMODE_EXECUTE,
- ACPI_NS_DONT_OPEN_SCOPE, NULL, &Node);
+ SourceRegion->Asl.Value.String, AmlType, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, &Node);
if (Status == AE_NOT_FOUND)
{
/*
@@ -249,9 +258,16 @@ LdLoadFieldElements (
* The name already exists in this scope
* But continue processing the elements
*/
+ ExternalPath = AcpiNsGetNormalizedPathname (Node, TRUE);
+
AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Child,
- Child->Asl.Value.String, ASL_MSG_FOUND_HERE, Node->Op,
- Node->Op->Asl.ExternalName);
+ ExternalPath, ASL_MSG_FOUND_HERE, Node->Op,
+ ExternalPath);
+
+ if (ExternalPath)
+ {
+ ACPI_FREE (ExternalPath);
+ }
}
}
else
@@ -295,6 +311,7 @@ LdLoadResourceElements (
ACPI_PARSE_OBJECT *InitializerOp = NULL;
ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
+ char *ExternalPath;
/*
@@ -311,10 +328,17 @@ LdLoadResourceElements (
{
/* Actual node causing the error was saved in ParentMethod */
+ ExternalPath = AcpiNsGetNormalizedPathname (Node, TRUE);
+
AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS,
(ACPI_PARSE_OBJECT *) Op->Asl.ParentMethod,
- Op->Asl.Namepath, ASL_MSG_FOUND_HERE, Node->Op,
- Node->Op->Asl.ExternalName);
+ ExternalPath, ASL_MSG_FOUND_HERE, Node->Op,
+ ExternalPath);
+
+ if (ExternalPath)
+ {
+ ACPI_FREE (ExternalPath);
+ }
return (AE_OK);
}
return (Status);
@@ -391,6 +415,7 @@ LdNamespace1Begin (
BOOLEAN ForceNewScope = FALSE;
const ACPI_OPCODE_INFO *OpInfo;
ACPI_PARSE_OBJECT *ParentOp;
+ char *ExternalPath;
ACPI_FUNCTION_NAME (LdNamespace1Begin);
@@ -451,7 +476,8 @@ LdNamespace1Begin (
/* Check for a possible illegal forward reference */
if ((Op->Asl.ParseOpcode == PARSEOP_NAMESEG) ||
- (Op->Asl.ParseOpcode == PARSEOP_NAMESTRING))
+ (Op->Asl.ParseOpcode == PARSEOP_NAMESTRING) ||
+ (Op->Asl.ParseOpcode == PARSEOP_METHODCALL))
{
/*
* Op->Asl.Namepath will be NULL for these opcodes.
@@ -467,7 +493,8 @@ LdNamespace1Begin (
* We only want references to named objects:
* Store (2, WXYZ) -> Attempt to resolve the name
*/
- if (OpInfo->Class == AML_CLASS_NAMED_OBJECT)
+ if ((Op->Asl.ParseOpcode != PARSEOP_METHODCALL) &&
+ (OpInfo->Class == AML_CLASS_NAMED_OBJECT))
{
return (AE_OK);
}
@@ -775,65 +802,40 @@ LdNamespace1Begin (
Node->Type = (UINT8) ObjectType;
Status = AE_OK;
}
- else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
- (Op->Asl.ParseOpcode != PARSEOP_EXTERNAL))
+ else if ((Node->Flags & ANOBJ_IS_EXTERNAL) ||
+ (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
{
- /*
- * Allow one create on an object or segment that was
- * previously declared External
- */
- Node->Flags &= ~ANOBJ_IS_EXTERNAL;
- Node->Type = (UINT8) ObjectType;
-
- /* Just retyped a node, probably will need to open a scope */
-
- if (AcpiNsOpensScope (ObjectType))
+ Status = LdAnalyzeExternals (Node, Op, ActualObjectType,
+ ObjectType, WalkState);
+ if (ACPI_FAILURE (Status))
{
- Status = AcpiDsScopeStackPush (Node, ObjectType, WalkState);
- if (ACPI_FAILURE (Status))
+ if (Status == AE_ERROR)
{
- return_ACPI_STATUS (Status);
+ /*
+ * The use of AE_ERROR here indicates that there was a
+ * compiler error emitted in LdAnalyzeExternals which
+ * means that the caller should proceed to the next Op
+ * for analysis of subsequent parse objects.
+ */
+ Status = AE_OK;
}
- }
-
- Status = AE_OK;
- }
- else if (!(Node->Flags & ANOBJ_IS_EXTERNAL) &&
- (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
- {
- /*
- * Allow externals in same scope as the definition of the
- * actual object. Similar to C. Allows multiple definition
- * blocks that refer to each other in the same file.
- */
- Status = AE_OK;
- }
- else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
- (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) &&
- (ObjectType == ACPI_TYPE_ANY))
- {
- /* Allow update of externals of unknown type. */
-
- if (AcpiNsOpensScope (ActualObjectType))
- {
- Node->Type = (UINT8) ActualObjectType;
- Status = AE_OK;
- }
- else
- {
- sprintf (AslGbl_MsgBuffer, "%s [%s]", Op->Asl.ExternalName,
- AcpiUtGetTypeName (Node->Type));
- AslError (ASL_ERROR, ASL_MSG_SCOPE_TYPE, Op, AslGbl_MsgBuffer);
- return_ACPI_STATUS (AE_OK);
+ return_ACPI_STATUS (Status);
}
}
else
{
/* Valid error, object already exists */
+ ExternalPath = AcpiNsGetNormalizedPathname (Node, TRUE);
+
AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op,
- Op->Asl.ExternalName, ASL_MSG_FOUND_HERE, Node->Op,
- Node->Op->Asl.ExternalName);
+ ExternalPath, ASL_MSG_FOUND_HERE, Node->Op,
+ ExternalPath);
+
+ if (ExternalPath)
+ {
+ ACPI_FREE (ExternalPath);
+ }
return_ACPI_STATUS (AE_OK);
}
}
@@ -882,15 +884,17 @@ FinishNode:
* Set the actual data type if appropriate (EXTERNAL term only)
* As of 11/19/2019, ASL External() does not support parameter
* counts. When an External method is loaded, the parameter count is
- * unknown setting Node->Value to ASL_EXTERNAL_METHOD_UNKNOWN_PARAMS
- * indicates that the parameter count for this method is unknown.
- * This information is used in ASL cross reference to help determine the
- * parameter count through method calls.
+ * recorded in the external's arg count parameter. The parameter count may
+ * or may not be known in the declaration. If the value of this node turns
+ * out to be ASL_EXTERNAL_METHOD_UNKNOWN_PARAMS, it indicates that
+ * we do not know the parameter count and that we must look at the usage of
+ * the External method call to get this information.
*/
if (ActualObjectType != ACPI_TYPE_ANY)
{
Node->Type = (UINT8) ActualObjectType;
- Node->Value = ASL_EXTERNAL_METHOD_UNKNOWN_PARAMS;
+ Node->Value = (UINT32)
+ Op->Asl.Child->Asl.Next->Asl.Next->Asl.Value.Integer;
}
if (Op->Asl.ParseOpcode == PARSEOP_METHOD)
@@ -908,6 +912,203 @@ FinishNode:
/*******************************************************************************
*
+ * FUNCTION: LdAnalyzeExternals
+ *
+ * PARAMETERS: Type1
+ * Type2
+ *
+ * RETURN: BOOLEAN
+ *
+ * DESCRIPTION: Match Type1 and Type2 with the assumption that one might be
+ * using external types and another might be using local types.
+ * This should be used to compare the types found in external
+ * declarations with types found in other external declarations or
+ * named object declaration. This should not be used to match two
+ * object type declarations.
+ *
+ ******************************************************************************/
+
+static BOOLEAN
+LdTypesMatchExternType (
+ ACPI_OBJECT_TYPE Type1,
+ ACPI_OBJECT_TYPE Type2)
+{
+ BOOLEAN Type1IsLocal = Type1 > ACPI_TYPE_EXTERNAL_MAX;
+ BOOLEAN Type2IsLocal = Type2 > ACPI_TYPE_EXTERNAL_MAX;
+ ACPI_OBJECT_TYPE ExternalType;
+ ACPI_OBJECT_TYPE LocalType;
+
+
+ /*
+ * The inputs could represent types that are local to ACPICA or types that
+ * are known externally. Some local types, such as the OperationRegion
+ * field units, are defined with more granularity than ACPICA local types.
+ *
+ * Therefore, map the local types to the external types before matching.
+ */
+ if (Type1IsLocal && !Type2IsLocal)
+ {
+ LocalType = Type1;
+ ExternalType = Type2;
+ }
+ else if (!Type1IsLocal && Type2IsLocal)
+ {
+ LocalType = Type2;
+ ExternalType = Type1;
+ }
+ else
+ {
+ return (Type1 == Type2);
+ }
+
+ switch (LocalType)
+ {
+ case ACPI_TYPE_LOCAL_REGION_FIELD:
+ case ACPI_TYPE_LOCAL_BANK_FIELD:
+ case ACPI_TYPE_LOCAL_INDEX_FIELD:
+
+ LocalType = ACPI_TYPE_FIELD_UNIT;
+ break;
+
+ default:
+ break;
+ }
+
+ return (LocalType == ExternalType);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: LdAnalyzeExternals
+ *
+ * PARAMETERS: Node - Node that represents the named object
+ * Op - Named object declaring this named object
+ * ExternalOpType - Type of ExternalOp
+ * ObjectType - Type of Declared object
+ * WalkState - Current WalkState
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Node and Op represents an identically named object declaration
+ * that is either declared by the ASL external keyword or declared
+ * by operators that declare named objects (i.e. Name, Device,
+ * OperationRegion, and etc.). This function ensures that the
+ * declarations do not contradict each other.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+LdAnalyzeExternals (
+ ACPI_NAMESPACE_NODE *Node,
+ ACPI_PARSE_OBJECT *Op,
+ ACPI_OBJECT_TYPE ExternalOpType,
+ ACPI_OBJECT_TYPE ObjectType,
+ ACPI_WALK_STATE *WalkState)
+{
+ ACPI_STATUS Status = AE_OK;
+ ACPI_OBJECT_TYPE ActualExternalOpType;
+ ACPI_OBJECT_TYPE ActualOpType;
+ ACPI_PARSE_OBJECT *ExternalOp;
+ ACPI_PARSE_OBJECT *ActualOp;
+
+
+ /*
+ * The declaration represented by Node and Op must have the same type.
+ * The type of the external Op is represented by ExternalOpType. However,
+ * the type of the pre-existing declaration depends on whether if Op
+ * is an external declaration or an actual declaration.
+ */
+ if (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL)
+ {
+ ActualExternalOpType = ExternalOpType;
+ ActualOpType = Node->Type;
+ }
+ else
+ {
+ ActualExternalOpType = Node->Type;
+ ActualOpType = ObjectType;
+ }
+
+ if ((ActualOpType != ACPI_TYPE_ANY) &&
+ (ActualExternalOpType != ACPI_TYPE_ANY) &&
+ !LdTypesMatchExternType (ActualExternalOpType, ActualOpType))
+ {
+ if (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL &&
+ Node->Op->Asl.ParseOpcode == PARSEOP_EXTERNAL)
+ {
+ AslDualParseOpError (ASL_WARNING,
+ ASL_MSG_DUPLICATE_EXTERN_MISMATCH, Op, NULL,
+ ASL_MSG_DUPLICATE_EXTERN_FOUND_HERE, Node->Op, NULL);
+ }
+ else
+ {
+ if (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL &&
+ Node->Op->Asl.ParseOpcode != PARSEOP_EXTERNAL)
+ {
+ ExternalOp = Op;
+ ActualOp = Node->Op;
+ }
+ else
+ {
+ ExternalOp = Node->Op;
+ ActualOp = Op;
+ }
+ AslDualParseOpError (ASL_WARNING,
+ ASL_MSG_DECLARATION_TYPE_MISMATCH, ExternalOp, NULL,
+ ASL_MSG_TYPE_MISMATCH_FOUND_HERE, ActualOp, NULL);
+ }
+ }
+
+ if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
+ (Op->Asl.ParseOpcode != PARSEOP_EXTERNAL))
+ {
+ /*
+ * Allow one create on an object or segment that was
+ * previously declared External
+ */
+ Node->Flags &= ~ANOBJ_IS_EXTERNAL;
+ Node->Type = (UINT8) ObjectType;
+
+ /* Just retyped a node, probably will need to open a scope */
+
+ if (AcpiNsOpensScope (ObjectType))
+ {
+ Status = AcpiDsScopeStackPush (Node, ObjectType, WalkState);
+ if (ACPI_FAILURE (Status))
+ {
+ return (Status);
+ }
+ }
+
+ Status = AE_OK;
+ }
+ else if (!(Node->Flags & ANOBJ_IS_EXTERNAL) &&
+ (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
+ {
+ /*
+ * Allow externals in same scope as the definition of the
+ * actual object. Similar to C. Allows multiple definition
+ * blocks that refer to each other in the same file.
+ */
+ Status = AE_OK;
+ }
+ else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
+ (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) &&
+ (ObjectType == ACPI_TYPE_ANY))
+ {
+ /* Allow update of externals of unknown type. */
+
+ Node->Type = (UINT8) ExternalOpType;
+ Status = AE_OK;
+ }
+
+ return (Status);
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: LdCheckSpecialNames
*
* PARAMETERS: Node - Node that represents the named object
Index: src/sys/external/bsd/acpica/dist/compiler/aslxref.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.16 src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.16 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslxref.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,10 +72,6 @@ XfValidateCrossReference (
const ACPI_OPCODE_INFO *OpInfo,
ACPI_NAMESPACE_NODE *Node);
-static ACPI_PARSE_OBJECT *
-XfGetParentMethod (
- ACPI_PARSE_OBJECT *Op);
-
static BOOLEAN
XfObjectExists (
char *Name);
@@ -274,41 +270,6 @@ XfCheckFieldRange (
/*******************************************************************************
*
- * FUNCTION: XfGetParentMethod
- *
- * PARAMETERS: Op - Parse Op to be checked
- *
- * RETURN: Control method Op if found. NULL otherwise
- *
- * DESCRIPTION: Find the control method parent of a parse op. Returns NULL if
- * the input Op is not within a control method.
- *
- ******************************************************************************/
-
-static ACPI_PARSE_OBJECT *
-XfGetParentMethod (
- ACPI_PARSE_OBJECT *Op)
-{
- ACPI_PARSE_OBJECT *NextOp;
-
-
- NextOp = Op->Asl.Parent;
- while (NextOp)
- {
- if (NextOp->Asl.AmlOpcode == AML_METHOD_OP)
- {
- return (NextOp);
- }
-
- NextOp = NextOp->Asl.Parent;
- }
-
- return (NULL); /* No parent method found */
-}
-
-
-/*******************************************************************************
- *
* FUNCTION: XfNamespaceLocateBegin
*
* PARAMETERS: ASL_WALK_CALLBACK
@@ -431,7 +392,7 @@ XfNamespaceLocateBegin (
{
/* Find parent method Op */
- NextOp = XfGetParentMethod (Op);
+ NextOp = UtGetParentMethodOp (Op);
if (!NextOp)
{
return_ACPI_STATUS (AE_OK);
@@ -468,7 +429,7 @@ XfNamespaceLocateBegin (
{
/* Find parent method Op */
- NextOp = XfGetParentMethod (Op);
+ NextOp = UtGetParentMethodOp (Op);
if (!NextOp)
{
return_ACPI_STATUS (AE_OK);
@@ -706,10 +667,10 @@ XfNamespaceLocateBegin (
* same method or outside of any method, this is a forward reference
* and should be reported as a compiler error.
*/
- DeclarationParentMethod = UtGetParentMethod (Node);
- ReferenceParentMethod = XfGetParentMethod (Op);
+ DeclarationParentMethod = UtGetParentMethodNode (Node);
+ ReferenceParentMethod = UtGetParentMethodOp (Op);
- /* case 1: declaration and refrence are both outside of method */
+ /* case 1: declaration and reference are both outside of method */
if (!ReferenceParentMethod && !DeclarationParentMethod)
{
@@ -1230,8 +1191,8 @@ XfNamespaceLocateEnd (
* execution of A)
*
* NOTES:
- * A null pointer returned by either XfGetParentMethod or
- * UtGetParentMethod indicates that the parameter object is not
+ * A null pointer returned by either UtGetParentMethodOp or
+ * UtGetParentMethodNode indicates that the parameter object is not
* within a control method.
*
* Five cases are handled: Case(Op, Node)
@@ -1264,8 +1225,8 @@ XfValidateCrossReference (
* 1) Search upwards in parse tree for owner of the referencing object
* 2) Search upwards in namespace to find the owner of the referenced object
*/
- ReferencingMethodOp = XfGetParentMethod (Op);
- ReferencedMethodNode = UtGetParentMethod (Node);
+ ReferencingMethodOp = UtGetParentMethodOp (Op);
+ ReferencedMethodNode = UtGetParentMethodNode (Node);
if (!ReferencingMethodOp && !ReferencedMethodNode)
{
Index: src/sys/external/bsd/acpica/dist/compiler/asllookup.c
diff -u src/sys/external/bsd/acpica/dist/compiler/asllookup.c:1.12 src/sys/external/bsd/acpica/dist/compiler/asllookup.c:1.13
--- src/sys/external/bsd/acpica/dist/compiler/asllookup.c:1.12 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/asllookup.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/asloptions.c
diff -u src/sys/external/bsd/acpica/dist/compiler/asloptions.c:1.12 src/sys/external/bsd/acpica/dist/compiler/asloptions.c:1.13
--- src/sys/external/bsd/acpica/dist/compiler/asloptions.c:1.12 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/asloptions.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -840,7 +840,7 @@ AslDoOptions (
return (-1);
}
- Status = AslExpectException (AcpiGbl_Optarg);
+ Status = AslLogExpectedException (AcpiGbl_Optarg);
if (ACPI_FAILURE (Status))
{
return (-1);
Index: src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c:1.12 src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c:1.13
--- src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c:1.12 Sat Dec 14 11:56:32 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/prutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.12 src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.13
--- src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.12 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/prutils.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.11 src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.11 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslpredef.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.11 src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.11 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslpredef.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c:1.11 src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c:1.11 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslopt.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.8 src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.9
--- src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.8 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslopt.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.25 src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.26
--- src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.25 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/compiler/aslutils.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -190,7 +190,7 @@ UtNodeIsDescendantOf (
/*******************************************************************************
*
- * FUNCTION: UtGetParentMethod
+ * FUNCTION: UtGetParentMethodNode
*
* PARAMETERS: Node - Namespace node for any object
*
@@ -201,8 +201,8 @@ UtNodeIsDescendantOf (
*
******************************************************************************/
-void *
-UtGetParentMethod (
+ACPI_NAMESPACE_NODE *
+UtGetParentMethodNode (
ACPI_NAMESPACE_NODE *Node)
{
ACPI_NAMESPACE_NODE *ParentNode;
@@ -232,6 +232,41 @@ UtGetParentMethod (
/*******************************************************************************
*
+ * FUNCTION: UtGetParentMethodOp
+ *
+ * PARAMETERS: Op - Parse Op to be checked
+ *
+ * RETURN: Control method Op if found. NULL otherwise
+ *
+ * DESCRIPTION: Find the control method parent of a parse op. Returns NULL if
+ * the input Op is not within a control method.
+ *
+ ******************************************************************************/
+
+ACPI_PARSE_OBJECT *
+UtGetParentMethodOp (
+ ACPI_PARSE_OBJECT *Op)
+{
+ ACPI_PARSE_OBJECT *NextOp;
+
+
+ NextOp = Op->Asl.Parent;
+ while (NextOp)
+ {
+ if (NextOp->Asl.AmlOpcode == AML_METHOD_OP)
+ {
+ return (NextOp);
+ }
+
+ NextOp = NextOp->Asl.Parent;
+ }
+
+ return (NULL); /* No parent method found */
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: UtDisplaySupportedTables
*
* PARAMETERS: None
Index: src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y:1.3 src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y:1.4
--- src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y:1.3 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y Sat Mar 28 15:49:26 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,6 @@ extern char *DtCompilerP
extern DT_FIELD *AslGbl_CurrentField;
extern int DtLabelByteOffset;
-extern UINT64 DtCompilerParserResult; /* Expression return value */
extern UINT64 DtCompilerParserlineno; /* Current line number */
extern UINT32 DtTokenFirstLine;
Index: src/sys/external/bsd/acpica/dist/debugger/dbcmds.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.13 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.14
--- src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.13 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbcmds.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbnames.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.13 src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.14
--- src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.13 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbnames.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbutils.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbutils.c:1.13 src/sys/external/bsd/acpica/dist/debugger/dbutils.c:1.14
--- src/sys/external/bsd/acpica/dist/debugger/dbutils.c:1.13 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbutils.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.16 src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.17
--- src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.16 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbexec.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.16 src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.17
--- src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.16 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbexec.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbinput.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.20 src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.21
--- src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.20 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbinput.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -529,19 +529,16 @@ AcpiDbGetNextToken (
return (NULL);
}
- /* Remove any spaces at the beginning */
+ /* Remove any spaces at the beginning, ignore blank lines */
- if (*String == ' ')
+ while (*String && isspace (*String))
{
- while (*String && (*String == ' '))
- {
- String++;
- }
+ String++;
+ }
- if (!(*String))
- {
- return (NULL);
- }
+ if (!(*String))
+ {
+ return (NULL);
}
switch (*String)
@@ -646,7 +643,7 @@ AcpiDbGetNextToken (
/* Find end of token */
- while (*String && (*String != ' '))
+ while (*String && !isspace (*String))
{
String++;
}
Index: src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.14 src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.15
--- src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.14 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbmethod.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbtest.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.9 src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.10
--- src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.9 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/debugger/dbtest.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.10 src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.11
--- src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.10 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c:1.10 src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c:1.11
--- src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c:1.10 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c:1.12 src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c:1.13
--- src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c:1.12 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c:1.12 src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c:1.13
--- src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c:1.12 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c:1.11 src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c:1.12
--- src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c:1.11 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.11 src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.12
--- src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.11 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c:1.12 src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c:1.13
--- src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c:1.12 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c Sat Mar 28 15:49:26 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c:1.14 src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c:1.15
--- src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c:1.14 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c:1.4 src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c:1.5
--- src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c:1.4 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.13 src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.14
--- src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.13 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/events/evregion.c
diff -u src/sys/external/bsd/acpica/dist/events/evregion.c:1.10 src/sys/external/bsd/acpica/dist/events/evregion.c:1.11
--- src/sys/external/bsd/acpica/dist/events/evregion.c:1.10 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/events/evregion.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/events/evrgnini.c
diff -u src/sys/external/bsd/acpica/dist/events/evrgnini.c:1.15 src/sys/external/bsd/acpica/dist/events/evrgnini.c:1.16
--- src/sys/external/bsd/acpica/dist/events/evrgnini.c:1.15 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/events/evrgnini.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/events/evxface.c
diff -u src/sys/external/bsd/acpica/dist/events/evxface.c:1.12 src/sys/external/bsd/acpica/dist/events/evxface.c:1.13
--- src/sys/external/bsd/acpica/dist/events/evxface.c:1.12 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/events/evxface.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exconfig.c
diff -u src/sys/external/bsd/acpica/dist/executer/exconfig.c:1.15 src/sys/external/bsd/acpica/dist/executer/exconfig.c:1.16
--- src/sys/external/bsd/acpica/dist/executer/exconfig.c:1.15 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/executer/exconfig.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exdebug.c
diff -u src/sys/external/bsd/acpica/dist/executer/exdebug.c:1.12 src/sys/external/bsd/acpica/dist/executer/exdebug.c:1.13
--- src/sys/external/bsd/acpica/dist/executer/exdebug.c:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/executer/exdebug.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exdump.c
diff -u src/sys/external/bsd/acpica/dist/executer/exdump.c:1.14 src/sys/external/bsd/acpica/dist/executer/exdump.c:1.15
--- src/sys/external/bsd/acpica/dist/executer/exdump.c:1.14 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/executer/exdump.c Sat Mar 28 15:49:26 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/hardware/hwesleep.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwesleep.c:1.8 src/sys/external/bsd/acpica/dist/hardware/hwesleep.c:1.9
--- src/sys/external/bsd/acpica/dist/hardware/hwesleep.c:1.8 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/hardware/hwesleep.c Sat Mar 28 15:49:27 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/hardware/hwregs.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwregs.c:1.8 src/sys/external/bsd/acpica/dist/hardware/hwregs.c:1.9
--- src/sys/external/bsd/acpica/dist/hardware/hwregs.c:1.8 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/hardware/hwregs.c Sat Mar 28 15:49:27 2020
@@ -6,7 +6,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwsleep.c:1.10 src/sys/external/bsd/acpica/dist/hardware/hwsleep.c:1.11
--- src/sys/external/bsd/acpica/dist/hardware/hwsleep.c:1.10 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/hardware/hwsleep.c Sat Mar 28 15:49:27 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -356,6 +356,16 @@ AcpiHwLegacyWake (
AcpiGbl_FixedEventInfo[ACPI_EVENT_POWER_BUTTON].StatusRegisterId,
ACPI_CLEAR_STATUS);
+ /* Enable sleep button */
+
+ (void) AcpiWriteBitRegister (
+ AcpiGbl_FixedEventInfo[ACPI_EVENT_SLEEP_BUTTON].EnableRegisterId,
+ ACPI_ENABLE_EVENT);
+
+ (void) AcpiWriteBitRegister (
+ AcpiGbl_FixedEventInfo[ACPI_EVENT_SLEEP_BUTTON].StatusRegisterId,
+ ACPI_CLEAR_STATUS);
+
AcpiHwExecuteSleepMethod (__UNCONST(METHOD_PATHNAME__SST), ACPI_SST_WORKING);
return_ACPI_STATUS (Status);
}
Index: src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c:1.13 src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c:1.14
--- src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c:1.13 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acapps.h
diff -u src/sys/external/bsd/acpica/dist/include/acapps.h:1.15 src/sys/external/bsd/acpica/dist/include/acapps.h:1.16
--- src/sys/external/bsd/acpica/dist/include/acapps.h:1.15 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acapps.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
/* Common info for tool signons */
#define ACPICA_NAME "Intel ACPI Component Architecture"
-#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2019 Intel Corporation"
+#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2020 Intel Corporation"
#if ACPI_MACHINE_WIDTH == 64
#define ACPI_WIDTH " (64-bit version)"
Index: src/sys/external/bsd/acpica/dist/include/acdebug.h
diff -u src/sys/external/bsd/acpica/dist/include/acdebug.h:1.16 src/sys/external/bsd/acpica/dist/include/acdebug.h:1.17
--- src/sys/external/bsd/acpica/dist/include/acdebug.h:1.16 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/include/acdebug.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acmacros.h
diff -u src/sys/external/bsd/acpica/dist/include/acmacros.h:1.16 src/sys/external/bsd/acpica/dist/include/acmacros.h:1.17
--- src/sys/external/bsd/acpica/dist/include/acmacros.h:1.16 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acmacros.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -517,7 +517,7 @@
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d) CvPrintOneCommentType (a,b,c,d);
#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b) CvPrintOneCommentList (a,b);
#define ASL_CV_FILE_HAS_SWITCHED(a) CvFileHasSwitched(a)
-#define ASL_CV_INIT_FILETREE(a,b,c) CvInitFileTree(a,b,c);
+#define ASL_CV_INIT_FILETREE(a,b) CvInitFileTree(a,b);
#else
@@ -532,7 +532,7 @@
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d)
#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b)
#define ASL_CV_FILE_HAS_SWITCHED(a) 0
-#define ASL_CV_INIT_FILETREE(a,b,c)
+#define ASL_CV_INIT_FILETREE(a,b)
#endif
Index: src/sys/external/bsd/acpica/dist/include/acdisasm.h
diff -u src/sys/external/bsd/acpica/dist/include/acdisasm.h:1.19 src/sys/external/bsd/acpica/dist/include/acdisasm.h:1.20
--- src/sys/external/bsd/acpica/dist/include/acdisasm.h:1.19 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acdisasm.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -349,6 +349,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTa
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIortPad[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs0[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs01[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs1[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs4[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs8a[];
Index: src/sys/external/bsd/acpica/dist/include/acexcep.h
diff -u src/sys/external/bsd/acpica/dist/include/acexcep.h:1.12 src/sys/external/bsd/acpica/dist/include/acexcep.h:1.13
--- src/sys/external/bsd/acpica/dist/include/acexcep.h:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acexcep.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acresrc.h
diff -u src/sys/external/bsd/acpica/dist/include/acresrc.h:1.12 src/sys/external/bsd/acpica/dist/include/acresrc.h:1.13
--- src/sys/external/bsd/acpica/dist/include/acresrc.h:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acresrc.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acglobal.h
diff -u src/sys/external/bsd/acpica/dist/include/acglobal.h:1.20 src/sys/external/bsd/acpica/dist/include/acglobal.h:1.21
--- src/sys/external/bsd/acpica/dist/include/acglobal.h:1.20 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/include/acglobal.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/aclocal.h
diff -u src/sys/external/bsd/acpica/dist/include/aclocal.h:1.20 src/sys/external/bsd/acpica/dist/include/aclocal.h:1.21
--- src/sys/external/bsd/acpica/dist/include/aclocal.h:1.20 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/include/aclocal.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/actypes.h
diff -u src/sys/external/bsd/acpica/dist/include/actypes.h:1.20 src/sys/external/bsd/acpica/dist/include/actypes.h:1.21
--- src/sys/external/bsd/acpica/dist/include/actypes.h:1.20 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/include/actypes.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -580,11 +580,12 @@ typedef UINT64
strnlen (a, ACPI_NAMESEG_SIZE) == ACPI_NAMESEG_SIZE)
/*
- * Algorithm to obtain access bit width.
- * Can be used with AccessWidth of ACPI_GENERIC_ADDRESS and AccessSize of
+ * Algorithm to obtain access bit or byte width.
+ * Can be used with AccessSize field of ACPI_GENERIC_ADDRESS and
* ACPI_RESOURCE_GENERIC_REGISTER.
*/
-#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + 2))
+#define ACPI_ACCESS_BIT_WIDTH(AccessSize) (1 << ((AccessSize) + 2))
+#define ACPI_ACCESS_BYTE_WIDTH(AccessSize) (1 << ((AccessSize) - 1))
/*******************************************************************************
Index: src/sys/external/bsd/acpica/dist/include/acinterp.h
diff -u src/sys/external/bsd/acpica/dist/include/acinterp.h:1.13 src/sys/external/bsd/acpica/dist/include/acinterp.h:1.14
--- src/sys/external/bsd/acpica/dist/include/acinterp.h:1.13 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acinterp.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/actables.h
diff -u src/sys/external/bsd/acpica/dist/include/actables.h:1.13 src/sys/external/bsd/acpica/dist/include/actables.h:1.14
--- src/sys/external/bsd/acpica/dist/include/actables.h:1.13 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/actables.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acnamesp.h
diff -u src/sys/external/bsd/acpica/dist/include/acnamesp.h:1.17 src/sys/external/bsd/acpica/dist/include/acnamesp.h:1.18
--- src/sys/external/bsd/acpica/dist/include/acnamesp.h:1.17 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/include/acnamesp.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -379,6 +379,10 @@ AcpiNsBuildNormalizedPath (
UINT32 PathSize,
BOOLEAN NoTrailing);
+void
+AcpiNsNormalizePathname (
+ char *OriginalPath);
+
char *
AcpiNsGetNormalizedPathname (
ACPI_NAMESPACE_NODE *Node,
Index: src/sys/external/bsd/acpica/dist/include/acoutput.h
diff -u src/sys/external/bsd/acpica/dist/include/acoutput.h:1.11 src/sys/external/bsd/acpica/dist/include/acoutput.h:1.12
--- src/sys/external/bsd/acpica/dist/include/acoutput.h:1.11 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/acoutput.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acpiosxf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpiosxf.h:1.14 src/sys/external/bsd/acpica/dist/include/acpiosxf.h:1.15
--- src/sys/external/bsd/acpica/dist/include/acpiosxf.h:1.14 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/include/acpiosxf.h Sat Mar 28 15:49:27 2020
@@ -7,7 +7,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/actbl1.h
diff -u src/sys/external/bsd/acpica/dist/include/actbl1.h:1.14 src/sys/external/bsd/acpica/dist/include/actbl1.h:1.15
--- src/sys/external/bsd/acpica/dist/include/actbl1.h:1.14 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/actbl1.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1041,7 +1041,7 @@ enum AcpiErstInstructions
enum AcpiErstCommandStatus
{
- ACPI_ERST_SUCESS = 0,
+ ACPI_ERST_SUCCESS = 0,
ACPI_ERST_NO_SPACE = 1,
ACPI_ERST_NOT_AVAILABLE = 2,
ACPI_ERST_FAILURE = 3,
Index: src/sys/external/bsd/acpica/dist/include/acpixf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpixf.h:1.24 src/sys/external/bsd/acpica/dist/include/acpixf.h:1.25
--- src/sys/external/bsd/acpica/dist/include/acpixf.h:1.24 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/include/acpixf.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20191213
+#define ACPI_CA_VERSION 0x20200326
#include "acconfig.h"
#include "actypes.h"
@@ -1001,6 +1001,10 @@ ACPI_STATUS
AcpiEnableAllWakeupGpes (
void))
+ACPI_HW_DEPENDENT_RETURN_UINT32 (
+ UINT32 AcpiAnyGpeStatusSet (
+ void))
+
ACPI_HW_DEPENDENT_RETURN_STATUS (
ACPI_STATUS
AcpiGetGpeDevice (
Index: src/sys/external/bsd/acpica/dist/include/acutils.h
diff -u src/sys/external/bsd/acpica/dist/include/acutils.h:1.21 src/sys/external/bsd/acpica/dist/include/acutils.h:1.22
--- src/sys/external/bsd/acpica/dist/include/acutils.h:1.21 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/include/acutils.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/amlresrc.h
diff -u src/sys/external/bsd/acpica/dist/include/amlresrc.h:1.2 src/sys/external/bsd/acpica/dist/include/amlresrc.h:1.3
--- src/sys/external/bsd/acpica/dist/include/amlresrc.h:1.2 Tue May 28 00:04:11 2019
+++ src/sys/external/bsd/acpica/dist/include/amlresrc.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/platform/acgcc.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acgcc.h:1.7 src/sys/external/bsd/acpica/dist/include/platform/acgcc.h:1.8
--- src/sys/external/bsd/acpica/dist/include/platform/acgcc.h:1.7 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/platform/acgcc.h Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.19 src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.20
--- src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.19 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h Sat Mar 28 15:49:27 2020
@@ -1,12 +1,12 @@
/******************************************************************************
*
* Name: acnetbsd.h - OS specific defines, etc.
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.18 src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.19
--- src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.18 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nsaccess.c Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsdump.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsdump.c:1.17 src/sys/external/bsd/acpica/dist/namespace/nsdump.c:1.18
--- src/sys/external/bsd/acpica/dist/namespace/nsdump.c:1.17 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nsdump.c Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsinit.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.17 src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.18
--- src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.17 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nsinit.c Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nseval.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nseval.c:1.15 src/sys/external/bsd/acpica/dist/namespace/nseval.c:1.16
--- src/sys/external/bsd/acpica/dist/namespace/nseval.c:1.15 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nseval.c Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c:1.14 src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c:1.15
--- src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c:1.14 Tue Oct 15 12:13:39 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c Sat Mar 28 15:49:27 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.13 src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.14
--- src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.13 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c Sat Mar 28 15:49:27 2020
@@ -6,7 +6,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsxfname.c:1.12 src/sys/external/bsd/acpica/dist/namespace/nsxfname.c:1.13
--- src/sys/external/bsd/acpica/dist/namespace/nsxfname.c:1.12 Sat Dec 14 11:56:33 2019
+++ src/sys/external/bsd/acpica/dist/namespace/nsxfname.c Sat Mar 28 15:49:27 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -607,7 +607,7 @@ AcpiInstallMethod (
MethodFlags = *ParserState.Aml++;
AmlStart = ParserState.Aml;
- AmlLength = ACPI_PTR_DIFF (ParserState.PkgEnd, AmlStart);
+ AmlLength = (UINT32) ACPI_PTR_DIFF (ParserState.PkgEnd, AmlStart);
/*
* Allocate resources up-front. We don't want to have to delete a new
Index: src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
diff -u src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.10 src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.11
--- src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.10 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c Sat Mar 28 15:49:27 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/parser/psopcode.c
diff -u src/sys/external/bsd/acpica/dist/parser/psopcode.c:1.12 src/sys/external/bsd/acpica/dist/parser/psopcode.c:1.13
--- src/sys/external/bsd/acpica/dist/parser/psopcode.c:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/parser/psopcode.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/parser/psopinfo.c
diff -u src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.12 src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.13
--- src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/parser/psopinfo.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsdump.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.13 src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.14
--- src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.13 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/resources/rsdump.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.10 src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.11
--- src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.10 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsutils.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsutils.c:1.12 src/sys/external/bsd/acpica/dist/resources/rsutils.c:1.13
--- src/sys/external/bsd/acpica/dist/resources/rsutils.c:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/resources/rsutils.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsxface.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.12 src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.13
--- src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.12 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/resources/rsxface.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbdata.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbdata.c:1.14 src/sys/external/bsd/acpica/dist/tables/tbdata.c:1.15
--- src/sys/external/bsd/acpica/dist/tables/tbdata.c:1.14 Sat Dec 14 11:56:34 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbdata.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbfadt.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbfadt.c:1.14 src/sys/external/bsd/acpica/dist/tables/tbfadt.c:1.15
--- src/sys/external/bsd/acpica/dist/tables/tbfadt.c:1.14 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbfadt.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbinstal.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.14 src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.15
--- src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.14 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbinstal.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbxface.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.14 src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.15
--- src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.14 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbxface.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -260,11 +260,14 @@ ACPI_EXPORT_SYMBOL_INIT (AcpiReallocateR
*
* PARAMETERS: Signature - ACPI signature of needed table
* Instance - Which instance (for SSDTs)
- * OutTableHeader - The pointer to the table header to fill
+ * OutTableHeader - The pointer to the where the table header
+ * is returned
*
- * RETURN: Status and pointer to mapped table header
+ * RETURN: Status and a copy of the table header
*
- * DESCRIPTION: Finds an ACPI table header.
+ * DESCRIPTION: Finds and returns an ACPI table header. Caller provides the
+ * memory where a copy of the header is to be returned
+ * (fixed length).
*
******************************************************************************/
Index: src/sys/external/bsd/acpica/dist/tables/tbutils.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.16 src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.17
--- src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.16 Tue May 28 09:34:40 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbutils.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbxfload.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.12 src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.13
--- src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.12 Sat Dec 14 11:56:34 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbxfload.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxfroot.c:1.11 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c:1.12
--- src/sys/external/bsd/acpica/dist/tables/tbxfroot.c:1.11 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/tables/tbxfroot.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
diff -u src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c:1.12 src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c:1.13
--- src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c:1.12 Tue Oct 15 12:13:40 2019
+++ src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
diff -u src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c:1.12 src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c:1.13
--- src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c:1.12 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c Sat Mar 28 15:49:28 2020
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utcache.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utcache.c:1.13 src/sys/external/bsd/acpica/dist/utilities/utcache.c:1.14
--- src/sys/external/bsd/acpica/dist/utilities/utcache.c:1.13 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utcache.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utosi.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utosi.c:1.13 src/sys/external/bsd/acpica/dist/utilities/utosi.c:1.14
--- src/sys/external/bsd/acpica/dist/utilities/utosi.c:1.13 Tue Oct 15 12:13:40 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utosi.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utdebug.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.17 src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.18
--- src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.17 Tue Oct 15 12:13:40 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utdebug.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utdecode.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.15 src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.16
--- src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.15 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utdecode.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -116,7 +116,7 @@ const char *AcpiGbl_RegionTypes[A
"IPMI", /* 0x07 */
"GeneralPurposeIo", /* 0x08 */
"GenericSerialBus", /* 0x09 */
- "PlatformCommChannel"/* 0x0A */
+ "PCC" /* 0x0A */
};
Index: src/sys/external/bsd/acpica/dist/utilities/utdelete.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.3 src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.4
--- src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.3 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utdelete.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -518,13 +518,13 @@ AcpiUtUpdateRefCount (
*
* FUNCTION: AcpiUtUpdateObjectReference
*
- * PARAMETERS: Object - Increment ref count for this object
- * and all sub-objects
+ * PARAMETERS: Object - Increment or decrement the ref count for
+ * this object and all sub-objects
* Action - Either REF_INCREMENT or REF_DECREMENT
*
* RETURN: Status
*
- * DESCRIPTION: Increment the object reference count
+ * DESCRIPTION: Increment or decrement the object reference count
*
* Object references are incremented when:
* 1) An object is attached to a Node (namespace object)
@@ -563,7 +563,7 @@ AcpiUtUpdateObjectReference (
}
/*
- * All sub-objects must have their reference count incremented
+ * All sub-objects must have their reference count updated
* also. Different object types have different subobjects.
*/
switch (Object->Common.Type)
@@ -632,6 +632,7 @@ AcpiUtUpdateObjectReference (
break;
}
}
+
NextObject = NULL;
break;
Index: src/sys/external/bsd/acpica/dist/utilities/utnonansi.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utnonansi.c:1.3 src/sys/external/bsd/acpica/dist/utilities/utnonansi.c:1.4
--- src/sys/external/bsd/acpica/dist/utilities/utnonansi.c:1.3 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utnonansi.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/uteval.c
diff -u src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.11 src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.12
--- src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.11 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/uteval.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utglobal.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utglobal.c:1.12 src/sys/external/bsd/acpica/dist/utilities/utglobal.c:1.13
--- src/sys/external/bsd/acpica/dist/utilities/utglobal.c:1.12 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utglobal.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utmisc.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.14 src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.15
--- src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.14 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utmisc.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utmutex.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utmutex.c:1.10 src/sys/external/bsd/acpica/dist/utilities/utmutex.c:1.11
--- src/sys/external/bsd/acpica/dist/utilities/utmutex.c:1.10 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utmutex.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utobject.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utobject.c:1.6 src/sys/external/bsd/acpica/dist/utilities/utobject.c:1.7
--- src/sys/external/bsd/acpica/dist/utilities/utobject.c:1.6 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utobject.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@ AcpiUtGetElementLength (
*
* NOTE: We always allocate the worst-case object descriptor because
* these objects are cached, and we want them to be
- * one-size-satisifies-any-request. This in itself may not be
+ * one-size-satisfies-any-request. This in itself may not be
* the most memory efficient, but the efficiency of the object
* cache should more than make up for this!
*
Index: src/sys/external/bsd/acpica/dist/utilities/utprint.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.7 src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.8
--- src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.7 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utprint.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -453,7 +453,13 @@ vsnprintf (
Pos = String;
- End = String + Size;
+
+
+ if (Size != ACPI_UINT32_MAX) {
+ End = String + Size;
+ } else {
+ End = ACPI_CAST_PTR(char, ACPI_UINT32_MAX);
+ }
for (; *Format; ++Format)
{
Index: src/sys/external/bsd/acpica/dist/utilities/utuuid.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utuuid.c:1.7 src/sys/external/bsd/acpica/dist/utilities/utuuid.c:1.8
--- src/sys/external/bsd/acpica/dist/utilities/utuuid.c:1.7 Sun Apr 28 21:18:08 2019
+++ src/sys/external/bsd/acpica/dist/utilities/utuuid.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/uttrack.c
diff -u src/sys/external/bsd/acpica/dist/utilities/uttrack.c:1.18 src/sys/external/bsd/acpica/dist/utilities/uttrack.c:1.19
--- src/sys/external/bsd/acpica/dist/utilities/uttrack.c:1.18 Sat Dec 14 11:56:34 2019
+++ src/sys/external/bsd/acpica/dist/utilities/uttrack.c Sat Mar 28 15:49:28 2020
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
