Message ID | 1423131790-20417-2-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On Thu, Feb 5, 2015 at 6:23 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > Sync with ACPICA version 20150204, for a full set of changes > please refer to: > > https://lists.acpica.org/pipermail/devel/2015-February/000682.html > > Usual testing against my data base of ACPI tables and fwts-test > show no regressions. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpica/source/common/acgetline.c | 2 +- > src/acpica/source/common/adfile.c | 2 +- > src/acpica/source/common/adisasm.c | 33 +++-- > src/acpica/source/common/adwalk.c | 2 +- > src/acpica/source/common/ahids.c | 2 +- > src/acpica/source/common/ahpredef.c | 2 +- > src/acpica/source/common/ahuuids.c | 2 +- > src/acpica/source/common/cmfsize.c | 2 +- > src/acpica/source/common/dmextern.c | 2 +- > src/acpica/source/common/dmrestag.c | 2 +- > src/acpica/source/common/dmtable.c | 2 +- > src/acpica/source/common/dmtbdump.c | 2 +- > src/acpica/source/common/dmtbinfo.c | 2 +- > src/acpica/source/compiler/aslanalyze.c | 2 +- > src/acpica/source/compiler/aslascii.c | 2 +- > src/acpica/source/compiler/aslbtypes.c | 2 +- > src/acpica/source/compiler/aslcodegen.c | 2 +- > src/acpica/source/compiler/aslcompile.c | 7 +- > src/acpica/source/compiler/aslcompiler.h | 2 +- > src/acpica/source/compiler/aslcompiler.l | 2 +- > src/acpica/source/compiler/aslcompiler.y | 2 +- > src/acpica/source/compiler/asldefine.h | 2 +- > src/acpica/source/compiler/aslerror.c | 4 +- > src/acpica/source/compiler/aslfileio.c | 12 +- > src/acpica/source/compiler/aslfiles.c | 35 ++++- > src/acpica/source/compiler/aslfold.c | 2 +- > src/acpica/source/compiler/aslglobal.h | 3 +- > src/acpica/source/compiler/aslhex.c | 2 +- > src/acpica/source/compiler/asllength.c | 2 +- > src/acpica/source/compiler/asllisting.c | 2 +- > src/acpica/source/compiler/asllistsup.c | 2 +- > src/acpica/source/compiler/aslload.c | 2 +- > src/acpica/source/compiler/asllookup.c | 2 +- > src/acpica/source/compiler/aslmain.c | 2 +- > src/acpica/source/compiler/aslmap.c | 2 +- > src/acpica/source/compiler/aslmapoutput.c | 27 +--- > src/acpica/source/compiler/aslmaputils.c | 2 +- > src/acpica/source/compiler/aslmessages.c | 2 +- > src/acpica/source/compiler/aslmessages.h | 2 +- > src/acpica/source/compiler/aslmethod.c | 2 +- > src/acpica/source/compiler/aslnamesp.c | 2 +- > src/acpica/source/compiler/asloffset.c | 2 +- > src/acpica/source/compiler/aslopcodes.c | 2 +- > src/acpica/source/compiler/asloperands.c | 2 +- > src/acpica/source/compiler/aslopt.c | 2 +- > src/acpica/source/compiler/aslparser.y | 2 +- > src/acpica/source/compiler/aslpredef.c | 2 +- > src/acpica/source/compiler/aslprepkg.c | 2 +- > src/acpica/source/compiler/aslprintf.c | 2 +- > src/acpica/source/compiler/aslprune.c | 2 +- > src/acpica/source/compiler/aslresource.c | 2 +- > src/acpica/source/compiler/aslrestype1.c | 2 +- > src/acpica/source/compiler/aslrestype1i.c | 2 +- > src/acpica/source/compiler/aslrestype2.c | 2 +- > src/acpica/source/compiler/aslrestype2d.c | 2 +- > src/acpica/source/compiler/aslrestype2e.c | 2 +- > src/acpica/source/compiler/aslrestype2q.c | 2 +- > src/acpica/source/compiler/aslrestype2s.c | 2 +- > src/acpica/source/compiler/aslrestype2w.c | 2 +- > src/acpica/source/compiler/aslrules.y | 2 +- > src/acpica/source/compiler/aslstartup.c | 3 +- > src/acpica/source/compiler/aslstubs.c | 2 +- > src/acpica/source/compiler/aslsupport.l | 103 ++++++++------ > src/acpica/source/compiler/aslsupport.y | 2 +- > src/acpica/source/compiler/asltokens.y | 2 +- > src/acpica/source/compiler/asltransform.c | 2 +- > src/acpica/source/compiler/asltree.c | 2 +- > src/acpica/source/compiler/asltypes.h | 2 +- > src/acpica/source/compiler/asltypes.y | 2 +- > src/acpica/source/compiler/aslutils.c | 30 +++- > src/acpica/source/compiler/asluuid.c | 2 +- > src/acpica/source/compiler/aslwalks.c | 2 +- > src/acpica/source/compiler/aslxref.c | 2 +- > src/acpica/source/compiler/dtcompile.c | 2 +- > src/acpica/source/compiler/dtcompiler.h | 2 +- > src/acpica/source/compiler/dtexpress.c | 2 +- > src/acpica/source/compiler/dtfield.c | 2 +- > src/acpica/source/compiler/dtio.c | 2 +- > src/acpica/source/compiler/dtparser.l | 2 +- > src/acpica/source/compiler/dtparser.y | 2 +- > src/acpica/source/compiler/dtsubtable.c | 2 +- > src/acpica/source/compiler/dttable.c | 2 +- > src/acpica/source/compiler/dttemplate.c | 2 +- > src/acpica/source/compiler/dttemplate.h | 2 +- > src/acpica/source/compiler/dtutils.c | 2 +- > src/acpica/source/compiler/preprocess.h | 2 +- > src/acpica/source/compiler/prexpress.c | 2 +- > src/acpica/source/compiler/prmacros.c | 2 +- > src/acpica/source/compiler/prparser.l | 2 +- > src/acpica/source/compiler/prparser.y | 2 +- > src/acpica/source/compiler/prscan.c | 2 +- > src/acpica/source/compiler/prutils.c | 2 +- > src/acpica/source/components/debugger/dbcmds.c | 2 +- > src/acpica/source/components/debugger/dbconvert.c | 2 +- > src/acpica/source/components/debugger/dbdisply.c | 14 +- > src/acpica/source/components/debugger/dbexec.c | 2 +- > src/acpica/source/components/debugger/dbfileio.c | 2 +- > src/acpica/source/components/debugger/dbhistry.c | 2 +- > src/acpica/source/components/debugger/dbinput.c | 2 +- > src/acpica/source/components/debugger/dbmethod.c | 2 +- > src/acpica/source/components/debugger/dbnames.c | 2 +- > src/acpica/source/components/debugger/dbstats.c | 2 +- > src/acpica/source/components/debugger/dbtest.c | 2 +- > src/acpica/source/components/debugger/dbutils.c | 2 +- > src/acpica/source/components/debugger/dbxface.c | 2 +- > .../source/components/disassembler/dmbuffer.c | 2 +- > .../source/components/disassembler/dmcstyle.c | 2 +- > .../source/components/disassembler/dmdeferred.c | 2 +- > .../source/components/disassembler/dmnames.c | 2 +- > .../source/components/disassembler/dmobject.c | 2 +- > .../source/components/disassembler/dmopcode.c | 2 +- > .../source/components/disassembler/dmresrc.c | 2 +- > .../source/components/disassembler/dmresrcl.c | 2 +- > .../source/components/disassembler/dmresrcl2.c | 2 +- > .../source/components/disassembler/dmresrcs.c | 2 +- > .../source/components/disassembler/dmutils.c | 2 +- > src/acpica/source/components/disassembler/dmwalk.c | 2 +- > src/acpica/source/components/dispatcher/dsargs.c | 2 +- > .../source/components/dispatcher/dscontrol.c | 2 +- > src/acpica/source/components/dispatcher/dsfield.c | 2 +- > src/acpica/source/components/dispatcher/dsinit.c | 2 +- > src/acpica/source/components/dispatcher/dsmethod.c | 2 +- > src/acpica/source/components/dispatcher/dsmthdat.c | 2 +- > src/acpica/source/components/dispatcher/dsobject.c | 2 +- > src/acpica/source/components/dispatcher/dsopcode.c | 2 +- > src/acpica/source/components/dispatcher/dsutils.c | 2 +- > src/acpica/source/components/dispatcher/dswexec.c | 2 +- > src/acpica/source/components/dispatcher/dswload.c | 2 +- > src/acpica/source/components/dispatcher/dswload2.c | 2 +- > src/acpica/source/components/dispatcher/dswscope.c | 2 +- > src/acpica/source/components/dispatcher/dswstate.c | 2 +- > src/acpica/source/components/events/evevent.c | 2 +- > src/acpica/source/components/events/evglock.c | 2 +- > src/acpica/source/components/events/evgpe.c | 158 ++++++++++----------- > src/acpica/source/components/events/evgpeblk.c | 7 +- > src/acpica/source/components/events/evgpeinit.c | 10 +- > src/acpica/source/components/events/evgpeutil.c | 64 +-------- > src/acpica/source/components/events/evhandler.c | 2 +- > src/acpica/source/components/events/evmisc.c | 2 +- > src/acpica/source/components/events/evregion.c | 2 +- > src/acpica/source/components/events/evrgnini.c | 2 +- > src/acpica/source/components/events/evsci.c | 2 +- > src/acpica/source/components/events/evxface.c | 139 ++++++++++++++++-- > src/acpica/source/components/events/evxfevnt.c | 2 +- > src/acpica/source/components/events/evxfgpe.c | 69 +++++++-- > src/acpica/source/components/events/evxfregn.c | 2 +- > src/acpica/source/components/executer/exconfig.c | 2 +- > src/acpica/source/components/executer/exconvrt.c | 2 +- > src/acpica/source/components/executer/excreate.c | 2 +- > src/acpica/source/components/executer/exdebug.c | 2 +- > src/acpica/source/components/executer/exdump.c | 2 +- > src/acpica/source/components/executer/exfield.c | 2 +- > src/acpica/source/components/executer/exfldio.c | 2 +- > src/acpica/source/components/executer/exmisc.c | 2 +- > src/acpica/source/components/executer/exmutex.c | 2 +- > src/acpica/source/components/executer/exnames.c | 2 +- > src/acpica/source/components/executer/exoparg1.c | 2 +- > src/acpica/source/components/executer/exoparg2.c | 2 +- > src/acpica/source/components/executer/exoparg3.c | 2 +- > src/acpica/source/components/executer/exoparg6.c | 2 +- > src/acpica/source/components/executer/exprep.c | 2 +- > src/acpica/source/components/executer/exregion.c | 2 +- > src/acpica/source/components/executer/exresnte.c | 2 +- > src/acpica/source/components/executer/exresolv.c | 2 +- > src/acpica/source/components/executer/exresop.c | 2 +- > src/acpica/source/components/executer/exstore.c | 2 +- > src/acpica/source/components/executer/exstoren.c | 2 +- > src/acpica/source/components/executer/exstorob.c | 2 +- > src/acpica/source/components/executer/exsystem.c | 2 +- > src/acpica/source/components/executer/exutils.c | 2 +- > src/acpica/source/components/hardware/hwacpi.c | 2 +- > src/acpica/source/components/hardware/hwesleep.c | 2 +- > src/acpica/source/components/hardware/hwgpe.c | 78 +++++++--- > src/acpica/source/components/hardware/hwpci.c | 2 +- > src/acpica/source/components/hardware/hwregs.c | 2 +- > src/acpica/source/components/hardware/hwsleep.c | 2 +- > src/acpica/source/components/hardware/hwvalid.c | 2 +- > src/acpica/source/components/hardware/hwxface.c | 2 +- > src/acpica/source/components/hardware/hwxfsleep.c | 2 +- > src/acpica/source/components/namespace/nsaccess.c | 2 +- > src/acpica/source/components/namespace/nsalloc.c | 2 +- > .../source/components/namespace/nsarguments.c | 2 +- > src/acpica/source/components/namespace/nsconvert.c | 2 +- > src/acpica/source/components/namespace/nsdump.c | 2 +- > src/acpica/source/components/namespace/nsdumpdv.c | 2 +- > src/acpica/source/components/namespace/nseval.c | 2 +- > src/acpica/source/components/namespace/nsinit.c | 2 +- > src/acpica/source/components/namespace/nsload.c | 2 +- > src/acpica/source/components/namespace/nsnames.c | 2 +- > src/acpica/source/components/namespace/nsobject.c | 2 +- > src/acpica/source/components/namespace/nsparse.c | 2 +- > src/acpica/source/components/namespace/nspredef.c | 2 +- > src/acpica/source/components/namespace/nsprepkg.c | 2 +- > src/acpica/source/components/namespace/nsrepair.c | 2 +- > src/acpica/source/components/namespace/nsrepair2.c | 2 +- > src/acpica/source/components/namespace/nssearch.c | 2 +- > src/acpica/source/components/namespace/nsutils.c | 2 +- > src/acpica/source/components/namespace/nswalk.c | 2 +- > src/acpica/source/components/namespace/nsxfeval.c | 2 +- > src/acpica/source/components/namespace/nsxfname.c | 2 +- > src/acpica/source/components/namespace/nsxfobj.c | 2 +- > src/acpica/source/components/parser/psargs.c | 2 +- > src/acpica/source/components/parser/psloop.c | 2 +- > src/acpica/source/components/parser/psobject.c | 2 +- > src/acpica/source/components/parser/psopcode.c | 2 +- > src/acpica/source/components/parser/psopinfo.c | 2 +- > src/acpica/source/components/parser/psparse.c | 2 +- > src/acpica/source/components/parser/psscope.c | 2 +- > src/acpica/source/components/parser/pstree.c | 2 +- > src/acpica/source/components/parser/psutils.c | 2 +- > src/acpica/source/components/parser/pswalk.c | 2 +- > src/acpica/source/components/parser/psxface.c | 2 +- > src/acpica/source/components/resources/rsaddr.c | 2 +- > src/acpica/source/components/resources/rscalc.c | 2 +- > src/acpica/source/components/resources/rscreate.c | 2 +- > src/acpica/source/components/resources/rsdump.c | 2 +- > .../source/components/resources/rsdumpinfo.c | 2 +- > src/acpica/source/components/resources/rsinfo.c | 2 +- > src/acpica/source/components/resources/rsio.c | 2 +- > src/acpica/source/components/resources/rsirq.c | 2 +- > src/acpica/source/components/resources/rslist.c | 2 +- > src/acpica/source/components/resources/rsmemory.c | 2 +- > src/acpica/source/components/resources/rsmisc.c | 2 +- > src/acpica/source/components/resources/rsserial.c | 2 +- > src/acpica/source/components/resources/rsutils.c | 2 +- > src/acpica/source/components/resources/rsxface.c | 2 +- > src/acpica/source/components/tables/tbdata.c | 2 +- > src/acpica/source/components/tables/tbfadt.c | 2 +- > src/acpica/source/components/tables/tbfind.c | 2 +- > src/acpica/source/components/tables/tbinstal.c | 2 +- > src/acpica/source/components/tables/tbprint.c | 2 +- > src/acpica/source/components/tables/tbutils.c | 2 +- > src/acpica/source/components/tables/tbxface.c | 2 +- > src/acpica/source/components/tables/tbxfload.c | 2 +- > src/acpica/source/components/tables/tbxfroot.c | 2 +- > src/acpica/source/components/utilities/utaddress.c | 2 +- > src/acpica/source/components/utilities/utalloc.c | 2 +- > src/acpica/source/components/utilities/utbuffer.c | 2 +- > src/acpica/source/components/utilities/utcache.c | 2 +- > src/acpica/source/components/utilities/utcopy.c | 2 +- > src/acpica/source/components/utilities/utdebug.c | 2 +- > src/acpica/source/components/utilities/utdecode.c | 2 +- > src/acpica/source/components/utilities/utdelete.c | 2 +- > src/acpica/source/components/utilities/uterror.c | 2 +- > src/acpica/source/components/utilities/uteval.c | 2 +- > src/acpica/source/components/utilities/utexcep.c | 2 +- > src/acpica/source/components/utilities/utfileio.c | 2 +- > src/acpica/source/components/utilities/utglobal.c | 2 +- > src/acpica/source/components/utilities/uthex.c | 2 +- > src/acpica/source/components/utilities/utids.c | 2 +- > src/acpica/source/components/utilities/utinit.c | 2 +- > src/acpica/source/components/utilities/utlock.c | 2 +- > src/acpica/source/components/utilities/utmath.c | 2 +- > src/acpica/source/components/utilities/utmisc.c | 2 +- > src/acpica/source/components/utilities/utmutex.c | 2 +- > src/acpica/source/components/utilities/utobject.c | 2 +- > src/acpica/source/components/utilities/utosi.c | 2 +- > src/acpica/source/components/utilities/utownerid.c | 2 +- > src/acpica/source/components/utilities/utpredef.c | 2 +- > src/acpica/source/components/utilities/utprint.c | 2 +- > src/acpica/source/components/utilities/utresrc.c | 2 +- > src/acpica/source/components/utilities/utstate.c | 2 +- > src/acpica/source/components/utilities/utstring.c | 2 +- > src/acpica/source/components/utilities/uttrack.c | 2 +- > src/acpica/source/components/utilities/utuuid.c | 2 +- > src/acpica/source/components/utilities/utxface.c | 2 +- > src/acpica/source/components/utilities/utxferror.c | 2 +- > src/acpica/source/components/utilities/utxfinit.c | 2 +- > src/acpica/source/include/acapps.h | 4 +- > src/acpica/source/include/acbuffer.h | 2 +- > src/acpica/source/include/accommon.h | 2 +- > src/acpica/source/include/acconfig.h | 2 +- > src/acpica/source/include/acdebug.h | 2 +- > src/acpica/source/include/acdisasm.h | 2 +- > src/acpica/source/include/acdispat.h | 2 +- > src/acpica/source/include/acevents.h | 6 +- > src/acpica/source/include/acexcep.h | 2 +- > src/acpica/source/include/acglobal.h | 2 +- > src/acpica/source/include/achware.h | 2 +- > src/acpica/source/include/acinterp.h | 2 +- > src/acpica/source/include/aclocal.h | 3 +- > src/acpica/source/include/acmacros.h | 2 +- > src/acpica/source/include/acnames.h | 2 +- > src/acpica/source/include/acnamesp.h | 2 +- > src/acpica/source/include/acobject.h | 2 +- > src/acpica/source/include/acopcode.h | 2 +- > src/acpica/source/include/acoutput.h | 2 +- > src/acpica/source/include/acparser.h | 2 +- > src/acpica/source/include/acpi.h | 2 +- > src/acpica/source/include/acpiosxf.h | 2 +- > src/acpica/source/include/acpixf.h | 18 ++- > src/acpica/source/include/acpredef.h | 2 +- > src/acpica/source/include/acresrc.h | 2 +- > src/acpica/source/include/acrestyp.h | 2 +- > src/acpica/source/include/acstruct.h | 2 +- > src/acpica/source/include/actables.h | 2 +- > src/acpica/source/include/actbl.h | 2 +- > src/acpica/source/include/actbl1.h | 2 +- > src/acpica/source/include/actbl2.h | 2 +- > src/acpica/source/include/actbl3.h | 2 +- > src/acpica/source/include/actypes.h | 18 ++- > src/acpica/source/include/acutils.h | 2 +- > src/acpica/source/include/amlcode.h | 2 +- > src/acpica/source/include/amlresrc.h | 2 +- > src/acpica/source/include/platform/acenv.h | 2 +- > src/acpica/source/include/platform/acenvex.h | 2 +- > src/acpica/source/include/platform/acgcc.h | 2 +- > src/acpica/source/include/platform/aclinux.h | 2 +- > src/acpica/source/include/platform/aclinuxex.h | 2 +- > .../source/os_specific/service_layers/oslibcfs.c | 2 +- > .../source/os_specific/service_layers/osunixxf.c | 2 +- > src/acpica/source/tools/acpiexec/aecommon.h | 2 +- > src/acpica/source/tools/acpiexec/aehandlers.c | 2 +- > src/acpica/source/tools/acpiexec/aeinitfile.c | 2 +- > src/acpica/source/tools/acpiexec/aeregion.c | 2 +- > 315 files changed, 821 insertions(+), 608 deletions(-) > > diff --git a/src/acpica/source/common/acgetline.c b/src/acpica/source/common/acgetline.c > index 77ca341..2a2232a 100644 > --- a/src/acpica/source/common/acgetline.c > +++ b/src/acpica/source/common/acgetline.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adfile.c b/src/acpica/source/common/adfile.c > index 6a2625a..6248983 100644 > --- a/src/acpica/source/common/adfile.c > +++ b/src/acpica/source/common/adfile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adisasm.c b/src/acpica/source/common/adisasm.c > index 85ae3d0..f4baa62 100644 > --- a/src/acpica/source/common/adisasm.c > +++ b/src/acpica/source/common/adisasm.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -429,8 +429,12 @@ AdAmlDisassemble ( > AcpiDmDumpDataTable (Table); > fprintf (stderr, "Acpi Data Table [%4.4s] decoded\n", > Table->Signature); > - fprintf (stderr, "Formatted output: %s - %u bytes\n", > - DisasmFilename, CmGetFileSize (File)); > + > + if (File) > + { > + fprintf (stderr, "Formatted output: %s - %u bytes\n", > + DisasmFilename, CmGetFileSize (File)); > + } > } > else > { > @@ -448,8 +452,11 @@ AdAmlDisassemble ( > { > AcpiOsPrintf ("/**** Before second load\n"); > > - NsSetupNamespaceListing (File); > - NsDisplayNamespace (); > + if (File) > + { > + NsSetupNamespaceListing (File); > + NsDisplayNamespace (); > + } > AcpiOsPrintf ("*****/\n"); > } > > @@ -529,8 +536,11 @@ AdAmlDisassemble ( > if (AslCompilerdebug) > { > AcpiOsPrintf ("/**** After second load and resource conversion\n"); > - NsSetupNamespaceListing (File); > - NsDisplayNamespace (); > + if (File) > + { > + NsSetupNamespaceListing (File); > + NsDisplayNamespace (); > + } > AcpiOsPrintf ("*****/\n"); > > AcpiDmDumpTree (AcpiGbl_ParseOpRoot); > @@ -559,8 +569,11 @@ AdAmlDisassemble ( > AcpiDmDumpDataTable (Table); > > fprintf (stderr, "Disassembly completed\n"); > - fprintf (stderr, "ASL Output: %s - %u bytes\n", > - DisasmFilename, CmGetFileSize (File)); > + if (File) > + { > + fprintf (stderr, "ASL Output: %s - %u bytes\n", > + DisasmFilename, CmGetFileSize (File)); > + } > > if (Gbl_MapfileFlag) > { > @@ -579,7 +592,7 @@ Cleanup: > ACPI_FREE (Table); > } > > - if (OutToFile && File) > + if (File) > { > if (AslCompilerdebug) /* Display final namespace, with transforms */ > { > diff --git a/src/acpica/source/common/adwalk.c b/src/acpica/source/common/adwalk.c > index aa50195..fe07c07 100644 > --- a/src/acpica/source/common/adwalk.c > +++ b/src/acpica/source/common/adwalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahids.c b/src/acpica/source/common/ahids.c > index 8d008cf..1ff3c7c 100644 > --- a/src/acpica/source/common/ahids.c > +++ b/src/acpica/source/common/ahids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahpredef.c b/src/acpica/source/common/ahpredef.c > index 7123b7f..57e7279 100644 > --- a/src/acpica/source/common/ahpredef.c > +++ b/src/acpica/source/common/ahpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahuuids.c b/src/acpica/source/common/ahuuids.c > index e2da9c1..4e5d087 100644 > --- a/src/acpica/source/common/ahuuids.c > +++ b/src/acpica/source/common/ahuuids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/cmfsize.c b/src/acpica/source/common/cmfsize.c > index 1511683..1e8de3c 100644 > --- a/src/acpica/source/common/cmfsize.c > +++ b/src/acpica/source/common/cmfsize.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmextern.c b/src/acpica/source/common/dmextern.c > index 30196df..72397f0 100644 > --- a/src/acpica/source/common/dmextern.c > +++ b/src/acpica/source/common/dmextern.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmrestag.c b/src/acpica/source/common/dmrestag.c > index d21b111..15c2d84 100644 > --- a/src/acpica/source/common/dmrestag.c > +++ b/src/acpica/source/common/dmrestag.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtable.c b/src/acpica/source/common/dmtable.c > index 8ed2236..b495ad2 100644 > --- a/src/acpica/source/common/dmtable.c > +++ b/src/acpica/source/common/dmtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbdump.c b/src/acpica/source/common/dmtbdump.c > index 235c650..2f2abe6 100644 > --- a/src/acpica/source/common/dmtbdump.c > +++ b/src/acpica/source/common/dmtbdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbinfo.c b/src/acpica/source/common/dmtbinfo.c > index 777928d..309585a 100644 > --- a/src/acpica/source/common/dmtbinfo.c > +++ b/src/acpica/source/common/dmtbinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslanalyze.c b/src/acpica/source/compiler/aslanalyze.c > index 8562ecd..1fae183 100644 > --- a/src/acpica/source/compiler/aslanalyze.c > +++ b/src/acpica/source/compiler/aslanalyze.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslascii.c b/src/acpica/source/compiler/aslascii.c > index 09ab9e9..9a4e127 100644 > --- a/src/acpica/source/compiler/aslascii.c > +++ b/src/acpica/source/compiler/aslascii.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslbtypes.c b/src/acpica/source/compiler/aslbtypes.c > index b7c5fbf..817ecb6 100644 > --- a/src/acpica/source/compiler/aslbtypes.c > +++ b/src/acpica/source/compiler/aslbtypes.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcodegen.c b/src/acpica/source/compiler/aslcodegen.c > index 7c37abd..7136ff1 100644 > --- a/src/acpica/source/compiler/aslcodegen.c > +++ b/src/acpica/source/compiler/aslcodegen.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompile.c b/src/acpica/source/compiler/aslcompile.c > index 4dc0195..6bf0604 100644 > --- a/src/acpica/source/compiler/aslcompile.c > +++ b/src/acpica/source/compiler/aslcompile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -190,10 +190,9 @@ CmDoCompile ( > AslCompilerparse(); > UtEndEvent (Event); > > - /* Check for parse errors */ > + /* Check for parser-detected syntax errors */ > > - Status = AslCheckForErrorExit (); > - if (ACPI_FAILURE (Status)) > + if (Gbl_SyntaxError) > { > fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n"); > LsDumpParseTree (); > diff --git a/src/acpica/source/compiler/aslcompiler.h b/src/acpica/source/compiler/aslcompiler.h > index beb22d0..36c9b9e 100644 > --- a/src/acpica/source/compiler/aslcompiler.h > +++ b/src/acpica/source/compiler/aslcompiler.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompiler.l b/src/acpica/source/compiler/aslcompiler.l > index cd07ef7..53332d8 100644 > --- a/src/acpica/source/compiler/aslcompiler.l > +++ b/src/acpica/source/compiler/aslcompiler.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompiler.y b/src/acpica/source/compiler/aslcompiler.y > index 6472e1d..032d062 100644 > --- a/src/acpica/source/compiler/aslcompiler.y > +++ b/src/acpica/source/compiler/aslcompiler.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asldefine.h b/src/acpica/source/compiler/asldefine.h > index ae64af2..00ad5a5 100644 > --- a/src/acpica/source/compiler/asldefine.h > +++ b/src/acpica/source/compiler/asldefine.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslerror.c b/src/acpica/source/compiler/aslerror.c > index dc8578c..d033fdb 100644 > --- a/src/acpica/source/compiler/aslerror.c > +++ b/src/acpica/source/compiler/aslerror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -990,6 +990,8 @@ AslCompilererror ( > const char *CompilerMessage) > { > > + Gbl_SyntaxError++; > + > AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber, > Gbl_LogicalLineNumber, Gbl_CurrentLineOffset, > Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, > diff --git a/src/acpica/source/compiler/aslfileio.c b/src/acpica/source/compiler/aslfileio.c > index a8c24cc..4d3d963 100644 > --- a/src/acpica/source/compiler/aslfileio.c > +++ b/src/acpica/source/compiler/aslfileio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -140,8 +140,8 @@ FlFileError ( > UINT8 ErrorId) > { > > - sprintf (MsgBuffer, "\"%s\" (%s)", Gbl_Files[FileId].Filename, > - strerror (errno)); > + sprintf (MsgBuffer, "\"%s\" (%s) - %s", Gbl_Files[FileId].Filename, > + Gbl_Files[FileId].Description, strerror (errno)); > AslCommonError (ASL_ERROR, ErrorId, 0, 0, 0, 0, NULL, MsgBuffer); > } > > @@ -170,6 +170,9 @@ FlOpenFile ( > FILE *File; > > > + Gbl_Files[FileId].Filename = Filename; > + Gbl_Files[FileId].Handle = NULL; > + > File = fopen (Filename, Mode); > if (!File) > { > @@ -177,8 +180,7 @@ FlOpenFile ( > AslAbort (); > } > > - Gbl_Files[FileId].Filename = Filename; > - Gbl_Files[FileId].Handle = File; > + Gbl_Files[FileId].Handle = File; > } > > > diff --git a/src/acpica/source/compiler/aslfiles.c b/src/acpica/source/compiler/aslfiles.c > index 4557861..39f6319 100644 > --- a/src/acpica/source/compiler/aslfiles.c > +++ b/src/acpica/source/compiler/aslfiles.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -557,6 +557,8 @@ FlOpenAmlOutputFile ( > 0, 0, 0, 0, NULL, NULL); > return (AE_ERROR); > } > + > + Gbl_Files[ASL_FILE_AML_OUTPUT].Filename = Filename; > } > > /* Open the output AML file in binary mode */ > @@ -635,9 +637,14 @@ FlOpenMiscOutputFiles ( > > if (!Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle) > { > - AslCommonError (ASL_ERROR, ASL_MSG_DEBUG_FILENAME, > - 0, 0, 0, 0, NULL, NULL); > - return (AE_ERROR); > + /* > + * A problem with freopen is that on error, > + * we no longer have stderr. > + */ > + Gbl_DebugFlag = FALSE; > + memcpy (stderr, stdout, sizeof (FILE)); > + FlFileError (ASL_FILE_DEBUG_OUTPUT, ASL_MSG_DEBUG_FILENAME); > + AslAbort (); > } > > AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); > @@ -830,6 +837,26 @@ FlOpenMiscOutputFiles ( > AslCompilerFileHeader (ASL_FILE_NAMESPACE_OUTPUT); > } > > + /* Create/Open a map file if requested */ > + > + if (Gbl_MapfileFlag) > + { > + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_MAP); > + if (!Filename) > + { > + AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, > + 0, 0, 0, 0, NULL, NULL); > + return (AE_ERROR); > + } > + > + /* Open the hex file, text mode (closed at compiler exit) */ > + > + FlOpenFile (ASL_FILE_MAP_OUTPUT, Filename, "w+t"); > + > + AslCompilerSignon (ASL_FILE_MAP_OUTPUT); > + AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT); > + } > + > return (AE_OK); > } > > diff --git a/src/acpica/source/compiler/aslfold.c b/src/acpica/source/compiler/aslfold.c > index 51c355a..82d6c8f 100644 > --- a/src/acpica/source/compiler/aslfold.c > +++ b/src/acpica/source/compiler/aslfold.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslglobal.h b/src/acpica/source/compiler/aslglobal.h > index 7c42e69..a26d752 100644 > --- a/src/acpica/source/compiler/aslglobal.h > +++ b/src/acpica/source/compiler/aslglobal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -199,6 +199,7 @@ ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_PreviousLineNumber, 0); > ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineNumber, 1); > ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_LogicalLineNumber, 1); > ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineOffset, 0); > +ASL_EXTERN UINT8 ASL_INIT_GLOBAL (Gbl_SyntaxError, 0); > > /* Exception reporting */ > > diff --git a/src/acpica/source/compiler/aslhex.c b/src/acpica/source/compiler/aslhex.c > index 1d8056b..39825c8 100644 > --- a/src/acpica/source/compiler/aslhex.c > +++ b/src/acpica/source/compiler/aslhex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllength.c b/src/acpica/source/compiler/asllength.c > index 0c19896..3fbf896 100644 > --- a/src/acpica/source/compiler/asllength.c > +++ b/src/acpica/source/compiler/asllength.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllisting.c b/src/acpica/source/compiler/asllisting.c > index 2c6b53b..b5a4559 100644 > --- a/src/acpica/source/compiler/asllisting.c > +++ b/src/acpica/source/compiler/asllisting.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllistsup.c b/src/acpica/source/compiler/asllistsup.c > index 5162524..c71ace0 100644 > --- a/src/acpica/source/compiler/asllistsup.c > +++ b/src/acpica/source/compiler/asllistsup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslload.c b/src/acpica/source/compiler/aslload.c > index 303fc4c..e6c1f85 100644 > --- a/src/acpica/source/compiler/aslload.c > +++ b/src/acpica/source/compiler/aslload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllookup.c b/src/acpica/source/compiler/asllookup.c > index 435dec9..4a7539a 100644 > --- a/src/acpica/source/compiler/asllookup.c > +++ b/src/acpica/source/compiler/asllookup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmain.c b/src/acpica/source/compiler/aslmain.c > index 6097721..9e27551 100644 > --- a/src/acpica/source/compiler/aslmain.c > +++ b/src/acpica/source/compiler/aslmain.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmap.c b/src/acpica/source/compiler/aslmap.c > index eebaeb3..5aed2b0 100644 > --- a/src/acpica/source/compiler/aslmap.c > +++ b/src/acpica/source/compiler/aslmap.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmapoutput.c b/src/acpica/source/compiler/aslmapoutput.c > index 046ebb7..9537cac 100644 > --- a/src/acpica/source/compiler/aslmapoutput.c > +++ b/src/acpica/source/compiler/aslmapoutput.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -188,7 +188,7 @@ const char *PolarityDecode[] = > * RETURN: None > * > * DESCRIPTION: External interface. > - * Create and open the mapfile and emit all of the collected > + * Map file has already been opened. Emit all of the collected > * hardware mapping information. Includes: GPIO information, > * Serial information, and a dump of the entire ACPI device tree. > * > @@ -198,8 +198,6 @@ void > MpEmitMappingInfo ( > void) > { > - char *NewFilename; > - > > /* Mapfile option enabled? */ > > @@ -208,22 +206,6 @@ MpEmitMappingInfo ( > return; > } > > - /* Create/Open a map file */ > - > - NewFilename = FlGenerateFilename (Gbl_OutputFilenamePrefix, > - FILE_SUFFIX_MAP); > - if (!NewFilename) > - { > - AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, > - 0, 0, 0, 0, NULL, NULL); > - } > - > - /* Open the hex file, text mode (closed at compiler exit) */ > - > - FlOpenFile (ASL_FILE_MAP_OUTPUT, NewFilename, "w+t"); > - AslCompilerSignon (ASL_FILE_MAP_OUTPUT); > - AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT); > - > if (!Gbl_GpioList) > { > FlPrintFile (ASL_FILE_MAP_OUTPUT, > @@ -702,9 +684,6 @@ MpNamespaceXrefBegin ( > > if (Op->Asl.Node == Info->TargetNode) > { > - DevicePathname = AcpiNsGetExternalPathname ( > - Info->TargetNode); > - > while (ParentOp && (!ParentOp->Asl.Node)) > { > ParentOp = ParentOp->Asl.Parent; > @@ -726,6 +705,8 @@ MpNamespaceXrefBegin ( > DevicePathname, HidString); > > Info->References++; > + > + ACPI_FREE (DevicePathname); > } > } > > diff --git a/src/acpica/source/compiler/aslmaputils.c b/src/acpica/source/compiler/aslmaputils.c > index 271a9a8..9b9a03e 100644 > --- a/src/acpica/source/compiler/aslmaputils.c > +++ b/src/acpica/source/compiler/aslmaputils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmessages.c b/src/acpica/source/compiler/aslmessages.c > index 879e3ab..4ea71de 100644 > --- a/src/acpica/source/compiler/aslmessages.c > +++ b/src/acpica/source/compiler/aslmessages.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmessages.h b/src/acpica/source/compiler/aslmessages.h > index bf99a72..12fe9d9 100644 > --- a/src/acpica/source/compiler/aslmessages.h > +++ b/src/acpica/source/compiler/aslmessages.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmethod.c b/src/acpica/source/compiler/aslmethod.c > index 5dc30d7..b8ca5e9 100644 > --- a/src/acpica/source/compiler/aslmethod.c > +++ b/src/acpica/source/compiler/aslmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslnamesp.c b/src/acpica/source/compiler/aslnamesp.c > index 0321dc1..e6d2898 100644 > --- a/src/acpica/source/compiler/aslnamesp.c > +++ b/src/acpica/source/compiler/aslnamesp.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloffset.c b/src/acpica/source/compiler/asloffset.c > index 7b7cf09..1dc432c 100644 > --- a/src/acpica/source/compiler/asloffset.c > +++ b/src/acpica/source/compiler/asloffset.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslopcodes.c b/src/acpica/source/compiler/aslopcodes.c > index b476b06..36044b0 100644 > --- a/src/acpica/source/compiler/aslopcodes.c > +++ b/src/acpica/source/compiler/aslopcodes.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloperands.c b/src/acpica/source/compiler/asloperands.c > index 5533971..ab06d14 100644 > --- a/src/acpica/source/compiler/asloperands.c > +++ b/src/acpica/source/compiler/asloperands.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslopt.c b/src/acpica/source/compiler/aslopt.c > index 3cdaeb0..65fce99 100644 > --- a/src/acpica/source/compiler/aslopt.c > +++ b/src/acpica/source/compiler/aslopt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslparser.y b/src/acpica/source/compiler/aslparser.y > index f850672..588e239 100644 > --- a/src/acpica/source/compiler/aslparser.y > +++ b/src/acpica/source/compiler/aslparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslpredef.c b/src/acpica/source/compiler/aslpredef.c > index 9305ac7..c39483b 100644 > --- a/src/acpica/source/compiler/aslpredef.c > +++ b/src/acpica/source/compiler/aslpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprepkg.c b/src/acpica/source/compiler/aslprepkg.c > index 8184a3d..6b27e91 100644 > --- a/src/acpica/source/compiler/aslprepkg.c > +++ b/src/acpica/source/compiler/aslprepkg.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprintf.c b/src/acpica/source/compiler/aslprintf.c > index 811bc92..1ace80f 100644 > --- a/src/acpica/source/compiler/aslprintf.c > +++ b/src/acpica/source/compiler/aslprintf.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprune.c b/src/acpica/source/compiler/aslprune.c > index 163183b..44221bb 100644 > --- a/src/acpica/source/compiler/aslprune.c > +++ b/src/acpica/source/compiler/aslprune.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslresource.c b/src/acpica/source/compiler/aslresource.c > index 09acd24..2abc7dd 100644 > --- a/src/acpica/source/compiler/aslresource.c > +++ b/src/acpica/source/compiler/aslresource.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype1.c b/src/acpica/source/compiler/aslrestype1.c > index 9991de7..945f1bf 100644 > --- a/src/acpica/source/compiler/aslrestype1.c > +++ b/src/acpica/source/compiler/aslrestype1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype1i.c b/src/acpica/source/compiler/aslrestype1i.c > index 319b547..1394580 100644 > --- a/src/acpica/source/compiler/aslrestype1i.c > +++ b/src/acpica/source/compiler/aslrestype1i.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2.c b/src/acpica/source/compiler/aslrestype2.c > index b639d04..1cbca10 100644 > --- a/src/acpica/source/compiler/aslrestype2.c > +++ b/src/acpica/source/compiler/aslrestype2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2d.c b/src/acpica/source/compiler/aslrestype2d.c > index f55917c..083751f 100644 > --- a/src/acpica/source/compiler/aslrestype2d.c > +++ b/src/acpica/source/compiler/aslrestype2d.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2e.c b/src/acpica/source/compiler/aslrestype2e.c > index 1eb682b..2a24589 100644 > --- a/src/acpica/source/compiler/aslrestype2e.c > +++ b/src/acpica/source/compiler/aslrestype2e.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2q.c b/src/acpica/source/compiler/aslrestype2q.c > index 8b5020f..cfb0405 100644 > --- a/src/acpica/source/compiler/aslrestype2q.c > +++ b/src/acpica/source/compiler/aslrestype2q.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2s.c b/src/acpica/source/compiler/aslrestype2s.c > index 839aa03..779edd0 100644 > --- a/src/acpica/source/compiler/aslrestype2s.c > +++ b/src/acpica/source/compiler/aslrestype2s.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2w.c b/src/acpica/source/compiler/aslrestype2w.c > index 358b5f3..d00a979 100644 > --- a/src/acpica/source/compiler/aslrestype2w.c > +++ b/src/acpica/source/compiler/aslrestype2w.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrules.y b/src/acpica/source/compiler/aslrules.y > index 3e794ab..ed5515c 100644 > --- a/src/acpica/source/compiler/aslrules.y > +++ b/src/acpica/source/compiler/aslrules.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslstartup.c b/src/acpica/source/compiler/aslstartup.c > index 46839ff..0894d45 100644 > --- a/src/acpica/source/compiler/aslstartup.c > +++ b/src/acpica/source/compiler/aslstartup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -160,6 +160,7 @@ AslInitializeGlobals ( > > /* Init compiler globals */ > > + Gbl_SyntaxError = 0; > Gbl_CurrentColumn = 0; > Gbl_CurrentLineNumber = 1; > Gbl_LogicalLineNumber = 1; > diff --git a/src/acpica/source/compiler/aslstubs.c b/src/acpica/source/compiler/aslstubs.c > index a57c4f4..533f7de 100644 > --- a/src/acpica/source/compiler/aslstubs.c > +++ b/src/acpica/source/compiler/aslstubs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslsupport.l b/src/acpica/source/compiler/aslsupport.l > index 2fc591c..c7f1f93 100644 > --- a/src/acpica/source/compiler/aslsupport.l > +++ b/src/acpica/source/compiler/aslsupport.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -141,6 +141,14 @@ typedef struct asl_file_node > ASL_FILE_NODE *Gbl_IncludeFileStack = NULL; > > > +/******************************************************************************* > + * > + * FUNCTION: AslParserCleanup > + * > + * Used to delete the current buffer > + * > + ******************************************************************************/ > + > void > AslParserCleanup ( > void) > @@ -260,7 +268,8 @@ AslPopInputFileStack ( > > > Fnode = Gbl_IncludeFileStack; > - DbgPrint (ASL_PARSE_OUTPUT, "\nPop InputFile Stack, Fnode %p\n\n", Fnode); > + DbgPrint (ASL_PARSE_OUTPUT, > + "\nPop InputFile Stack, Fnode %p\n\n", Fnode); > > if (!Fnode) > { > @@ -320,11 +329,11 @@ AslPushInputFileStack ( > > Fnode = UtLocalCalloc (sizeof (ASL_FILE_NODE)); > > - Fnode->File = yyin; > - Fnode->Next = Gbl_IncludeFileStack; > - Fnode->State = YY_CURRENT_BUFFER; > - Fnode->CurrentLineNumber = Gbl_CurrentLineNumber; > - Fnode->Filename = Gbl_Files[ASL_FILE_INPUT].Filename; > + Fnode->File = yyin; > + Fnode->Next = Gbl_IncludeFileStack; > + Fnode->State = YY_CURRENT_BUFFER; > + Fnode->Filename = Gbl_Files[ASL_FILE_INPUT].Filename; > + Fnode->CurrentLineNumber = Gbl_CurrentLineNumber; > > /* Push it on the stack */ > > @@ -335,7 +344,8 @@ AslPushInputFileStack ( > State = yy_create_buffer (InputFile, YY_BUF_SIZE); > yy_switch_to_buffer (State); > > - DbgPrint (ASL_PARSE_OUTPUT, "\nPush InputFile Stack, returning %p\n\n", InputFile); > + DbgPrint (ASL_PARSE_OUTPUT, > + "\nPush InputFile Stack, returning %p\n\n", InputFile); > > /* Reset the global line count and filename */ > > @@ -385,7 +395,7 @@ AslResetCurrentLineBuffer ( > * > * FUNCTION: AslInsertLineBuffer > * > - * PARAMETERS: SourceChar - One char from the input ASL source file > + * PARAMETERS: SourceChar - One char from the input ASL source file > * > * RETURN: None > * > @@ -426,7 +436,8 @@ AslInsertLineBuffer ( > *Gbl_LineBufPtr = (UINT8) SourceChar; > Gbl_LineBufPtr++; > > - if (Gbl_LineBufPtr > (Gbl_CurrentLineBuffer + (Gbl_LineBufferSize - 1))) > + if (Gbl_LineBufPtr > > + (Gbl_CurrentLineBuffer + (Gbl_LineBufferSize - 1))) > { > #if 0 > /* > @@ -435,9 +446,9 @@ AslInsertLineBuffer ( > */ > sprintf (MsgBuffer, "Max %u", Gbl_LineBufferSize); > AslCommonError (ASL_WARNING, ASL_MSG_LONG_LINE, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, MsgBuffer); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, MsgBuffer); > #endif > > AslResetCurrentLineBuffer (); > @@ -456,12 +467,12 @@ AslInsertLineBuffer ( > * > * FUNCTION: count > * > - * PARAMETERS: yytext - Contains the matched keyword. > - * Type - Keyword/Character type: > - * 0 = anything except a keyword > - * 1 = pseudo-keywords > - * 2 = non-executable ASL keywords > - * 3 = executable ASL keywords > + * PARAMETERS: yytext - Contains the matched keyword. > + * Type - Keyword/Character type: > + * 0 = anything except a keyword > + * 1 = pseudo-keywords > + * 2 = non-executable ASL keywords > + * 3 = executable ASL keywords > * > * RETURN: None > * > @@ -530,7 +541,7 @@ loop: > > /* Eat chars until end-of-comment */ > > - while ((c = input()) != '*' && c != EOF) > + while (((c = input ()) != '*') && (c != EOF)) > { > AslInsertLineBuffer (c); > c1 = c; > @@ -548,16 +559,16 @@ loop: > if ((c1 == '/') && (c == '*')) > { > AslCommonError (ASL_WARNING, ASL_MSG_NESTED_COMMENT, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_InputByteCount, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_InputByteCount, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > } > > /* Comment is closed only if the NEXT character is a slash */ > > AslInsertLineBuffer (c); > > - if ((c1 = input()) != '/' && c1 != EOF) > + if (((c1 = input ()) != '/') && (c1 != EOF)) > { > unput(c1); > goto loop; > @@ -577,9 +588,9 @@ EarlyEOF: > * Premature End-Of-File > */ > AslCommonError (ASL_ERROR, ASL_MSG_EARLY_EOF, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > return (FALSE); > } > > @@ -606,7 +617,7 @@ AslDoCommentType2 ( > AslInsertLineBuffer ('/'); > AslInsertLineBuffer ('/'); > > - while ((c = input()) != '\n' && c != EOF) > + while (((c = input ()) != '\n') && (c != EOF)) > { > AslInsertLineBuffer (c); > } > @@ -754,9 +765,9 @@ DoCharacter: > /* Unknown escape sequence issue warning, but use the character */ > > AslCommonError (ASL_WARNING, ASL_MSG_INVALID_ESCAPE, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > break; > } > break; > @@ -781,9 +792,9 @@ DoCharacter: > if ((Digit == 0) || (Digit > ACPI_ASCII_MAX)) > { > AslCommonError (ASL_WARNING, ASL_MSG_INVALID_STRING, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > } > else > { > @@ -825,9 +836,9 @@ DoCharacter: > if ((Digit == 0) || (Digit > ACPI_ASCII_MAX)) > { > AslCommonError (ASL_WARNING, ASL_MSG_INVALID_STRING, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > } > else > { > @@ -869,9 +880,9 @@ DoCharacter: > * Premature End-Of-File > */ > AslCommonError (ASL_ERROR, ASL_MSG_EARLY_EOF, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > return (FALSE); > > > @@ -885,9 +896,9 @@ CompletedString: > if (!CleanString) > { > AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > return (FALSE); > } > > @@ -901,8 +912,8 @@ BufferOverflow: > /* Literal was too long */ > > AslCommonError (ASL_ERROR, ASL_MSG_STRING_LENGTH, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, "Max length 4096"); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, "Max length 4096"); > return (FALSE); > } > diff --git a/src/acpica/source/compiler/aslsupport.y b/src/acpica/source/compiler/aslsupport.y > index f5168d3..6f3cfec 100644 > --- a/src/acpica/source/compiler/aslsupport.y > +++ b/src/acpica/source/compiler/aslsupport.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltokens.y b/src/acpica/source/compiler/asltokens.y > index d58c7e1..0e99c24 100644 > --- a/src/acpica/source/compiler/asltokens.y > +++ b/src/acpica/source/compiler/asltokens.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltransform.c b/src/acpica/source/compiler/asltransform.c > index 5ce8624..df5d994 100644 > --- a/src/acpica/source/compiler/asltransform.c > +++ b/src/acpica/source/compiler/asltransform.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltree.c b/src/acpica/source/compiler/asltree.c > index 2e0daef..a13707e 100644 > --- a/src/acpica/source/compiler/asltree.c > +++ b/src/acpica/source/compiler/asltree.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltypes.h b/src/acpica/source/compiler/asltypes.h > index 931a25e..21c64ed 100644 > --- a/src/acpica/source/compiler/asltypes.h > +++ b/src/acpica/source/compiler/asltypes.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltypes.y b/src/acpica/source/compiler/asltypes.y > index a3699d6..b1821f6 100644 > --- a/src/acpica/source/compiler/asltypes.y > +++ b/src/acpica/source/compiler/asltypes.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslutils.c b/src/acpica/source/compiler/aslutils.c > index a2ddd05..eb8a883 100644 > --- a/src/acpica/source/compiler/aslutils.c > +++ b/src/acpica/source/compiler/aslutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -643,20 +643,36 @@ UtStringCacheCalloc ( > { > char *Buffer; > ASL_CACHE_INFO *Cache; > + UINT32 CacheSize = ASL_STRING_CACHE_SIZE; > > > - if (Length > ASL_STRING_CACHE_SIZE) > + if (Length > CacheSize) > { > - Buffer = UtLocalCalloc (Length); > - return (Buffer); > + CacheSize = Length; > + > + if (Gbl_StringCacheList) > + { > + Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); > + > + /* Link new cache buffer just following head of list */ > + > + Cache->Next = Gbl_StringCacheList->Next; > + Gbl_StringCacheList->Next = Cache; > + > + /* Leave cache management pointers alone as they pertain to head */ > + > + Gbl_StringCount++; > + Gbl_StringSize += Length; > + > + return (Cache->Buffer); > + } > } > > if ((Gbl_StringCacheNext + Length) >= Gbl_StringCacheLast) > { > /* Allocate a new buffer */ > > - Cache = UtLocalCalloc (sizeof (Cache->Next) + > - ASL_STRING_CACHE_SIZE); > + Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); > > /* Link new cache buffer to head of list */ > > @@ -666,7 +682,7 @@ UtStringCacheCalloc ( > /* Setup cache management pointers */ > > Gbl_StringCacheNext = Cache->Buffer; > - Gbl_StringCacheLast = Gbl_StringCacheNext + ASL_STRING_CACHE_SIZE; > + Gbl_StringCacheLast = Gbl_StringCacheNext + CacheSize; > } > > Gbl_StringCount++; > diff --git a/src/acpica/source/compiler/asluuid.c b/src/acpica/source/compiler/asluuid.c > index 98a63a3..db2dd34 100644 > --- a/src/acpica/source/compiler/asluuid.c > +++ b/src/acpica/source/compiler/asluuid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslwalks.c b/src/acpica/source/compiler/aslwalks.c > index be7ef48..679feb0 100644 > --- a/src/acpica/source/compiler/aslwalks.c > +++ b/src/acpica/source/compiler/aslwalks.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslxref.c b/src/acpica/source/compiler/aslxref.c > index 5387cbe..ab68b88 100644 > --- a/src/acpica/source/compiler/aslxref.c > +++ b/src/acpica/source/compiler/aslxref.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompile.c b/src/acpica/source/compiler/dtcompile.c > index 10f963c..d5b3347 100644 > --- a/src/acpica/source/compiler/dtcompile.c > +++ b/src/acpica/source/compiler/dtcompile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompiler.h b/src/acpica/source/compiler/dtcompiler.h > index 2eda236..b070c58 100644 > --- a/src/acpica/source/compiler/dtcompiler.h > +++ b/src/acpica/source/compiler/dtcompiler.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtexpress.c b/src/acpica/source/compiler/dtexpress.c > index a46c2eb..2fdd4d2 100644 > --- a/src/acpica/source/compiler/dtexpress.c > +++ b/src/acpica/source/compiler/dtexpress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtfield.c b/src/acpica/source/compiler/dtfield.c > index e3908ba..f3810c2 100644 > --- a/src/acpica/source/compiler/dtfield.c > +++ b/src/acpica/source/compiler/dtfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtio.c b/src/acpica/source/compiler/dtio.c > index 77bbc5d..baec96a 100644 > --- a/src/acpica/source/compiler/dtio.c > +++ b/src/acpica/source/compiler/dtio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtparser.l b/src/acpica/source/compiler/dtparser.l > index 7c26759..b3cdf22 100644 > --- a/src/acpica/source/compiler/dtparser.l > +++ b/src/acpica/source/compiler/dtparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtparser.y b/src/acpica/source/compiler/dtparser.y > index 40e8066..96e6c14 100644 > --- a/src/acpica/source/compiler/dtparser.y > +++ b/src/acpica/source/compiler/dtparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtsubtable.c b/src/acpica/source/compiler/dtsubtable.c > index 13c2a05..a35792d 100644 > --- a/src/acpica/source/compiler/dtsubtable.c > +++ b/src/acpica/source/compiler/dtsubtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttable.c b/src/acpica/source/compiler/dttable.c > index b80f870..56bfad7 100644 > --- a/src/acpica/source/compiler/dttable.c > +++ b/src/acpica/source/compiler/dttable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttemplate.c b/src/acpica/source/compiler/dttemplate.c > index f677f83..b3f32b8 100644 > --- a/src/acpica/source/compiler/dttemplate.c > +++ b/src/acpica/source/compiler/dttemplate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttemplate.h b/src/acpica/source/compiler/dttemplate.h > index 1dfd5cb..9971f71 100644 > --- a/src/acpica/source/compiler/dttemplate.h > +++ b/src/acpica/source/compiler/dttemplate.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtutils.c b/src/acpica/source/compiler/dtutils.c > index 941fe76..5beadd1 100644 > --- a/src/acpica/source/compiler/dtutils.c > +++ b/src/acpica/source/compiler/dtutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/preprocess.h b/src/acpica/source/compiler/preprocess.h > index b5a57f5..998a25a 100644 > --- a/src/acpica/source/compiler/preprocess.h > +++ b/src/acpica/source/compiler/preprocess.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prexpress.c b/src/acpica/source/compiler/prexpress.c > index f787009..513a443 100644 > --- a/src/acpica/source/compiler/prexpress.c > +++ b/src/acpica/source/compiler/prexpress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prmacros.c b/src/acpica/source/compiler/prmacros.c > index 6bd6727..798e29b 100644 > --- a/src/acpica/source/compiler/prmacros.c > +++ b/src/acpica/source/compiler/prmacros.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prparser.l b/src/acpica/source/compiler/prparser.l > index fe73c90..e104107 100644 > --- a/src/acpica/source/compiler/prparser.l > +++ b/src/acpica/source/compiler/prparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prparser.y b/src/acpica/source/compiler/prparser.y > index 71b33c8..990b79b 100644 > --- a/src/acpica/source/compiler/prparser.y > +++ b/src/acpica/source/compiler/prparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prscan.c b/src/acpica/source/compiler/prscan.c > index 943b721..d52a45e 100644 > --- a/src/acpica/source/compiler/prscan.c > +++ b/src/acpica/source/compiler/prscan.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prutils.c b/src/acpica/source/compiler/prutils.c > index a2b5906..10d65a5 100644 > --- a/src/acpica/source/compiler/prutils.c > +++ b/src/acpica/source/compiler/prutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbcmds.c b/src/acpica/source/components/debugger/dbcmds.c > index 0d39139..8c723b3 100644 > --- a/src/acpica/source/components/debugger/dbcmds.c > +++ b/src/acpica/source/components/debugger/dbcmds.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbconvert.c b/src/acpica/source/components/debugger/dbconvert.c > index 61d5418..14caa2b 100644 > --- a/src/acpica/source/components/debugger/dbconvert.c > +++ b/src/acpica/source/components/debugger/dbconvert.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbdisply.c b/src/acpica/source/components/debugger/dbdisply.c > index 7991f0a..04a7591 100644 > --- a/src/acpica/source/components/debugger/dbdisply.c > +++ b/src/acpica/source/components/debugger/dbdisply.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -972,7 +972,7 @@ AcpiDbDisplayGpes ( > GpeIndex = (i * ACPI_GPE_REGISTER_WIDTH) + j; > GpeEventInfo = &GpeBlock->EventInfo[GpeIndex]; > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NONE) > { > /* This GPE is not used (no method or handler), ignore it */ > @@ -1005,7 +1005,7 @@ AcpiDbDisplayGpes ( > AcpiOsPrintf ("RunOnly, "); > } > > - switch (GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) > + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) > { > case ACPI_GPE_DISPATCH_NONE: > > @@ -1016,6 +1016,7 @@ AcpiDbDisplayGpes ( > > AcpiOsPrintf ("Method"); > break; > + > case ACPI_GPE_DISPATCH_HANDLER: > > AcpiOsPrintf ("Handler"); > @@ -1033,10 +1034,15 @@ AcpiDbDisplayGpes ( > AcpiOsPrintf ("Implicit Notify on %u devices", Count); > break; > > + case ACPI_GPE_DISPATCH_RAW_HANDLER: > + > + AcpiOsPrintf ("RawHandler"); > + break; > + > default: > > AcpiOsPrintf ("UNKNOWN: %X", > - GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK); > + ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)); > break; > } > > diff --git a/src/acpica/source/components/debugger/dbexec.c b/src/acpica/source/components/debugger/dbexec.c > index 253b25a..c865c47 100644 > --- a/src/acpica/source/components/debugger/dbexec.c > +++ b/src/acpica/source/components/debugger/dbexec.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbfileio.c b/src/acpica/source/components/debugger/dbfileio.c > index 4521ee6..768d87c 100644 > --- a/src/acpica/source/components/debugger/dbfileio.c > +++ b/src/acpica/source/components/debugger/dbfileio.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbhistry.c b/src/acpica/source/components/debugger/dbhistry.c > index 18de938..ad11d4f 100644 > --- a/src/acpica/source/components/debugger/dbhistry.c > +++ b/src/acpica/source/components/debugger/dbhistry.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbinput.c b/src/acpica/source/components/debugger/dbinput.c > index a85f5ff..fe34a90 100644 > --- a/src/acpica/source/components/debugger/dbinput.c > +++ b/src/acpica/source/components/debugger/dbinput.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbmethod.c b/src/acpica/source/components/debugger/dbmethod.c > index 67aa9c8..72076a7 100644 > --- a/src/acpica/source/components/debugger/dbmethod.c > +++ b/src/acpica/source/components/debugger/dbmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbnames.c b/src/acpica/source/components/debugger/dbnames.c > index 6cbe840..ccaa672 100644 > --- a/src/acpica/source/components/debugger/dbnames.c > +++ b/src/acpica/source/components/debugger/dbnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbstats.c b/src/acpica/source/components/debugger/dbstats.c > index 70224fa..61095e1 100644 > --- a/src/acpica/source/components/debugger/dbstats.c > +++ b/src/acpica/source/components/debugger/dbstats.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbtest.c b/src/acpica/source/components/debugger/dbtest.c > index fd7201a..26bfc1c 100644 > --- a/src/acpica/source/components/debugger/dbtest.c > +++ b/src/acpica/source/components/debugger/dbtest.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbutils.c b/src/acpica/source/components/debugger/dbutils.c > index fa47bd8..fd3445c 100644 > --- a/src/acpica/source/components/debugger/dbutils.c > +++ b/src/acpica/source/components/debugger/dbutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbxface.c b/src/acpica/source/components/debugger/dbxface.c > index d4cc9e0..ac03ccc 100644 > --- a/src/acpica/source/components/debugger/dbxface.c > +++ b/src/acpica/source/components/debugger/dbxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmbuffer.c b/src/acpica/source/components/disassembler/dmbuffer.c > index 7275eca..8ad879c 100644 > --- a/src/acpica/source/components/disassembler/dmbuffer.c > +++ b/src/acpica/source/components/disassembler/dmbuffer.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmcstyle.c b/src/acpica/source/components/disassembler/dmcstyle.c > index 73d7de2..951af09 100644 > --- a/src/acpica/source/components/disassembler/dmcstyle.c > +++ b/src/acpica/source/components/disassembler/dmcstyle.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmdeferred.c b/src/acpica/source/components/disassembler/dmdeferred.c > index c3fb456..7e654f2 100644 > --- a/src/acpica/source/components/disassembler/dmdeferred.c > +++ b/src/acpica/source/components/disassembler/dmdeferred.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmnames.c b/src/acpica/source/components/disassembler/dmnames.c > index cb4c63b..45df12a 100644 > --- a/src/acpica/source/components/disassembler/dmnames.c > +++ b/src/acpica/source/components/disassembler/dmnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmobject.c b/src/acpica/source/components/disassembler/dmobject.c > index 0a01264..c4680ef 100644 > --- a/src/acpica/source/components/disassembler/dmobject.c > +++ b/src/acpica/source/components/disassembler/dmobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmopcode.c b/src/acpica/source/components/disassembler/dmopcode.c > index f4f2cf6..99d3ead 100644 > --- a/src/acpica/source/components/disassembler/dmopcode.c > +++ b/src/acpica/source/components/disassembler/dmopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrc.c b/src/acpica/source/components/disassembler/dmresrc.c > index 649fe4a..654d20b 100644 > --- a/src/acpica/source/components/disassembler/dmresrc.c > +++ b/src/acpica/source/components/disassembler/dmresrc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcl.c b/src/acpica/source/components/disassembler/dmresrcl.c > index ea2c732..b19dffd 100644 > --- a/src/acpica/source/components/disassembler/dmresrcl.c > +++ b/src/acpica/source/components/disassembler/dmresrcl.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcl2.c b/src/acpica/source/components/disassembler/dmresrcl2.c > index 5c60cd4..a9eb885 100644 > --- a/src/acpica/source/components/disassembler/dmresrcl2.c > +++ b/src/acpica/source/components/disassembler/dmresrcl2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcs.c b/src/acpica/source/components/disassembler/dmresrcs.c > index bc28828..cb2084f 100644 > --- a/src/acpica/source/components/disassembler/dmresrcs.c > +++ b/src/acpica/source/components/disassembler/dmresrcs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmutils.c b/src/acpica/source/components/disassembler/dmutils.c > index d48eed7..382ec79 100644 > --- a/src/acpica/source/components/disassembler/dmutils.c > +++ b/src/acpica/source/components/disassembler/dmutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmwalk.c b/src/acpica/source/components/disassembler/dmwalk.c > index b89faf9..79a1872 100644 > --- a/src/acpica/source/components/disassembler/dmwalk.c > +++ b/src/acpica/source/components/disassembler/dmwalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsargs.c b/src/acpica/source/components/dispatcher/dsargs.c > index d70b6a9..8acb5dc 100644 > --- a/src/acpica/source/components/dispatcher/dsargs.c > +++ b/src/acpica/source/components/dispatcher/dsargs.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dscontrol.c b/src/acpica/source/components/dispatcher/dscontrol.c > index 85df0e3..218cbe9 100644 > --- a/src/acpica/source/components/dispatcher/dscontrol.c > +++ b/src/acpica/source/components/dispatcher/dscontrol.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsfield.c b/src/acpica/source/components/dispatcher/dsfield.c > index d14434b..37d4cc1 100644 > --- a/src/acpica/source/components/dispatcher/dsfield.c > +++ b/src/acpica/source/components/dispatcher/dsfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsinit.c b/src/acpica/source/components/dispatcher/dsinit.c > index f68c66e..585e127 100644 > --- a/src/acpica/source/components/dispatcher/dsinit.c > +++ b/src/acpica/source/components/dispatcher/dsinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsmethod.c b/src/acpica/source/components/dispatcher/dsmethod.c > index d8d8230..43ee55d 100644 > --- a/src/acpica/source/components/dispatcher/dsmethod.c > +++ b/src/acpica/source/components/dispatcher/dsmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsmthdat.c b/src/acpica/source/components/dispatcher/dsmthdat.c > index 7f94325..2b7fce2 100644 > --- a/src/acpica/source/components/dispatcher/dsmthdat.c > +++ b/src/acpica/source/components/dispatcher/dsmthdat.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsobject.c b/src/acpica/source/components/dispatcher/dsobject.c > index 59d4656..b5cad38 100644 > --- a/src/acpica/source/components/dispatcher/dsobject.c > +++ b/src/acpica/source/components/dispatcher/dsobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsopcode.c b/src/acpica/source/components/dispatcher/dsopcode.c > index c1f265d..6a761f5 100644 > --- a/src/acpica/source/components/dispatcher/dsopcode.c > +++ b/src/acpica/source/components/dispatcher/dsopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsutils.c b/src/acpica/source/components/dispatcher/dsutils.c > index 81d73cb..b98fc9a 100644 > --- a/src/acpica/source/components/dispatcher/dsutils.c > +++ b/src/acpica/source/components/dispatcher/dsutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswexec.c b/src/acpica/source/components/dispatcher/dswexec.c > index 877d30f..f650ced 100644 > --- a/src/acpica/source/components/dispatcher/dswexec.c > +++ b/src/acpica/source/components/dispatcher/dswexec.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswload.c b/src/acpica/source/components/dispatcher/dswload.c > index de70dee..be090fc 100644 > --- a/src/acpica/source/components/dispatcher/dswload.c > +++ b/src/acpica/source/components/dispatcher/dswload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswload2.c b/src/acpica/source/components/dispatcher/dswload2.c > index 4fc1485..312b2cd 100644 > --- a/src/acpica/source/components/dispatcher/dswload2.c > +++ b/src/acpica/source/components/dispatcher/dswload2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswscope.c b/src/acpica/source/components/dispatcher/dswscope.c > index 7caa301..9865dcd 100644 > --- a/src/acpica/source/components/dispatcher/dswscope.c > +++ b/src/acpica/source/components/dispatcher/dswscope.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswstate.c b/src/acpica/source/components/dispatcher/dswstate.c > index 4d24d2c..e5ea508 100644 > --- a/src/acpica/source/components/dispatcher/dswstate.c > +++ b/src/acpica/source/components/dispatcher/dswstate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evevent.c b/src/acpica/source/components/events/evevent.c > index f43eeff..e447356 100644 > --- a/src/acpica/source/components/events/evevent.c > +++ b/src/acpica/source/components/events/evevent.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evglock.c b/src/acpica/source/components/events/evglock.c > index fa1954a..e1ebf19 100644 > --- a/src/acpica/source/components/events/evglock.c > +++ b/src/acpica/source/components/events/evglock.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evgpe.c b/src/acpica/source/components/events/evgpe.c > index ea1a3a6..16428d6 100644 > --- a/src/acpica/source/components/events/evgpe.c > +++ b/src/acpica/source/components/events/evgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -203,18 +203,6 @@ AcpiEvEnableGpe ( > ACPI_FUNCTION_TRACE (EvEnableGpe); > > > - /* > - * We will only allow a GPE to be enabled if it has either an associated > - * method (_Lxx/_Exx) or a handler, or is using the implicit notify > - * feature. Otherwise, the GPE will be immediately disabled by > - * AcpiEvGpeDispatch the first time it fires. > - */ > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_NONE) > - { > - return_ACPI_STATUS (AE_NO_HANDLER); > - } > - > /* Clear the GPE (of stale events) */ > > Status = AcpiHwClearGpe (GpeEventInfo); > @@ -225,7 +213,7 @@ AcpiEvEnableGpe ( > > /* Enable the requested GPE */ > > - Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); > + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE_SAVE); > return_ACPI_STATUS (Status); > } > > @@ -315,7 +303,7 @@ AcpiEvRemoveGpeReference ( > Status = AcpiEvUpdateGpeEnableMask (GpeEventInfo); > if (ACPI_SUCCESS (Status)) > { > - Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE); > + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE_SAVE); > } > > if (ACPI_FAILURE (Status)) > @@ -455,7 +443,11 @@ AcpiEvGpeDetect ( > { > ACPI_STATUS Status; > ACPI_GPE_BLOCK_INFO *GpeBlock; > + ACPI_NAMESPACE_NODE *GpeDevice; > ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; > + ACPI_GPE_EVENT_INFO *GpeEventInfo; > + UINT32 GpeNumber; > + ACPI_GPE_HANDLER_INFO *GpeHandlerInfo; > UINT32 IntStatus = ACPI_INTERRUPT_NOT_HANDLED; > UINT8 EnabledStatusByte; > UINT32 StatusReg; > @@ -486,6 +478,8 @@ AcpiEvGpeDetect ( > GpeBlock = GpeXruptList->GpeBlockListHead; > while (GpeBlock) > { > + GpeDevice = GpeBlock->Node; > + > /* > * Read all of the 8-bit GPE status and enable registers in this GPE > * block, saving all of them. Find all currently active GP events. > @@ -554,16 +548,55 @@ AcpiEvGpeDetect ( > { > /* Examine one GPE bit */ > > + GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * > + ACPI_GPE_REGISTER_WIDTH) + j]; > + GpeNumber = j + GpeRegisterInfo->BaseGpeNumber; > + > if (EnabledStatusByte & (1 << j)) > { > - /* > - * Found an active GPE. Dispatch the event to a handler > - * or method. > - */ > - IntStatus |= AcpiEvGpeDispatch (GpeBlock->Node, > - &GpeBlock->EventInfo[((ACPI_SIZE) i * > - ACPI_GPE_REGISTER_WIDTH) + j], > - j + GpeRegisterInfo->BaseGpeNumber); > + /* Invoke global event handler if present */ > + > + AcpiGpeCount++; > + if (AcpiGbl_GlobalEventHandler) > + { > + AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, > + GpeDevice, GpeNumber, > + AcpiGbl_GlobalEventHandlerContext); > + } > + > + /* Found an active GPE */ > + > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER) > + { > + /* Dispatch the event to a raw handler */ > + > + GpeHandlerInfo = GpeEventInfo->Dispatch.Handler; > + > + /* > + * There is no protection around the namespace node > + * and the GPE handler to ensure a safe destruction > + * because: > + * 1. The namespace node is expected to always > + * exist after loading a table. > + * 2. The GPE handler is expected to be flushed by > + * AcpiOsWaitEventsComplete() before the > + * destruction. > + */ > + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); > + IntStatus |= GpeHandlerInfo->Address ( > + GpeDevice, GpeNumber, GpeHandlerInfo->Context); > + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); > + } > + else > + { > + /* > + * Dispatch the event to a standard handler or > + * method. > + */ > + IntStatus |= AcpiEvGpeDispatch (GpeDevice, > + GpeEventInfo, GpeNumber); > + } > } > } > } > @@ -599,8 +632,7 @@ AcpiEvAsynchExecuteGpeMethod ( > void *Context) > { > ACPI_GPE_EVENT_INFO *GpeEventInfo = Context; > - ACPI_STATUS Status; > - ACPI_GPE_EVENT_INFO *LocalGpeEventInfo; > + ACPI_STATUS Status = AE_OK; > ACPI_EVALUATE_INFO *Info; > ACPI_GPE_NOTIFY_INFO *Notify; > > @@ -608,49 +640,9 @@ AcpiEvAsynchExecuteGpeMethod ( > ACPI_FUNCTION_TRACE (EvAsynchExecuteGpeMethod); > > > - /* Allocate a local GPE block */ > - > - LocalGpeEventInfo = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_EVENT_INFO)); > - if (!LocalGpeEventInfo) > - { > - ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, > - "while handling a GPE")); > - return_VOID; > - } > - > - Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); > - if (ACPI_FAILURE (Status)) > - { > - ACPI_FREE (LocalGpeEventInfo); > - return_VOID; > - } > - > - /* Must revalidate the GpeNumber/GpeBlock */ > - > - if (!AcpiEvValidGpeEvent (GpeEventInfo)) > - { > - Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS); > - ACPI_FREE (LocalGpeEventInfo); > - return_VOID; > - } > - > - /* > - * Take a snapshot of the GPE info for this level - we copy the info to > - * prevent a race condition with RemoveHandler/RemoveBlock. > - */ > - ACPI_MEMCPY (LocalGpeEventInfo, GpeEventInfo, > - sizeof (ACPI_GPE_EVENT_INFO)); > - > - Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS); > - if (ACPI_FAILURE (Status)) > - { > - ACPI_FREE (LocalGpeEventInfo); > - return_VOID; > - } > - > /* Do the correct dispatch - normal method or implicit notify */ > > - switch (LocalGpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) > + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) > { > case ACPI_GPE_DISPATCH_NOTIFY: > /* > @@ -664,7 +656,7 @@ AcpiEvAsynchExecuteGpeMethod ( > * June 2012: Expand implicit notify mechanism to support > * notifies on multiple device objects. > */ > - Notify = LocalGpeEventInfo->Dispatch.NotifyList; > + Notify = GpeEventInfo->Dispatch.NotifyList; > while (ACPI_SUCCESS (Status) && Notify) > { > Status = AcpiEvQueueNotifyRequest (Notify->DeviceNode, > @@ -689,7 +681,7 @@ AcpiEvAsynchExecuteGpeMethod ( > * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the > * _Lxx/_Exx control method that corresponds to this GPE > */ > - Info->PrefixNode = LocalGpeEventInfo->Dispatch.MethodNode; > + Info->PrefixNode = GpeEventInfo->Dispatch.MethodNode; > Info->Flags = ACPI_IGNORE_RETURN_VALUE; > > Status = AcpiNsEvaluate (Info); > @@ -700,23 +692,26 @@ AcpiEvAsynchExecuteGpeMethod ( > { > ACPI_EXCEPTION ((AE_INFO, Status, > "while evaluating GPE method [%4.4s]", > - AcpiUtGetNodeName (LocalGpeEventInfo->Dispatch.MethodNode))); > + AcpiUtGetNodeName (GpeEventInfo->Dispatch.MethodNode))); > } > break; > > default: > > - return_VOID; /* Should never happen */ > + goto ErrorExit; /* Should never happen */ > } > > /* Defer enabling of GPE until all notify handlers are done */ > > Status = AcpiOsExecute (OSL_NOTIFY_HANDLER, > - AcpiEvAsynchEnableGpe, LocalGpeEventInfo); > - if (ACPI_FAILURE (Status)) > + AcpiEvAsynchEnableGpe, GpeEventInfo); > + if (ACPI_SUCCESS (Status)) > { > - ACPI_FREE (LocalGpeEventInfo); > + return_VOID; > } > + > +ErrorExit: > + AcpiEvAsynchEnableGpe (GpeEventInfo); > return_VOID; > } > > @@ -740,11 +735,13 @@ AcpiEvAsynchEnableGpe ( > void *Context) > { > ACPI_GPE_EVENT_INFO *GpeEventInfo = Context; > + ACPI_CPU_FLAGS Flags; > > > + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); > (void) AcpiEvFinishGpe (GpeEventInfo); > + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); > > - ACPI_FREE (GpeEventInfo); > return; > } > > @@ -785,7 +782,7 @@ AcpiEvFinishGpe ( > > /* > * Enable this GPE, conditionally. This means that the GPE will > - * only be physically enabled if the EnableForRun bit is set > + * only be physically enabled if the EnableMask bit is set > * in the EventInfo. > */ > (void) AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_CONDITIONAL_ENABLE); > @@ -823,15 +820,6 @@ AcpiEvGpeDispatch ( > ACPI_FUNCTION_TRACE (EvGpeDispatch); > > > - /* Invoke global event handler if present */ > - > - AcpiGpeCount++; > - if (AcpiGbl_GlobalEventHandler) > - { > - AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, GpeDevice, > - GpeNumber, AcpiGbl_GlobalEventHandlerContext); > - } > - > /* > * Always disable the GPE so that it does not keep firing before > * any asynchronous activity completes (either from the execution > @@ -874,7 +862,7 @@ AcpiEvGpeDispatch ( > * If there is neither a handler nor a method, leave the GPE > * disabled. > */ > - switch (GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) > + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) > { > case ACPI_GPE_DISPATCH_HANDLER: > > diff --git a/src/acpica/source/components/events/evgpeblk.c b/src/acpica/source/components/events/evgpeblk.c > index 4de91c1..e067457 100644 > --- a/src/acpica/source/components/events/evgpeblk.c > +++ b/src/acpica/source/components/events/evgpeblk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -590,8 +590,9 @@ AcpiEvInitializeGpeBlock ( > * Ignore GPEs that have no corresponding _Lxx/_Exx method > * and GPEs that are used to wake the system > */ > - if (((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == ACPI_GPE_DISPATCH_NONE) || > - ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == ACPI_GPE_DISPATCH_HANDLER) || > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NONE) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_RAW_HANDLER) || > (GpeEventInfo->Flags & ACPI_GPE_CAN_WAKE)) > { > continue; > diff --git a/src/acpica/source/components/events/evgpeinit.c b/src/acpica/source/components/events/evgpeinit.c > index 237a96c..5848b75 100644 > --- a/src/acpica/source/components/events/evgpeinit.c > +++ b/src/acpica/source/components/events/evgpeinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -491,15 +491,17 @@ AcpiEvMatchGpeMethod ( > return_ACPI_STATUS (AE_OK); > } > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > /* If there is already a handler, ignore this GPE method */ > > return_ACPI_STATUS (AE_OK); > } > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_METHOD) > { > /* > diff --git a/src/acpica/source/components/events/evgpeutil.c b/src/acpica/source/components/events/evgpeutil.c > index 0410bae..f204bba 100644 > --- a/src/acpica/source/components/events/evgpeutil.c > +++ b/src/acpica/source/components/events/evgpeutil.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -187,60 +187,6 @@ UnlockAndExit: > > /******************************************************************************* > * > - * FUNCTION: AcpiEvValidGpeEvent > - * > - * PARAMETERS: GpeEventInfo - Info for this GPE > - * > - * RETURN: TRUE if the GpeEvent is valid > - * > - * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL. > - * Should be called only when the GPE lists are semaphore locked > - * and not subject to change. > - * > - ******************************************************************************/ > - > -BOOLEAN > -AcpiEvValidGpeEvent ( > - ACPI_GPE_EVENT_INFO *GpeEventInfo) > -{ > - ACPI_GPE_XRUPT_INFO *GpeXruptBlock; > - ACPI_GPE_BLOCK_INFO *GpeBlock; > - > - > - ACPI_FUNCTION_ENTRY (); > - > - > - /* No need for spin lock since we are not changing any list elements */ > - > - /* Walk the GPE interrupt levels */ > - > - GpeXruptBlock = AcpiGbl_GpeXruptListHead; > - while (GpeXruptBlock) > - { > - GpeBlock = GpeXruptBlock->GpeBlockListHead; > - > - /* Walk the GPE blocks on this interrupt level */ > - > - while (GpeBlock) > - { > - if ((&GpeBlock->EventInfo[0] <= GpeEventInfo) && > - (&GpeBlock->EventInfo[GpeBlock->GpeCount] > GpeEventInfo)) > - { > - return (TRUE); > - } > - > - GpeBlock = GpeBlock->Next; > - } > - > - GpeXruptBlock = GpeXruptBlock->Next; > - } > - > - return (FALSE); > -} > - > - > -/******************************************************************************* > - * > * FUNCTION: AcpiEvGetGpeDevice > * > * PARAMETERS: GPE_WALK_CALLBACK > @@ -488,8 +434,10 @@ AcpiEvDeleteGpeHandlers ( > GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * > ACPI_GPE_REGISTER_WIDTH) + j]; > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > /* Delete an installed handler block */ > > @@ -497,7 +445,7 @@ AcpiEvDeleteGpeHandlers ( > GpeEventInfo->Dispatch.Handler = NULL; > GpeEventInfo->Flags &= ~ACPI_GPE_DISPATCH_MASK; > } > - else if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + else if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NOTIFY) > { > /* Delete the implicit notification device list */ > diff --git a/src/acpica/source/components/events/evhandler.c b/src/acpica/source/components/events/evhandler.c > index b67ba3e..d02ea53 100644 > --- a/src/acpica/source/components/events/evhandler.c > +++ b/src/acpica/source/components/events/evhandler.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evmisc.c b/src/acpica/source/components/events/evmisc.c > index 8b2c3ff..1735038 100644 > --- a/src/acpica/source/components/events/evmisc.c > +++ b/src/acpica/source/components/events/evmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evregion.c b/src/acpica/source/components/events/evregion.c > index ec681da..bd0fd7b 100644 > --- a/src/acpica/source/components/events/evregion.c > +++ b/src/acpica/source/components/events/evregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evrgnini.c b/src/acpica/source/components/events/evrgnini.c > index d439c31..405af22 100644 > --- a/src/acpica/source/components/events/evrgnini.c > +++ b/src/acpica/source/components/events/evrgnini.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evsci.c b/src/acpica/source/components/events/evsci.c > index ec6c1c1..987b03c 100644 > --- a/src/acpica/source/components/events/evsci.c > +++ b/src/acpica/source/components/events/evsci.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxface.c b/src/acpica/source/components/events/evxface.c > index 9b8a1ce..5e3391d 100644 > --- a/src/acpica/source/components/events/evxface.c > +++ b/src/acpica/source/components/events/evxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -124,6 +124,21 @@ > #define _COMPONENT ACPI_EVENTS > ACPI_MODULE_NAME ("evxface") > > +#if (!ACPI_REDUCED_HARDWARE) > + > +/* Local prototypes */ > + > +static ACPI_STATUS > +AcpiEvInstallGpeHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + BOOLEAN IsRawHandler, > + ACPI_GPE_HANDLER Address, > + void *Context); > + > +#endif > + > > /******************************************************************************* > * > @@ -894,27 +909,31 @@ ACPI_EXPORT_SYMBOL (AcpiRemoveFixedEventHandler) > > /******************************************************************************* > * > - * FUNCTION: AcpiInstallGpeHandler > + * FUNCTION: AcpiEvInstallGpeHandler > * > * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > * defined GPEs) > * GpeNumber - The GPE number within the GPE block > * Type - Whether this GPE should be treated as an > * edge- or level-triggered interrupt. > + * IsRawHandler - Whether this GPE should be handled using > + * the special GPE handler mode. > * Address - Address of the handler > * Context - Value passed to the handler on each GPE > * > * RETURN: Status > * > - * DESCRIPTION: Install a handler for a General Purpose Event. > + * DESCRIPTION: Internal function to install a handler for a General Purpose > + * Event. > * > ******************************************************************************/ > > -ACPI_STATUS > -AcpiInstallGpeHandler ( > +static ACPI_STATUS > +AcpiEvInstallGpeHandler ( > ACPI_HANDLE GpeDevice, > UINT32 GpeNumber, > UINT32 Type, > + BOOLEAN IsRawHandler, > ACPI_GPE_HANDLER Address, > void *Context) > { > @@ -924,7 +943,7 @@ AcpiInstallGpeHandler ( > ACPI_CPU_FLAGS Flags; > > > - ACPI_FUNCTION_TRACE (AcpiInstallGpeHandler); > + ACPI_FUNCTION_TRACE (EvInstallGpeHandler); > > > /* Parameter validation */ > @@ -962,8 +981,10 @@ AcpiInstallGpeHandler ( > > /* Make sure that there isn't a handler there already */ > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > Status = AE_ALREADY_EXISTS; > goto FreeAndExit; > @@ -980,8 +1001,10 @@ AcpiInstallGpeHandler ( > * automatically during initialization, in which case it has to be > * disabled now to avoid spurious execution of the handler. > */ > - if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) || > - (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) && > + if (((ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_METHOD) || > + (ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_NOTIFY)) && > GpeEventInfo->RuntimeCount) > { > Handler->OriginallyEnabled = TRUE; > @@ -1002,7 +1025,8 @@ AcpiInstallGpeHandler ( > /* Setup up dispatch flags to indicate handler (vs. method/notify) */ > > GpeEventInfo->Flags &= ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK); > - GpeEventInfo->Flags |= (UINT8) (Type | ACPI_GPE_DISPATCH_HANDLER); > + GpeEventInfo->Flags |= (UINT8) (Type | (IsRawHandler ? > + ACPI_GPE_DISPATCH_RAW_HANDLER : ACPI_GPE_DISPATCH_HANDLER)); > > AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); > > @@ -1017,11 +1041,91 @@ FreeAndExit: > goto UnlockAndExit; > } > > + > +/******************************************************************************* > + * > + * FUNCTION: AcpiInstallGpeHandler > + * > + * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > + * defined GPEs) > + * GpeNumber - The GPE number within the GPE block > + * Type - Whether this GPE should be treated as an > + * edge- or level-triggered interrupt. > + * Address - Address of the handler > + * Context - Value passed to the handler on each GPE > + * > + * RETURN: Status > + * > + * DESCRIPTION: Install a handler for a General Purpose Event. > + * > + ******************************************************************************/ > + > +ACPI_STATUS > +AcpiInstallGpeHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + ACPI_GPE_HANDLER Address, > + void *Context) > +{ > + ACPI_STATUS Status; > + > + > + ACPI_FUNCTION_TRACE (AcpiInstallGpeHandler); > + > + > + Status = AcpiEvInstallGpeHandler (GpeDevice, GpeNumber, Type, FALSE, > + Address, Context); > + > + return_ACPI_STATUS (Status); > +} > + > ACPI_EXPORT_SYMBOL (AcpiInstallGpeHandler) > > > /******************************************************************************* > * > + * FUNCTION: AcpiInstallGpeRawHandler > + * > + * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > + * defined GPEs) > + * GpeNumber - The GPE number within the GPE block > + * Type - Whether this GPE should be treated as an > + * edge- or level-triggered interrupt. > + * Address - Address of the handler > + * Context - Value passed to the handler on each GPE > + * > + * RETURN: Status > + * > + * DESCRIPTION: Install a handler for a General Purpose Event. > + * > + ******************************************************************************/ > + > +ACPI_STATUS > +AcpiInstallGpeRawHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + ACPI_GPE_HANDLER Address, > + void *Context) > +{ > + ACPI_STATUS Status; > + > + > + ACPI_FUNCTION_TRACE (AcpiInstallGpeRawHandler); > + > + > + Status = AcpiEvInstallGpeHandler (GpeDevice, GpeNumber, Type, TRUE, > + Address, Context); > + > + return_ACPI_STATUS (Status); > +} > + > +ACPI_EXPORT_SYMBOL (AcpiInstallGpeRawHandler) > + > + > +/******************************************************************************* > + * > * FUNCTION: AcpiRemoveGpeHandler > * > * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > @@ -1076,8 +1180,10 @@ AcpiRemoveGpeHandler ( > > /* Make sure that a handler is indeed installed */ > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > + ACPI_GPE_DISPATCH_HANDLER) && > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > Status = AE_NOT_EXIST; > goto UnlockAndExit; > @@ -1094,6 +1200,7 @@ AcpiRemoveGpeHandler ( > /* Remove the handler */ > > Handler = GpeEventInfo->Dispatch.Handler; > + GpeEventInfo->Dispatch.Handler = NULL; > > /* Restore Method node (if any), set dispatch flags */ > > @@ -1107,8 +1214,10 @@ AcpiRemoveGpeHandler ( > * enabled, it should be enabled at this point to restore the > * post-initialization configuration. > */ > - if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) || > - (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) && > + if (((ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_METHOD) || > + (ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_NOTIFY)) && > Handler->OriginallyEnabled) > { > (void) AcpiEvAddGpeReference (GpeEventInfo); > diff --git a/src/acpica/source/components/events/evxfevnt.c b/src/acpica/source/components/events/evxfevnt.c > index caa3810..426a0be 100644 > --- a/src/acpica/source/components/events/evxfevnt.c > +++ b/src/acpica/source/components/events/evxfevnt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxfgpe.c b/src/acpica/source/components/events/evxfgpe.c > index 5da1775..f4f0da1 100644 > --- a/src/acpica/source/components/events/evxfgpe.c > +++ b/src/acpica/source/components/events/evxfgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -219,7 +219,7 @@ AcpiEnableGpe ( > GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber); > if (GpeEventInfo) > { > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > ACPI_GPE_DISPATCH_NONE) > { > Status = AcpiEvAddGpeReference (GpeEventInfo); > @@ -293,12 +293,21 @@ ACPI_EXPORT_SYMBOL (AcpiDisableGpe) > * RETURN: Status > * > * DESCRIPTION: Enable or disable an individual GPE. This function bypasses > - * the reference count mechanism used in the AcpiEnableGpe and > - * AcpiDisableGpe interfaces -- and should be used with care. > - * > - * Note: Typically used to disable a runtime GPE for short period of time, > - * then re-enable it, without disturbing the existing reference counts. This > - * is useful, for example, in the Embedded Controller (EC) driver. > + * the reference count mechanism used in the AcpiEnableGpe(), > + * AcpiDisableGpe() interfaces. > + * This API is typically used by the GPE raw handler mode driver > + * to switch between the polling mode and the interrupt mode after > + * the driver has enabled the GPE. > + * The APIs should be invoked in this order: > + * AcpiEnableGpe() <- Ensure the reference count > 0 > + * AcpiSetGpe(ACPI_GPE_DISABLE) <- Enter polling mode > + * AcpiSetGpe(ACPI_GPE_ENABLE) <- Leave polling mode > + * AcpiDisableGpe() <- Decrease the reference count > + * > + * Note: If a GPE is shared by 2 silicon components, then both the drivers > + * should support GPE polling mode or disabling the GPE for long period > + * for one driver may break the other. So use it with care since all > + * firmware _Lxx/_Exx handlers currently rely on the GPE interrupt mode. > * > ******************************************************************************/ > > @@ -333,7 +342,7 @@ AcpiSetGpe ( > { > case ACPI_GPE_ENABLE: > > - Status = AcpiEvEnableGpe (GpeEventInfo); > + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); > break; > > case ACPI_GPE_DISABLE: > @@ -502,7 +511,7 @@ AcpiSetupGpeForWake ( > * known as an "implicit notify". Note: The GPE is assumed to be > * level-triggered (for windows compatibility). > */ > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NONE) > { > /* > @@ -517,7 +526,7 @@ AcpiSetupGpeForWake ( > * If we already have an implicit notify on this GPE, add > * this device to the notify list. > */ > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NOTIFY) > { > /* Ensure that the device is not already in the list */ > @@ -874,6 +883,44 @@ AcpiEnableAllRuntimeGpes ( > ACPI_EXPORT_SYMBOL (AcpiEnableAllRuntimeGpes) > > > +/****************************************************************************** > + * > + * FUNCTION: AcpiEnableAllWakeupGpes > + * > + * PARAMETERS: None > + * > + * RETURN: Status > + * > + * DESCRIPTION: Enable all "wakeup" GPEs and disable all of the other GPEs, in > + * all GPE blocks. > + * > + ******************************************************************************/ > + > +ACPI_STATUS > +AcpiEnableAllWakeupGpes ( > + void) > +{ > + ACPI_STATUS Status; > + > + > + ACPI_FUNCTION_TRACE (AcpiEnableAllWakeupGpes); > + > + > + Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); > + if (ACPI_FAILURE (Status)) > + { > + return_ACPI_STATUS (Status); > + } > + > + Status = AcpiHwEnableAllWakeupGpes (); > + (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS); > + > + return_ACPI_STATUS (Status); > +} > + > +ACPI_EXPORT_SYMBOL (AcpiEnableAllWakeupGpes) > + > + > /******************************************************************************* > * > * FUNCTION: AcpiInstallGpeBlock > diff --git a/src/acpica/source/components/events/evxfregn.c b/src/acpica/source/components/events/evxfregn.c > index a305e3f..e220676 100644 > --- a/src/acpica/source/components/events/evxfregn.c > +++ b/src/acpica/source/components/events/evxfregn.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exconfig.c b/src/acpica/source/components/executer/exconfig.c > index 2fd6e36..c311a69 100644 > --- a/src/acpica/source/components/executer/exconfig.c > +++ b/src/acpica/source/components/executer/exconfig.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exconvrt.c b/src/acpica/source/components/executer/exconvrt.c > index 00f0310..1cf54e2 100644 > --- a/src/acpica/source/components/executer/exconvrt.c > +++ b/src/acpica/source/components/executer/exconvrt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/excreate.c b/src/acpica/source/components/executer/excreate.c > index 90a389a..90a3632 100644 > --- a/src/acpica/source/components/executer/excreate.c > +++ b/src/acpica/source/components/executer/excreate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exdebug.c b/src/acpica/source/components/executer/exdebug.c > index eb1daad..64fef55 100644 > --- a/src/acpica/source/components/executer/exdebug.c > +++ b/src/acpica/source/components/executer/exdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exdump.c b/src/acpica/source/components/executer/exdump.c > index 4d6a186..8d318a0 100644 > --- a/src/acpica/source/components/executer/exdump.c > +++ b/src/acpica/source/components/executer/exdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exfield.c b/src/acpica/source/components/executer/exfield.c > index e33f82c..3083985 100644 > --- a/src/acpica/source/components/executer/exfield.c > +++ b/src/acpica/source/components/executer/exfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exfldio.c b/src/acpica/source/components/executer/exfldio.c > index e29ae66..3e6b18f 100644 > --- a/src/acpica/source/components/executer/exfldio.c > +++ b/src/acpica/source/components/executer/exfldio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exmisc.c b/src/acpica/source/components/executer/exmisc.c > index 94053d5..d92b271 100644 > --- a/src/acpica/source/components/executer/exmisc.c > +++ b/src/acpica/source/components/executer/exmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exmutex.c b/src/acpica/source/components/executer/exmutex.c > index 962b9c1..c688a50 100644 > --- a/src/acpica/source/components/executer/exmutex.c > +++ b/src/acpica/source/components/executer/exmutex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exnames.c b/src/acpica/source/components/executer/exnames.c > index 67f7930..b402d3b 100644 > --- a/src/acpica/source/components/executer/exnames.c > +++ b/src/acpica/source/components/executer/exnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg1.c b/src/acpica/source/components/executer/exoparg1.c > index 8ce7610..c7addbd 100644 > --- a/src/acpica/source/components/executer/exoparg1.c > +++ b/src/acpica/source/components/executer/exoparg1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg2.c b/src/acpica/source/components/executer/exoparg2.c > index 2519dca..399b259 100644 > --- a/src/acpica/source/components/executer/exoparg2.c > +++ b/src/acpica/source/components/executer/exoparg2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg3.c b/src/acpica/source/components/executer/exoparg3.c > index 4e6842b..507720f 100644 > --- a/src/acpica/source/components/executer/exoparg3.c > +++ b/src/acpica/source/components/executer/exoparg3.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg6.c b/src/acpica/source/components/executer/exoparg6.c > index 9cd26e0..a7d76d6 100644 > --- a/src/acpica/source/components/executer/exoparg6.c > +++ b/src/acpica/source/components/executer/exoparg6.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exprep.c b/src/acpica/source/components/executer/exprep.c > index dc764bb..d84ccc3 100644 > --- a/src/acpica/source/components/executer/exprep.c > +++ b/src/acpica/source/components/executer/exprep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exregion.c b/src/acpica/source/components/executer/exregion.c > index 544412e..5b66ffa 100644 > --- a/src/acpica/source/components/executer/exregion.c > +++ b/src/acpica/source/components/executer/exregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresnte.c b/src/acpica/source/components/executer/exresnte.c > index 7640a01..d72ec55 100644 > --- a/src/acpica/source/components/executer/exresnte.c > +++ b/src/acpica/source/components/executer/exresnte.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresolv.c b/src/acpica/source/components/executer/exresolv.c > index 35bb6bb..e874342 100644 > --- a/src/acpica/source/components/executer/exresolv.c > +++ b/src/acpica/source/components/executer/exresolv.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresop.c b/src/acpica/source/components/executer/exresop.c > index 6dc28aa..fab4993 100644 > --- a/src/acpica/source/components/executer/exresop.c > +++ b/src/acpica/source/components/executer/exresop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstore.c b/src/acpica/source/components/executer/exstore.c > index cf47621..47c212d 100644 > --- a/src/acpica/source/components/executer/exstore.c > +++ b/src/acpica/source/components/executer/exstore.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstoren.c b/src/acpica/source/components/executer/exstoren.c > index 82944c5..c1879b4 100644 > --- a/src/acpica/source/components/executer/exstoren.c > +++ b/src/acpica/source/components/executer/exstoren.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstorob.c b/src/acpica/source/components/executer/exstorob.c > index f36e9fc..48c3440 100644 > --- a/src/acpica/source/components/executer/exstorob.c > +++ b/src/acpica/source/components/executer/exstorob.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exsystem.c b/src/acpica/source/components/executer/exsystem.c > index 0bce72a..49ec2e9 100644 > --- a/src/acpica/source/components/executer/exsystem.c > +++ b/src/acpica/source/components/executer/exsystem.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exutils.c b/src/acpica/source/components/executer/exutils.c > index 63bfb84..b432cba 100644 > --- a/src/acpica/source/components/executer/exutils.c > +++ b/src/acpica/source/components/executer/exutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwacpi.c b/src/acpica/source/components/hardware/hwacpi.c > index 0dff876..0530383 100644 > --- a/src/acpica/source/components/hardware/hwacpi.c > +++ b/src/acpica/source/components/hardware/hwacpi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwesleep.c b/src/acpica/source/components/hardware/hwesleep.c > index 0dab77a..ba8acdc 100644 > --- a/src/acpica/source/components/hardware/hwesleep.c > +++ b/src/acpica/source/components/hardware/hwesleep.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwgpe.c b/src/acpica/source/components/hardware/hwgpe.c > index 0125685..d39b7ac 100644 > --- a/src/acpica/source/components/hardware/hwgpe.c > +++ b/src/acpica/source/components/hardware/hwgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -130,6 +130,11 @@ AcpiHwEnableWakeupGpeBlock ( > ACPI_GPE_BLOCK_INFO *GpeBlock, > void *Context); > > +static ACPI_STATUS > +AcpiHwGpeEnableWrite ( > + UINT8 EnableMask, > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo); > + > > /****************************************************************************** > * > @@ -200,13 +205,13 @@ AcpiHwLowSetGpe ( > /* Set or clear just the bit that corresponds to this GPE */ > > RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); > - switch (Action) > + switch (Action & ~ACPI_GPE_SAVE_MASK) > { > case ACPI_GPE_CONDITIONAL_ENABLE: > > - /* Only enable if the EnableForRun bit is set */ > + /* Only enable if the corresponding EnableMask bit is set */ > > - if (!(RegisterBit & GpeRegisterInfo->EnableForRun)) > + if (!(RegisterBit & GpeRegisterInfo->EnableMask)) > { > return (AE_BAD_PARAMETER); > } > @@ -232,6 +237,10 @@ AcpiHwLowSetGpe ( > /* Write the updated enable mask */ > > Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress); > + if (ACPI_SUCCESS (Status) && (Action & ACPI_GPE_SAVE_MASK)) > + { > + GpeRegisterInfo->EnableMask = (UINT8) EnableMask; > + } > return (Status); > } > > @@ -315,7 +324,7 @@ AcpiHwGetGpeStatus ( > > /* GPE currently handled? */ > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > ACPI_GPE_DISPATCH_NONE) > { > LocalEventStatus |= ACPI_EVENT_FLAG_HAS_HANDLER; > @@ -365,6 +374,37 @@ AcpiHwGetGpeStatus ( > > /****************************************************************************** > * > + * FUNCTION: AcpiHwGpeEnableWrite > + * > + * PARAMETERS: EnableMask - Bit mask to write to the GPE register > + * GpeRegisterInfo - Gpe Register info > + * > + * RETURN: Status > + * > + * DESCRIPTION: Write the enable mask byte to the given GPE register. > + * > + ******************************************************************************/ > + > +static ACPI_STATUS > +AcpiHwGpeEnableWrite ( > + UINT8 EnableMask, > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo) > +{ > + ACPI_STATUS Status; > + > + > + Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress); > + if (ACPI_SUCCESS (Status)) > + { > + GpeRegisterInfo->EnableMask = EnableMask; > + } > + > + return (Status); > +} > + > + > +/****************************************************************************** > + * > * FUNCTION: AcpiHwDisableGpeBlock > * > * PARAMETERS: GpeXruptInfo - GPE Interrupt info > @@ -392,7 +432,7 @@ AcpiHwDisableGpeBlock ( > { > /* Disable all GPEs in this register */ > > - Status = AcpiHwWrite (0x00, &GpeBlock->RegisterInfo[i].EnableAddress); > + Status = AcpiHwGpeEnableWrite (0x00, &GpeBlock->RegisterInfo[i]); > if (ACPI_FAILURE (Status)) > { > return (Status); > @@ -465,6 +505,7 @@ AcpiHwEnableRuntimeGpeBlock ( > { > UINT32 i; > ACPI_STATUS Status; > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; > > > /* NOTE: assumes that all GPEs are currently disabled */ > @@ -473,15 +514,16 @@ AcpiHwEnableRuntimeGpeBlock ( > > for (i = 0; i < GpeBlock->RegisterCount; i++) > { > - if (!GpeBlock->RegisterInfo[i].EnableForRun) > + GpeRegisterInfo = &GpeBlock->RegisterInfo[i]; > + if (!GpeRegisterInfo->EnableForRun) > { > continue; > } > > /* Enable all "runtime" GPEs in this register */ > > - Status = AcpiHwWrite (GpeBlock->RegisterInfo[i].EnableForRun, > - &GpeBlock->RegisterInfo[i].EnableAddress); > + Status = AcpiHwGpeEnableWrite (GpeRegisterInfo->EnableForRun, > + GpeRegisterInfo); > if (ACPI_FAILURE (Status)) > { > return (Status); > @@ -514,21 +556,21 @@ AcpiHwEnableWakeupGpeBlock ( > { > UINT32 i; > ACPI_STATUS Status; > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; > > > /* Examine each GPE Register within the block */ > > for (i = 0; i < GpeBlock->RegisterCount; i++) > { > - if (!GpeBlock->RegisterInfo[i].EnableForWake) > - { > - continue; > - } > - > - /* Enable all "wake" GPEs in this register */ > - > - Status = AcpiHwWrite (GpeBlock->RegisterInfo[i].EnableForWake, > - &GpeBlock->RegisterInfo[i].EnableAddress); > + GpeRegisterInfo = &GpeBlock->RegisterInfo[i]; > + > + /* > + * Enable all "wake" GPEs in this register and disable the > + * remaining ones. > + */ > + Status = AcpiHwGpeEnableWrite (GpeRegisterInfo->EnableForWake, > + GpeRegisterInfo); > if (ACPI_FAILURE (Status)) > { > return (Status); > diff --git a/src/acpica/source/components/hardware/hwpci.c b/src/acpica/source/components/hardware/hwpci.c > index 4470b5c..da7674c 100644 > --- a/src/acpica/source/components/hardware/hwpci.c > +++ b/src/acpica/source/components/hardware/hwpci.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwregs.c b/src/acpica/source/components/hardware/hwregs.c > index 7df29fd..492833e 100644 > --- a/src/acpica/source/components/hardware/hwregs.c > +++ b/src/acpica/source/components/hardware/hwregs.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwsleep.c b/src/acpica/source/components/hardware/hwsleep.c > index 4501598..6438ea7 100644 > --- a/src/acpica/source/components/hardware/hwsleep.c > +++ b/src/acpica/source/components/hardware/hwsleep.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwvalid.c b/src/acpica/source/components/hardware/hwvalid.c > index dbbb3bb..410c42c 100644 > --- a/src/acpica/source/components/hardware/hwvalid.c > +++ b/src/acpica/source/components/hardware/hwvalid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwxface.c b/src/acpica/source/components/hardware/hwxface.c > index 4687ae1..12c4ffb 100644 > --- a/src/acpica/source/components/hardware/hwxface.c > +++ b/src/acpica/source/components/hardware/hwxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwxfsleep.c b/src/acpica/source/components/hardware/hwxfsleep.c > index db64da6..2c7066b 100644 > --- a/src/acpica/source/components/hardware/hwxfsleep.c > +++ b/src/acpica/source/components/hardware/hwxfsleep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsaccess.c b/src/acpica/source/components/namespace/nsaccess.c > index 37f6913..58d56e5 100644 > --- a/src/acpica/source/components/namespace/nsaccess.c > +++ b/src/acpica/source/components/namespace/nsaccess.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsalloc.c b/src/acpica/source/components/namespace/nsalloc.c > index c4a08cd..293bf26 100644 > --- a/src/acpica/source/components/namespace/nsalloc.c > +++ b/src/acpica/source/components/namespace/nsalloc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsarguments.c b/src/acpica/source/components/namespace/nsarguments.c > index 792cd59..08e0716 100644 > --- a/src/acpica/source/components/namespace/nsarguments.c > +++ b/src/acpica/source/components/namespace/nsarguments.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsconvert.c b/src/acpica/source/components/namespace/nsconvert.c > index 7226917..be20f43 100644 > --- a/src/acpica/source/components/namespace/nsconvert.c > +++ b/src/acpica/source/components/namespace/nsconvert.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsdump.c b/src/acpica/source/components/namespace/nsdump.c > index 5631cab..3d0e596 100644 > --- a/src/acpica/source/components/namespace/nsdump.c > +++ b/src/acpica/source/components/namespace/nsdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsdumpdv.c b/src/acpica/source/components/namespace/nsdumpdv.c > index 8510eb2..8e570d1 100644 > --- a/src/acpica/source/components/namespace/nsdumpdv.c > +++ b/src/acpica/source/components/namespace/nsdumpdv.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nseval.c b/src/acpica/source/components/namespace/nseval.c > index 2f32e5e..b6d662b 100644 > --- a/src/acpica/source/components/namespace/nseval.c > +++ b/src/acpica/source/components/namespace/nseval.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsinit.c b/src/acpica/source/components/namespace/nsinit.c > index 2c4db99..279b409 100644 > --- a/src/acpica/source/components/namespace/nsinit.c > +++ b/src/acpica/source/components/namespace/nsinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsload.c b/src/acpica/source/components/namespace/nsload.c > index e15e6a4..590be03 100644 > --- a/src/acpica/source/components/namespace/nsload.c > +++ b/src/acpica/source/components/namespace/nsload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsnames.c b/src/acpica/source/components/namespace/nsnames.c > index 2dc5d7b..2c7d9b9 100644 > --- a/src/acpica/source/components/namespace/nsnames.c > +++ b/src/acpica/source/components/namespace/nsnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsobject.c b/src/acpica/source/components/namespace/nsobject.c > index 7a0d8ef..50b1d65 100644 > --- a/src/acpica/source/components/namespace/nsobject.c > +++ b/src/acpica/source/components/namespace/nsobject.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsparse.c b/src/acpica/source/components/namespace/nsparse.c > index f880207..da137e8 100644 > --- a/src/acpica/source/components/namespace/nsparse.c > +++ b/src/acpica/source/components/namespace/nsparse.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nspredef.c b/src/acpica/source/components/namespace/nspredef.c > index 820710d..8a522d2 100644 > --- a/src/acpica/source/components/namespace/nspredef.c > +++ b/src/acpica/source/components/namespace/nspredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsprepkg.c b/src/acpica/source/components/namespace/nsprepkg.c > index b44d12b..085ccd2 100644 > --- a/src/acpica/source/components/namespace/nsprepkg.c > +++ b/src/acpica/source/components/namespace/nsprepkg.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsrepair.c b/src/acpica/source/components/namespace/nsrepair.c > index cf3c411..736933a 100644 > --- a/src/acpica/source/components/namespace/nsrepair.c > +++ b/src/acpica/source/components/namespace/nsrepair.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsrepair2.c b/src/acpica/source/components/namespace/nsrepair2.c > index ffba457..3300819 100644 > --- a/src/acpica/source/components/namespace/nsrepair2.c > +++ b/src/acpica/source/components/namespace/nsrepair2.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nssearch.c b/src/acpica/source/components/namespace/nssearch.c > index 9169866..81cac95 100644 > --- a/src/acpica/source/components/namespace/nssearch.c > +++ b/src/acpica/source/components/namespace/nssearch.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsutils.c b/src/acpica/source/components/namespace/nsutils.c > index b237390..220c447 100644 > --- a/src/acpica/source/components/namespace/nsutils.c > +++ b/src/acpica/source/components/namespace/nsutils.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nswalk.c b/src/acpica/source/components/namespace/nswalk.c > index bcbed65..aa23760 100644 > --- a/src/acpica/source/components/namespace/nswalk.c > +++ b/src/acpica/source/components/namespace/nswalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfeval.c b/src/acpica/source/components/namespace/nsxfeval.c > index 5425a54..7e23365 100644 > --- a/src/acpica/source/components/namespace/nsxfeval.c > +++ b/src/acpica/source/components/namespace/nsxfeval.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfname.c b/src/acpica/source/components/namespace/nsxfname.c > index f45a2bd..4c71e37 100644 > --- a/src/acpica/source/components/namespace/nsxfname.c > +++ b/src/acpica/source/components/namespace/nsxfname.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfobj.c b/src/acpica/source/components/namespace/nsxfobj.c > index 763e044..2ca409f 100644 > --- a/src/acpica/source/components/namespace/nsxfobj.c > +++ b/src/acpica/source/components/namespace/nsxfobj.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psargs.c b/src/acpica/source/components/parser/psargs.c > index ad86a1f..2453ab1 100644 > --- a/src/acpica/source/components/parser/psargs.c > +++ b/src/acpica/source/components/parser/psargs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psloop.c b/src/acpica/source/components/parser/psloop.c > index cf52d5f..d75ac83 100644 > --- a/src/acpica/source/components/parser/psloop.c > +++ b/src/acpica/source/components/parser/psloop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psobject.c b/src/acpica/source/components/parser/psobject.c > index 705aa6c..a236ff5 100644 > --- a/src/acpica/source/components/parser/psobject.c > +++ b/src/acpica/source/components/parser/psobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psopcode.c b/src/acpica/source/components/parser/psopcode.c > index 40243a5..1f94916 100644 > --- a/src/acpica/source/components/parser/psopcode.c > +++ b/src/acpica/source/components/parser/psopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psopinfo.c b/src/acpica/source/components/parser/psopinfo.c > index 198d9a3..a059b74 100644 > --- a/src/acpica/source/components/parser/psopinfo.c > +++ b/src/acpica/source/components/parser/psopinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psparse.c b/src/acpica/source/components/parser/psparse.c > index afbcc62..71c3fa0 100644 > --- a/src/acpica/source/components/parser/psparse.c > +++ b/src/acpica/source/components/parser/psparse.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psscope.c b/src/acpica/source/components/parser/psscope.c > index 3c0fb90..f44ea48 100644 > --- a/src/acpica/source/components/parser/psscope.c > +++ b/src/acpica/source/components/parser/psscope.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/pstree.c b/src/acpica/source/components/parser/pstree.c > index fc2477b..392204e 100644 > --- a/src/acpica/source/components/parser/pstree.c > +++ b/src/acpica/source/components/parser/pstree.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psutils.c b/src/acpica/source/components/parser/psutils.c > index bce4010..328ff5b 100644 > --- a/src/acpica/source/components/parser/psutils.c > +++ b/src/acpica/source/components/parser/psutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/pswalk.c b/src/acpica/source/components/parser/pswalk.c > index 1605428..a447970 100644 > --- a/src/acpica/source/components/parser/pswalk.c > +++ b/src/acpica/source/components/parser/pswalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psxface.c b/src/acpica/source/components/parser/psxface.c > index 8930af0..09833b6 100644 > --- a/src/acpica/source/components/parser/psxface.c > +++ b/src/acpica/source/components/parser/psxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsaddr.c b/src/acpica/source/components/resources/rsaddr.c > index 9c7f2aa..583f3ef 100644 > --- a/src/acpica/source/components/resources/rsaddr.c > +++ b/src/acpica/source/components/resources/rsaddr.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rscalc.c b/src/acpica/source/components/resources/rscalc.c > index 2b6a4f9..33a438e 100644 > --- a/src/acpica/source/components/resources/rscalc.c > +++ b/src/acpica/source/components/resources/rscalc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rscreate.c b/src/acpica/source/components/resources/rscreate.c > index deaaba5..dd430ef 100644 > --- a/src/acpica/source/components/resources/rscreate.c > +++ b/src/acpica/source/components/resources/rscreate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsdump.c b/src/acpica/source/components/resources/rsdump.c > index 34b4abf..0d3d2b7 100644 > --- a/src/acpica/source/components/resources/rsdump.c > +++ b/src/acpica/source/components/resources/rsdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsdumpinfo.c b/src/acpica/source/components/resources/rsdumpinfo.c > index bb41c71..c57f2ca 100644 > --- a/src/acpica/source/components/resources/rsdumpinfo.c > +++ b/src/acpica/source/components/resources/rsdumpinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsinfo.c b/src/acpica/source/components/resources/rsinfo.c > index da2cb5d..bf19c39 100644 > --- a/src/acpica/source/components/resources/rsinfo.c > +++ b/src/acpica/source/components/resources/rsinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsio.c b/src/acpica/source/components/resources/rsio.c > index a641c0c..8f39d14 100644 > --- a/src/acpica/source/components/resources/rsio.c > +++ b/src/acpica/source/components/resources/rsio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsirq.c b/src/acpica/source/components/resources/rsirq.c > index 33f400f..0ce5dfd 100644 > --- a/src/acpica/source/components/resources/rsirq.c > +++ b/src/acpica/source/components/resources/rsirq.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rslist.c b/src/acpica/source/components/resources/rslist.c > index ea2d1d5..4fda294 100644 > --- a/src/acpica/source/components/resources/rslist.c > +++ b/src/acpica/source/components/resources/rslist.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsmemory.c b/src/acpica/source/components/resources/rsmemory.c > index ae94a1f..07d7225 100644 > --- a/src/acpica/source/components/resources/rsmemory.c > +++ b/src/acpica/source/components/resources/rsmemory.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsmisc.c b/src/acpica/source/components/resources/rsmisc.c > index 8de7ca5..7871715 100644 > --- a/src/acpica/source/components/resources/rsmisc.c > +++ b/src/acpica/source/components/resources/rsmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsserial.c b/src/acpica/source/components/resources/rsserial.c > index b71dcad..acec6fb 100644 > --- a/src/acpica/source/components/resources/rsserial.c > +++ b/src/acpica/source/components/resources/rsserial.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsutils.c b/src/acpica/source/components/resources/rsutils.c > index 42ff2a3..55445b0 100644 > --- a/src/acpica/source/components/resources/rsutils.c > +++ b/src/acpica/source/components/resources/rsutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsxface.c b/src/acpica/source/components/resources/rsxface.c > index 9e9af3a..86b35a6 100644 > --- a/src/acpica/source/components/resources/rsxface.c > +++ b/src/acpica/source/components/resources/rsxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbdata.c b/src/acpica/source/components/tables/tbdata.c > index 10924ab..ee352c8 100644 > --- a/src/acpica/source/components/tables/tbdata.c > +++ b/src/acpica/source/components/tables/tbdata.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbfadt.c b/src/acpica/source/components/tables/tbfadt.c > index f3f27cd..93d76da 100644 > --- a/src/acpica/source/components/tables/tbfadt.c > +++ b/src/acpica/source/components/tables/tbfadt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbfind.c b/src/acpica/source/components/tables/tbfind.c > index 56b4e8a..c7acd1c 100644 > --- a/src/acpica/source/components/tables/tbfind.c > +++ b/src/acpica/source/components/tables/tbfind.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbinstal.c b/src/acpica/source/components/tables/tbinstal.c > index 38de06c..88e10ba 100644 > --- a/src/acpica/source/components/tables/tbinstal.c > +++ b/src/acpica/source/components/tables/tbinstal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbprint.c b/src/acpica/source/components/tables/tbprint.c > index d4bba45..90a1a52 100644 > --- a/src/acpica/source/components/tables/tbprint.c > +++ b/src/acpica/source/components/tables/tbprint.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbutils.c b/src/acpica/source/components/tables/tbutils.c > index ec1843c..b2fdb91 100644 > --- a/src/acpica/source/components/tables/tbutils.c > +++ b/src/acpica/source/components/tables/tbutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxface.c b/src/acpica/source/components/tables/tbxface.c > index df4e402..d2351d3 100644 > --- a/src/acpica/source/components/tables/tbxface.c > +++ b/src/acpica/source/components/tables/tbxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxfload.c b/src/acpica/source/components/tables/tbxfload.c > index 88834db..83f6420 100644 > --- a/src/acpica/source/components/tables/tbxfload.c > +++ b/src/acpica/source/components/tables/tbxfload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxfroot.c b/src/acpica/source/components/tables/tbxfroot.c > index 8354e94..8c6be13 100644 > --- a/src/acpica/source/components/tables/tbxfroot.c > +++ b/src/acpica/source/components/tables/tbxfroot.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utaddress.c b/src/acpica/source/components/utilities/utaddress.c > index 864c0c3..ddfe826 100644 > --- a/src/acpica/source/components/utilities/utaddress.c > +++ b/src/acpica/source/components/utilities/utaddress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utalloc.c b/src/acpica/source/components/utilities/utalloc.c > index dd7c8d6..0c8c928 100644 > --- a/src/acpica/source/components/utilities/utalloc.c > +++ b/src/acpica/source/components/utilities/utalloc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utbuffer.c b/src/acpica/source/components/utilities/utbuffer.c > index cc2d769..d4a65b4 100644 > --- a/src/acpica/source/components/utilities/utbuffer.c > +++ b/src/acpica/source/components/utilities/utbuffer.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utcache.c b/src/acpica/source/components/utilities/utcache.c > index cb8116e..25c8e0e 100644 > --- a/src/acpica/source/components/utilities/utcache.c > +++ b/src/acpica/source/components/utilities/utcache.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utcopy.c b/src/acpica/source/components/utilities/utcopy.c > index ea70d13..7dfc104 100644 > --- a/src/acpica/source/components/utilities/utcopy.c > +++ b/src/acpica/source/components/utilities/utcopy.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdebug.c b/src/acpica/source/components/utilities/utdebug.c > index 5c86223..60c6067 100644 > --- a/src/acpica/source/components/utilities/utdebug.c > +++ b/src/acpica/source/components/utilities/utdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdecode.c b/src/acpica/source/components/utilities/utdecode.c > index fcd6393..eb0dc9f 100644 > --- a/src/acpica/source/components/utilities/utdecode.c > +++ b/src/acpica/source/components/utilities/utdecode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdelete.c b/src/acpica/source/components/utilities/utdelete.c > index e6825ca..80b8f98 100644 > --- a/src/acpica/source/components/utilities/utdelete.c > +++ b/src/acpica/source/components/utilities/utdelete.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uterror.c b/src/acpica/source/components/utilities/uterror.c > index 5d7dfca..52b9ae0 100644 > --- a/src/acpica/source/components/utilities/uterror.c > +++ b/src/acpica/source/components/utilities/uterror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uteval.c b/src/acpica/source/components/utilities/uteval.c > index 00f1483..dd754c0 100644 > --- a/src/acpica/source/components/utilities/uteval.c > +++ b/src/acpica/source/components/utilities/uteval.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utexcep.c b/src/acpica/source/components/utilities/utexcep.c > index 2c046c4..dd63a12 100644 > --- a/src/acpica/source/components/utilities/utexcep.c > +++ b/src/acpica/source/components/utilities/utexcep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utfileio.c b/src/acpica/source/components/utilities/utfileio.c > index 956f300..e24e81f 100644 > --- a/src/acpica/source/components/utilities/utfileio.c > +++ b/src/acpica/source/components/utilities/utfileio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utglobal.c b/src/acpica/source/components/utilities/utglobal.c > index 34438c8..3f09d56 100644 > --- a/src/acpica/source/components/utilities/utglobal.c > +++ b/src/acpica/source/components/utilities/utglobal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uthex.c b/src/acpica/source/components/utilities/uthex.c > index 80ad2ba..500ab40 100644 > --- a/src/acpica/source/components/utilities/uthex.c > +++ b/src/acpica/source/components/utilities/uthex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utids.c b/src/acpica/source/components/utilities/utids.c > index 5f15f62..f611997 100644 > --- a/src/acpica/source/components/utilities/utids.c > +++ b/src/acpica/source/components/utilities/utids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utinit.c b/src/acpica/source/components/utilities/utinit.c > index 7c0b67b..6f701ad 100644 > --- a/src/acpica/source/components/utilities/utinit.c > +++ b/src/acpica/source/components/utilities/utinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utlock.c b/src/acpica/source/components/utilities/utlock.c > index 1d7dadc..7ce13ef 100644 > --- a/src/acpica/source/components/utilities/utlock.c > +++ b/src/acpica/source/components/utilities/utlock.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmath.c b/src/acpica/source/components/utilities/utmath.c > index 95a9d72..dafba6d 100644 > --- a/src/acpica/source/components/utilities/utmath.c > +++ b/src/acpica/source/components/utilities/utmath.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmisc.c b/src/acpica/source/components/utilities/utmisc.c > index 5e86e0a..30d23d8 100644 > --- a/src/acpica/source/components/utilities/utmisc.c > +++ b/src/acpica/source/components/utilities/utmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmutex.c b/src/acpica/source/components/utilities/utmutex.c > index 1537422..f5b864f 100644 > --- a/src/acpica/source/components/utilities/utmutex.c > +++ b/src/acpica/source/components/utilities/utmutex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utobject.c b/src/acpica/source/components/utilities/utobject.c > index 4c64061..fb4efaf 100644 > --- a/src/acpica/source/components/utilities/utobject.c > +++ b/src/acpica/source/components/utilities/utobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utosi.c b/src/acpica/source/components/utilities/utosi.c > index 3b49ded..e578d2f 100644 > --- a/src/acpica/source/components/utilities/utosi.c > +++ b/src/acpica/source/components/utilities/utosi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utownerid.c b/src/acpica/source/components/utilities/utownerid.c > index 1ae1398..bf391e1 100644 > --- a/src/acpica/source/components/utilities/utownerid.c > +++ b/src/acpica/source/components/utilities/utownerid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utpredef.c b/src/acpica/source/components/utilities/utpredef.c > index ab275ee..19561be 100644 > --- a/src/acpica/source/components/utilities/utpredef.c > +++ b/src/acpica/source/components/utilities/utpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utprint.c b/src/acpica/source/components/utilities/utprint.c > index 543bad8..50082f3 100644 > --- a/src/acpica/source/components/utilities/utprint.c > +++ b/src/acpica/source/components/utilities/utprint.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utresrc.c b/src/acpica/source/components/utilities/utresrc.c > index 3569fcf..44a4c66 100644 > --- a/src/acpica/source/components/utilities/utresrc.c > +++ b/src/acpica/source/components/utilities/utresrc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstate.c b/src/acpica/source/components/utilities/utstate.c > index cf96d8e..53aabbb 100644 > --- a/src/acpica/source/components/utilities/utstate.c > +++ b/src/acpica/source/components/utilities/utstate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstring.c b/src/acpica/source/components/utilities/utstring.c > index 2d218c3..953f304 100644 > --- a/src/acpica/source/components/utilities/utstring.c > +++ b/src/acpica/source/components/utilities/utstring.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uttrack.c b/src/acpica/source/components/utilities/uttrack.c > index 43a993a..284bee0 100644 > --- a/src/acpica/source/components/utilities/uttrack.c > +++ b/src/acpica/source/components/utilities/uttrack.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utuuid.c b/src/acpica/source/components/utilities/utuuid.c > index 65338cc..f0d740d 100644 > --- a/src/acpica/source/components/utilities/utuuid.c > +++ b/src/acpica/source/components/utilities/utuuid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxface.c b/src/acpica/source/components/utilities/utxface.c > index 7f2752c..e01c4d5 100644 > --- a/src/acpica/source/components/utilities/utxface.c > +++ b/src/acpica/source/components/utilities/utxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxferror.c b/src/acpica/source/components/utilities/utxferror.c > index 7b11f4c..bdbab99 100644 > --- a/src/acpica/source/components/utilities/utxferror.c > +++ b/src/acpica/source/components/utilities/utxferror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxfinit.c b/src/acpica/source/components/utilities/utxfinit.c > index a50cc55..91feda7 100644 > --- a/src/acpica/source/components/utilities/utxfinit.c > +++ b/src/acpica/source/components/utilities/utxfinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acapps.h b/src/acpica/source/include/acapps.h > index 6536048..21e71f4 100644 > --- a/src/acpica/source/include/acapps.h > +++ b/src/acpica/source/include/acapps.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -124,7 +124,7 @@ > /* Common info for tool signons */ > > #define ACPICA_NAME "Intel ACPI Component Architecture" > -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2014 Intel Corporation" > +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2015 Intel Corporation" > > #if ACPI_MACHINE_WIDTH == 64 > #define ACPI_WIDTH "-64" > diff --git a/src/acpica/source/include/acbuffer.h b/src/acpica/source/include/acbuffer.h > index 9ccb3ea..bbcff57 100644 > --- a/src/acpica/source/include/acbuffer.h > +++ b/src/acpica/source/include/acbuffer.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/accommon.h b/src/acpica/source/include/accommon.h > index 57735c5..76dc38a 100644 > --- a/src/acpica/source/include/accommon.h > +++ b/src/acpica/source/include/accommon.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acconfig.h b/src/acpica/source/include/acconfig.h > index 3c7a3bd..41fa33d 100644 > --- a/src/acpica/source/include/acconfig.h > +++ b/src/acpica/source/include/acconfig.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdebug.h b/src/acpica/source/include/acdebug.h > index b6105c2..5c32d46 100644 > --- a/src/acpica/source/include/acdebug.h > +++ b/src/acpica/source/include/acdebug.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdisasm.h b/src/acpica/source/include/acdisasm.h > index f0cadef..0394728 100644 > --- a/src/acpica/source/include/acdisasm.h > +++ b/src/acpica/source/include/acdisasm.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdispat.h b/src/acpica/source/include/acdispat.h > index 2a47c52..238cdde 100644 > --- a/src/acpica/source/include/acdispat.h > +++ b/src/acpica/source/include/acdispat.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acevents.h b/src/acpica/source/include/acevents.h > index 8ca726c..467e14f 100644 > --- a/src/acpica/source/include/acevents.h > +++ b/src/acpica/source/include/acevents.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -269,10 +269,6 @@ AcpiEvWalkGpeList ( > ACPI_GPE_CALLBACK GpeWalkCallback, > void *Context); > > -BOOLEAN > -AcpiEvValidGpeEvent ( > - ACPI_GPE_EVENT_INFO *GpeEventInfo); > - > ACPI_STATUS > AcpiEvGetGpeDevice ( > ACPI_GPE_XRUPT_INFO *GpeXruptInfo, > diff --git a/src/acpica/source/include/acexcep.h b/src/acpica/source/include/acexcep.h > index 89d9852..90511b2 100644 > --- a/src/acpica/source/include/acexcep.h > +++ b/src/acpica/source/include/acexcep.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acglobal.h b/src/acpica/source/include/acglobal.h > index 91712b4..fe3ac39 100644 > --- a/src/acpica/source/include/acglobal.h > +++ b/src/acpica/source/include/acglobal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/achware.h b/src/acpica/source/include/achware.h > index ed39a36..6134bda 100644 > --- a/src/acpica/source/include/achware.h > +++ b/src/acpica/source/include/achware.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acinterp.h b/src/acpica/source/include/acinterp.h > index 739a0de..f0edcb1 100644 > --- a/src/acpica/source/include/acinterp.h > +++ b/src/acpica/source/include/acinterp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/aclocal.h b/src/acpica/source/include/aclocal.h > index f55c00a..96f292b 100644 > --- a/src/acpica/source/include/aclocal.h > +++ b/src/acpica/source/include/aclocal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -592,6 +592,7 @@ typedef struct acpi_gpe_register_info > UINT16 BaseGpeNumber; /* Base GPE number for this register */ > UINT8 EnableForWake; /* GPEs to keep enabled when sleeping */ > UINT8 EnableForRun; /* GPEs to keep enabled when running */ > + UINT8 EnableMask; /* Current mask of enabled GPEs */ > > } ACPI_GPE_REGISTER_INFO; > > diff --git a/src/acpica/source/include/acmacros.h b/src/acpica/source/include/acmacros.h > index aa8bd56..ba3d526 100644 > --- a/src/acpica/source/include/acmacros.h > +++ b/src/acpica/source/include/acmacros.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acnames.h b/src/acpica/source/include/acnames.h > index b4fed5e..e87f927 100644 > --- a/src/acpica/source/include/acnames.h > +++ b/src/acpica/source/include/acnames.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acnamesp.h b/src/acpica/source/include/acnamesp.h > index 883e9c4..b66d3e4 100644 > --- a/src/acpica/source/include/acnamesp.h > +++ b/src/acpica/source/include/acnamesp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acobject.h b/src/acpica/source/include/acobject.h > index 6e3d0de..0712e75 100644 > --- a/src/acpica/source/include/acobject.h > +++ b/src/acpica/source/include/acobject.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acopcode.h b/src/acpica/source/include/acopcode.h > index 4ee0497..45423f3 100644 > --- a/src/acpica/source/include/acopcode.h > +++ b/src/acpica/source/include/acopcode.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acoutput.h b/src/acpica/source/include/acoutput.h > index 2311c44..f0cd27a 100644 > --- a/src/acpica/source/include/acoutput.h > +++ b/src/acpica/source/include/acoutput.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acparser.h b/src/acpica/source/include/acparser.h > index 0899969..abbde50 100644 > --- a/src/acpica/source/include/acparser.h > +++ b/src/acpica/source/include/acparser.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpi.h b/src/acpica/source/include/acpi.h > index 3f39932..1d694a5 100644 > --- a/src/acpica/source/include/acpi.h > +++ b/src/acpica/source/include/acpi.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpiosxf.h b/src/acpica/source/include/acpiosxf.h > index 21e6ed9..68d79c7 100644 > --- a/src/acpica/source/include/acpiosxf.h > +++ b/src/acpica/source/include/acpiosxf.h > @@ -10,7 +10,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpixf.h b/src/acpica/source/include/acpixf.h > index 23f965f..fa8f9ab 100644 > --- a/src/acpica/source/include/acpixf.h > +++ b/src/acpica/source/include/acpixf.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -118,7 +118,7 @@ > > /* Current ACPICA subsystem version in YYYYMMDD format */ > > -#define ACPI_CA_VERSION 0x20141107 > +#define ACPI_CA_VERSION 0x20150204 > > #include "acconfig.h" > #include "actypes.h" > @@ -776,6 +776,15 @@ AcpiInstallGpeHandler ( > > ACPI_HW_DEPENDENT_RETURN_STATUS ( > ACPI_STATUS > +AcpiInstallGpeRawHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + ACPI_GPE_HANDLER Address, > + void *Context)) > + > +ACPI_HW_DEPENDENT_RETURN_STATUS ( > +ACPI_STATUS > AcpiRemoveGpeHandler ( > ACPI_HANDLE GpeDevice, > UINT32 GpeNumber, > @@ -960,6 +969,11 @@ AcpiEnableAllRuntimeGpes ( > > ACPI_HW_DEPENDENT_RETURN_STATUS ( > ACPI_STATUS > +AcpiEnableAllWakeupGpes ( > + void)) > + > +ACPI_HW_DEPENDENT_RETURN_STATUS ( > +ACPI_STATUS > AcpiGetGpeDevice ( > UINT32 GpeIndex, > ACPI_HANDLE *GpeDevice)) > diff --git a/src/acpica/source/include/acpredef.h b/src/acpica/source/include/acpredef.h > index 1c1776a..b03f64b 100644 > --- a/src/acpica/source/include/acpredef.h > +++ b/src/acpica/source/include/acpredef.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acresrc.h b/src/acpica/source/include/acresrc.h > index d1366f0..b361120 100644 > --- a/src/acpica/source/include/acresrc.h > +++ b/src/acpica/source/include/acresrc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acrestyp.h b/src/acpica/source/include/acrestyp.h > index 9cf948b..06a4db5 100644 > --- a/src/acpica/source/include/acrestyp.h > +++ b/src/acpica/source/include/acrestyp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acstruct.h b/src/acpica/source/include/acstruct.h > index fd8eab0..5258f0e 100644 > --- a/src/acpica/source/include/acstruct.h > +++ b/src/acpica/source/include/acstruct.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actables.h b/src/acpica/source/include/actables.h > index bb2a4f3..4f82777 100644 > --- a/src/acpica/source/include/actables.h > +++ b/src/acpica/source/include/actables.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl.h b/src/acpica/source/include/actbl.h > index ea9fc58..68bbed4 100644 > --- a/src/acpica/source/include/actbl.h > +++ b/src/acpica/source/include/actbl.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl1.h b/src/acpica/source/include/actbl1.h > index 4c5ffee..2c8b0ed 100644 > --- a/src/acpica/source/include/actbl1.h > +++ b/src/acpica/source/include/actbl1.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl2.h b/src/acpica/source/include/actbl2.h > index 7d62862..0d39c0e 100644 > --- a/src/acpica/source/include/actbl2.h > +++ b/src/acpica/source/include/actbl2.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl3.h b/src/acpica/source/include/actbl3.h > index 4e3b77a..b4ce8af 100644 > --- a/src/acpica/source/include/actbl3.h > +++ b/src/acpica/source/include/actbl3.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actypes.h b/src/acpica/source/include/actypes.h > index 227589e..714edfe 100644 > --- a/src/acpica/source/include/actypes.h > +++ b/src/acpica/source/include/actypes.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -815,11 +815,15 @@ typedef UINT32 ACPI_EVENT_STATUS; > #define ACPI_GPE_ENABLE 0 > #define ACPI_GPE_DISABLE 1 > #define ACPI_GPE_CONDITIONAL_ENABLE 2 > +#define ACPI_GPE_SAVE_MASK 4 > + > +#define ACPI_GPE_ENABLE_SAVE (ACPI_GPE_ENABLE | ACPI_GPE_SAVE_MASK) > +#define ACPI_GPE_DISABLE_SAVE (ACPI_GPE_DISABLE | ACPI_GPE_SAVE_MASK) > > /* > * GPE info flags - Per GPE > * +-------+-+-+---+ > - * | 7:4 |3|2|1:0| > + * | 7:5 |4|3|2:0| > * +-------+-+-+---+ > * | | | | > * | | | +-- Type of dispatch:to method, handler, notify, or none > @@ -831,13 +835,15 @@ typedef UINT32 ACPI_EVENT_STATUS; > #define ACPI_GPE_DISPATCH_METHOD (UINT8) 0x01 > #define ACPI_GPE_DISPATCH_HANDLER (UINT8) 0x02 > #define ACPI_GPE_DISPATCH_NOTIFY (UINT8) 0x03 > -#define ACPI_GPE_DISPATCH_MASK (UINT8) 0x03 > +#define ACPI_GPE_DISPATCH_RAW_HANDLER (UINT8) 0x04 > +#define ACPI_GPE_DISPATCH_MASK (UINT8) 0x07 > +#define ACPI_GPE_DISPATCH_TYPE(flags) ((UINT8) ((flags) & ACPI_GPE_DISPATCH_MASK)) > > -#define ACPI_GPE_LEVEL_TRIGGERED (UINT8) 0x04 > +#define ACPI_GPE_LEVEL_TRIGGERED (UINT8) 0x08 > #define ACPI_GPE_EDGE_TRIGGERED (UINT8) 0x00 > -#define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x04 > +#define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x08 > > -#define ACPI_GPE_CAN_WAKE (UINT8) 0x08 > +#define ACPI_GPE_CAN_WAKE (UINT8) 0x10 > > /* > * Flags for GPE and Lock interfaces > diff --git a/src/acpica/source/include/acutils.h b/src/acpica/source/include/acutils.h > index 2aea248..f8a6783 100644 > --- a/src/acpica/source/include/acutils.h > +++ b/src/acpica/source/include/acutils.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/amlcode.h b/src/acpica/source/include/amlcode.h > index 5eaf30c..2a5dc97 100644 > --- a/src/acpica/source/include/amlcode.h > +++ b/src/acpica/source/include/amlcode.h > @@ -10,7 +10,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/amlresrc.h b/src/acpica/source/include/amlresrc.h > index e54f567..87f52c5 100644 > --- a/src/acpica/source/include/amlresrc.h > +++ b/src/acpica/source/include/amlresrc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acenv.h b/src/acpica/source/include/platform/acenv.h > index 80038c8..c1714ed 100644 > --- a/src/acpica/source/include/platform/acenv.h > +++ b/src/acpica/source/include/platform/acenv.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acenvex.h b/src/acpica/source/include/platform/acenvex.h > index 2c50162..6c59337 100644 > --- a/src/acpica/source/include/platform/acenvex.h > +++ b/src/acpica/source/include/platform/acenvex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acgcc.h b/src/acpica/source/include/platform/acgcc.h > index 9cb3cbe..fde18f4 100644 > --- a/src/acpica/source/include/platform/acgcc.h > +++ b/src/acpica/source/include/platform/acgcc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/aclinux.h b/src/acpica/source/include/platform/aclinux.h > index e7df0b7..668f237 100644 > --- a/src/acpica/source/include/platform/aclinux.h > +++ b/src/acpica/source/include/platform/aclinux.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/aclinuxex.h b/src/acpica/source/include/platform/aclinuxex.h > index d4111a1..52352ce 100644 > --- a/src/acpica/source/include/platform/aclinuxex.h > +++ b/src/acpica/source/include/platform/aclinuxex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/os_specific/service_layers/oslibcfs.c b/src/acpica/source/os_specific/service_layers/oslibcfs.c > index e1ca8be..dadc40d 100644 > --- a/src/acpica/source/os_specific/service_layers/oslibcfs.c > +++ b/src/acpica/source/os_specific/service_layers/oslibcfs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/os_specific/service_layers/osunixxf.c b/src/acpica/source/os_specific/service_layers/osunixxf.c > index ccf0015..c48f581 100644 > --- a/src/acpica/source/os_specific/service_layers/osunixxf.c > +++ b/src/acpica/source/os_specific/service_layers/osunixxf.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aecommon.h b/src/acpica/source/tools/acpiexec/aecommon.h > index 17b1cd0..c0662bf 100644 > --- a/src/acpica/source/tools/acpiexec/aecommon.h > +++ b/src/acpica/source/tools/acpiexec/aecommon.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aehandlers.c b/src/acpica/source/tools/acpiexec/aehandlers.c > index 3773bba..eb1e3ab 100644 > --- a/src/acpica/source/tools/acpiexec/aehandlers.c > +++ b/src/acpica/source/tools/acpiexec/aehandlers.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeinitfile.c b/src/acpica/source/tools/acpiexec/aeinitfile.c > index 64b8a79..0de7b96 100644 > --- a/src/acpica/source/tools/acpiexec/aeinitfile.c > +++ b/src/acpica/source/tools/acpiexec/aeinitfile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeregion.c b/src/acpica/source/tools/acpiexec/aeregion.c > index 084925b..a1b8ea2 100644 > --- a/src/acpica/source/tools/acpiexec/aeregion.c > +++ b/src/acpica/source/tools/acpiexec/aeregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > -- > 2.1.4 > > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
On 02/05/2015 06:23 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Sync with ACPICA version 20150204, for a full set of changes > please refer to: > > https://lists.acpica.org/pipermail/devel/2015-February/000682.html > > Usual testing against my data base of ACPI tables and fwts-test > show no regressions. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpica/source/common/acgetline.c | 2 +- > src/acpica/source/common/adfile.c | 2 +- > src/acpica/source/common/adisasm.c | 33 +++-- > src/acpica/source/common/adwalk.c | 2 +- > src/acpica/source/common/ahids.c | 2 +- > src/acpica/source/common/ahpredef.c | 2 +- > src/acpica/source/common/ahuuids.c | 2 +- > src/acpica/source/common/cmfsize.c | 2 +- > src/acpica/source/common/dmextern.c | 2 +- > src/acpica/source/common/dmrestag.c | 2 +- > src/acpica/source/common/dmtable.c | 2 +- > src/acpica/source/common/dmtbdump.c | 2 +- > src/acpica/source/common/dmtbinfo.c | 2 +- > src/acpica/source/compiler/aslanalyze.c | 2 +- > src/acpica/source/compiler/aslascii.c | 2 +- > src/acpica/source/compiler/aslbtypes.c | 2 +- > src/acpica/source/compiler/aslcodegen.c | 2 +- > src/acpica/source/compiler/aslcompile.c | 7 +- > src/acpica/source/compiler/aslcompiler.h | 2 +- > src/acpica/source/compiler/aslcompiler.l | 2 +- > src/acpica/source/compiler/aslcompiler.y | 2 +- > src/acpica/source/compiler/asldefine.h | 2 +- > src/acpica/source/compiler/aslerror.c | 4 +- > src/acpica/source/compiler/aslfileio.c | 12 +- > src/acpica/source/compiler/aslfiles.c | 35 ++++- > src/acpica/source/compiler/aslfold.c | 2 +- > src/acpica/source/compiler/aslglobal.h | 3 +- > src/acpica/source/compiler/aslhex.c | 2 +- > src/acpica/source/compiler/asllength.c | 2 +- > src/acpica/source/compiler/asllisting.c | 2 +- > src/acpica/source/compiler/asllistsup.c | 2 +- > src/acpica/source/compiler/aslload.c | 2 +- > src/acpica/source/compiler/asllookup.c | 2 +- > src/acpica/source/compiler/aslmain.c | 2 +- > src/acpica/source/compiler/aslmap.c | 2 +- > src/acpica/source/compiler/aslmapoutput.c | 27 +--- > src/acpica/source/compiler/aslmaputils.c | 2 +- > src/acpica/source/compiler/aslmessages.c | 2 +- > src/acpica/source/compiler/aslmessages.h | 2 +- > src/acpica/source/compiler/aslmethod.c | 2 +- > src/acpica/source/compiler/aslnamesp.c | 2 +- > src/acpica/source/compiler/asloffset.c | 2 +- > src/acpica/source/compiler/aslopcodes.c | 2 +- > src/acpica/source/compiler/asloperands.c | 2 +- > src/acpica/source/compiler/aslopt.c | 2 +- > src/acpica/source/compiler/aslparser.y | 2 +- > src/acpica/source/compiler/aslpredef.c | 2 +- > src/acpica/source/compiler/aslprepkg.c | 2 +- > src/acpica/source/compiler/aslprintf.c | 2 +- > src/acpica/source/compiler/aslprune.c | 2 +- > src/acpica/source/compiler/aslresource.c | 2 +- > src/acpica/source/compiler/aslrestype1.c | 2 +- > src/acpica/source/compiler/aslrestype1i.c | 2 +- > src/acpica/source/compiler/aslrestype2.c | 2 +- > src/acpica/source/compiler/aslrestype2d.c | 2 +- > src/acpica/source/compiler/aslrestype2e.c | 2 +- > src/acpica/source/compiler/aslrestype2q.c | 2 +- > src/acpica/source/compiler/aslrestype2s.c | 2 +- > src/acpica/source/compiler/aslrestype2w.c | 2 +- > src/acpica/source/compiler/aslrules.y | 2 +- > src/acpica/source/compiler/aslstartup.c | 3 +- > src/acpica/source/compiler/aslstubs.c | 2 +- > src/acpica/source/compiler/aslsupport.l | 103 ++++++++------ > src/acpica/source/compiler/aslsupport.y | 2 +- > src/acpica/source/compiler/asltokens.y | 2 +- > src/acpica/source/compiler/asltransform.c | 2 +- > src/acpica/source/compiler/asltree.c | 2 +- > src/acpica/source/compiler/asltypes.h | 2 +- > src/acpica/source/compiler/asltypes.y | 2 +- > src/acpica/source/compiler/aslutils.c | 30 +++- > src/acpica/source/compiler/asluuid.c | 2 +- > src/acpica/source/compiler/aslwalks.c | 2 +- > src/acpica/source/compiler/aslxref.c | 2 +- > src/acpica/source/compiler/dtcompile.c | 2 +- > src/acpica/source/compiler/dtcompiler.h | 2 +- > src/acpica/source/compiler/dtexpress.c | 2 +- > src/acpica/source/compiler/dtfield.c | 2 +- > src/acpica/source/compiler/dtio.c | 2 +- > src/acpica/source/compiler/dtparser.l | 2 +- > src/acpica/source/compiler/dtparser.y | 2 +- > src/acpica/source/compiler/dtsubtable.c | 2 +- > src/acpica/source/compiler/dttable.c | 2 +- > src/acpica/source/compiler/dttemplate.c | 2 +- > src/acpica/source/compiler/dttemplate.h | 2 +- > src/acpica/source/compiler/dtutils.c | 2 +- > src/acpica/source/compiler/preprocess.h | 2 +- > src/acpica/source/compiler/prexpress.c | 2 +- > src/acpica/source/compiler/prmacros.c | 2 +- > src/acpica/source/compiler/prparser.l | 2 +- > src/acpica/source/compiler/prparser.y | 2 +- > src/acpica/source/compiler/prscan.c | 2 +- > src/acpica/source/compiler/prutils.c | 2 +- > src/acpica/source/components/debugger/dbcmds.c | 2 +- > src/acpica/source/components/debugger/dbconvert.c | 2 +- > src/acpica/source/components/debugger/dbdisply.c | 14 +- > src/acpica/source/components/debugger/dbexec.c | 2 +- > src/acpica/source/components/debugger/dbfileio.c | 2 +- > src/acpica/source/components/debugger/dbhistry.c | 2 +- > src/acpica/source/components/debugger/dbinput.c | 2 +- > src/acpica/source/components/debugger/dbmethod.c | 2 +- > src/acpica/source/components/debugger/dbnames.c | 2 +- > src/acpica/source/components/debugger/dbstats.c | 2 +- > src/acpica/source/components/debugger/dbtest.c | 2 +- > src/acpica/source/components/debugger/dbutils.c | 2 +- > src/acpica/source/components/debugger/dbxface.c | 2 +- > .../source/components/disassembler/dmbuffer.c | 2 +- > .../source/components/disassembler/dmcstyle.c | 2 +- > .../source/components/disassembler/dmdeferred.c | 2 +- > .../source/components/disassembler/dmnames.c | 2 +- > .../source/components/disassembler/dmobject.c | 2 +- > .../source/components/disassembler/dmopcode.c | 2 +- > .../source/components/disassembler/dmresrc.c | 2 +- > .../source/components/disassembler/dmresrcl.c | 2 +- > .../source/components/disassembler/dmresrcl2.c | 2 +- > .../source/components/disassembler/dmresrcs.c | 2 +- > .../source/components/disassembler/dmutils.c | 2 +- > src/acpica/source/components/disassembler/dmwalk.c | 2 +- > src/acpica/source/components/dispatcher/dsargs.c | 2 +- > .../source/components/dispatcher/dscontrol.c | 2 +- > src/acpica/source/components/dispatcher/dsfield.c | 2 +- > src/acpica/source/components/dispatcher/dsinit.c | 2 +- > src/acpica/source/components/dispatcher/dsmethod.c | 2 +- > src/acpica/source/components/dispatcher/dsmthdat.c | 2 +- > src/acpica/source/components/dispatcher/dsobject.c | 2 +- > src/acpica/source/components/dispatcher/dsopcode.c | 2 +- > src/acpica/source/components/dispatcher/dsutils.c | 2 +- > src/acpica/source/components/dispatcher/dswexec.c | 2 +- > src/acpica/source/components/dispatcher/dswload.c | 2 +- > src/acpica/source/components/dispatcher/dswload2.c | 2 +- > src/acpica/source/components/dispatcher/dswscope.c | 2 +- > src/acpica/source/components/dispatcher/dswstate.c | 2 +- > src/acpica/source/components/events/evevent.c | 2 +- > src/acpica/source/components/events/evglock.c | 2 +- > src/acpica/source/components/events/evgpe.c | 158 ++++++++++----------- > src/acpica/source/components/events/evgpeblk.c | 7 +- > src/acpica/source/components/events/evgpeinit.c | 10 +- > src/acpica/source/components/events/evgpeutil.c | 64 +-------- > src/acpica/source/components/events/evhandler.c | 2 +- > src/acpica/source/components/events/evmisc.c | 2 +- > src/acpica/source/components/events/evregion.c | 2 +- > src/acpica/source/components/events/evrgnini.c | 2 +- > src/acpica/source/components/events/evsci.c | 2 +- > src/acpica/source/components/events/evxface.c | 139 ++++++++++++++++-- > src/acpica/source/components/events/evxfevnt.c | 2 +- > src/acpica/source/components/events/evxfgpe.c | 69 +++++++-- > src/acpica/source/components/events/evxfregn.c | 2 +- > src/acpica/source/components/executer/exconfig.c | 2 +- > src/acpica/source/components/executer/exconvrt.c | 2 +- > src/acpica/source/components/executer/excreate.c | 2 +- > src/acpica/source/components/executer/exdebug.c | 2 +- > src/acpica/source/components/executer/exdump.c | 2 +- > src/acpica/source/components/executer/exfield.c | 2 +- > src/acpica/source/components/executer/exfldio.c | 2 +- > src/acpica/source/components/executer/exmisc.c | 2 +- > src/acpica/source/components/executer/exmutex.c | 2 +- > src/acpica/source/components/executer/exnames.c | 2 +- > src/acpica/source/components/executer/exoparg1.c | 2 +- > src/acpica/source/components/executer/exoparg2.c | 2 +- > src/acpica/source/components/executer/exoparg3.c | 2 +- > src/acpica/source/components/executer/exoparg6.c | 2 +- > src/acpica/source/components/executer/exprep.c | 2 +- > src/acpica/source/components/executer/exregion.c | 2 +- > src/acpica/source/components/executer/exresnte.c | 2 +- > src/acpica/source/components/executer/exresolv.c | 2 +- > src/acpica/source/components/executer/exresop.c | 2 +- > src/acpica/source/components/executer/exstore.c | 2 +- > src/acpica/source/components/executer/exstoren.c | 2 +- > src/acpica/source/components/executer/exstorob.c | 2 +- > src/acpica/source/components/executer/exsystem.c | 2 +- > src/acpica/source/components/executer/exutils.c | 2 +- > src/acpica/source/components/hardware/hwacpi.c | 2 +- > src/acpica/source/components/hardware/hwesleep.c | 2 +- > src/acpica/source/components/hardware/hwgpe.c | 78 +++++++--- > src/acpica/source/components/hardware/hwpci.c | 2 +- > src/acpica/source/components/hardware/hwregs.c | 2 +- > src/acpica/source/components/hardware/hwsleep.c | 2 +- > src/acpica/source/components/hardware/hwvalid.c | 2 +- > src/acpica/source/components/hardware/hwxface.c | 2 +- > src/acpica/source/components/hardware/hwxfsleep.c | 2 +- > src/acpica/source/components/namespace/nsaccess.c | 2 +- > src/acpica/source/components/namespace/nsalloc.c | 2 +- > .../source/components/namespace/nsarguments.c | 2 +- > src/acpica/source/components/namespace/nsconvert.c | 2 +- > src/acpica/source/components/namespace/nsdump.c | 2 +- > src/acpica/source/components/namespace/nsdumpdv.c | 2 +- > src/acpica/source/components/namespace/nseval.c | 2 +- > src/acpica/source/components/namespace/nsinit.c | 2 +- > src/acpica/source/components/namespace/nsload.c | 2 +- > src/acpica/source/components/namespace/nsnames.c | 2 +- > src/acpica/source/components/namespace/nsobject.c | 2 +- > src/acpica/source/components/namespace/nsparse.c | 2 +- > src/acpica/source/components/namespace/nspredef.c | 2 +- > src/acpica/source/components/namespace/nsprepkg.c | 2 +- > src/acpica/source/components/namespace/nsrepair.c | 2 +- > src/acpica/source/components/namespace/nsrepair2.c | 2 +- > src/acpica/source/components/namespace/nssearch.c | 2 +- > src/acpica/source/components/namespace/nsutils.c | 2 +- > src/acpica/source/components/namespace/nswalk.c | 2 +- > src/acpica/source/components/namespace/nsxfeval.c | 2 +- > src/acpica/source/components/namespace/nsxfname.c | 2 +- > src/acpica/source/components/namespace/nsxfobj.c | 2 +- > src/acpica/source/components/parser/psargs.c | 2 +- > src/acpica/source/components/parser/psloop.c | 2 +- > src/acpica/source/components/parser/psobject.c | 2 +- > src/acpica/source/components/parser/psopcode.c | 2 +- > src/acpica/source/components/parser/psopinfo.c | 2 +- > src/acpica/source/components/parser/psparse.c | 2 +- > src/acpica/source/components/parser/psscope.c | 2 +- > src/acpica/source/components/parser/pstree.c | 2 +- > src/acpica/source/components/parser/psutils.c | 2 +- > src/acpica/source/components/parser/pswalk.c | 2 +- > src/acpica/source/components/parser/psxface.c | 2 +- > src/acpica/source/components/resources/rsaddr.c | 2 +- > src/acpica/source/components/resources/rscalc.c | 2 +- > src/acpica/source/components/resources/rscreate.c | 2 +- > src/acpica/source/components/resources/rsdump.c | 2 +- > .../source/components/resources/rsdumpinfo.c | 2 +- > src/acpica/source/components/resources/rsinfo.c | 2 +- > src/acpica/source/components/resources/rsio.c | 2 +- > src/acpica/source/components/resources/rsirq.c | 2 +- > src/acpica/source/components/resources/rslist.c | 2 +- > src/acpica/source/components/resources/rsmemory.c | 2 +- > src/acpica/source/components/resources/rsmisc.c | 2 +- > src/acpica/source/components/resources/rsserial.c | 2 +- > src/acpica/source/components/resources/rsutils.c | 2 +- > src/acpica/source/components/resources/rsxface.c | 2 +- > src/acpica/source/components/tables/tbdata.c | 2 +- > src/acpica/source/components/tables/tbfadt.c | 2 +- > src/acpica/source/components/tables/tbfind.c | 2 +- > src/acpica/source/components/tables/tbinstal.c | 2 +- > src/acpica/source/components/tables/tbprint.c | 2 +- > src/acpica/source/components/tables/tbutils.c | 2 +- > src/acpica/source/components/tables/tbxface.c | 2 +- > src/acpica/source/components/tables/tbxfload.c | 2 +- > src/acpica/source/components/tables/tbxfroot.c | 2 +- > src/acpica/source/components/utilities/utaddress.c | 2 +- > src/acpica/source/components/utilities/utalloc.c | 2 +- > src/acpica/source/components/utilities/utbuffer.c | 2 +- > src/acpica/source/components/utilities/utcache.c | 2 +- > src/acpica/source/components/utilities/utcopy.c | 2 +- > src/acpica/source/components/utilities/utdebug.c | 2 +- > src/acpica/source/components/utilities/utdecode.c | 2 +- > src/acpica/source/components/utilities/utdelete.c | 2 +- > src/acpica/source/components/utilities/uterror.c | 2 +- > src/acpica/source/components/utilities/uteval.c | 2 +- > src/acpica/source/components/utilities/utexcep.c | 2 +- > src/acpica/source/components/utilities/utfileio.c | 2 +- > src/acpica/source/components/utilities/utglobal.c | 2 +- > src/acpica/source/components/utilities/uthex.c | 2 +- > src/acpica/source/components/utilities/utids.c | 2 +- > src/acpica/source/components/utilities/utinit.c | 2 +- > src/acpica/source/components/utilities/utlock.c | 2 +- > src/acpica/source/components/utilities/utmath.c | 2 +- > src/acpica/source/components/utilities/utmisc.c | 2 +- > src/acpica/source/components/utilities/utmutex.c | 2 +- > src/acpica/source/components/utilities/utobject.c | 2 +- > src/acpica/source/components/utilities/utosi.c | 2 +- > src/acpica/source/components/utilities/utownerid.c | 2 +- > src/acpica/source/components/utilities/utpredef.c | 2 +- > src/acpica/source/components/utilities/utprint.c | 2 +- > src/acpica/source/components/utilities/utresrc.c | 2 +- > src/acpica/source/components/utilities/utstate.c | 2 +- > src/acpica/source/components/utilities/utstring.c | 2 +- > src/acpica/source/components/utilities/uttrack.c | 2 +- > src/acpica/source/components/utilities/utuuid.c | 2 +- > src/acpica/source/components/utilities/utxface.c | 2 +- > src/acpica/source/components/utilities/utxferror.c | 2 +- > src/acpica/source/components/utilities/utxfinit.c | 2 +- > src/acpica/source/include/acapps.h | 4 +- > src/acpica/source/include/acbuffer.h | 2 +- > src/acpica/source/include/accommon.h | 2 +- > src/acpica/source/include/acconfig.h | 2 +- > src/acpica/source/include/acdebug.h | 2 +- > src/acpica/source/include/acdisasm.h | 2 +- > src/acpica/source/include/acdispat.h | 2 +- > src/acpica/source/include/acevents.h | 6 +- > src/acpica/source/include/acexcep.h | 2 +- > src/acpica/source/include/acglobal.h | 2 +- > src/acpica/source/include/achware.h | 2 +- > src/acpica/source/include/acinterp.h | 2 +- > src/acpica/source/include/aclocal.h | 3 +- > src/acpica/source/include/acmacros.h | 2 +- > src/acpica/source/include/acnames.h | 2 +- > src/acpica/source/include/acnamesp.h | 2 +- > src/acpica/source/include/acobject.h | 2 +- > src/acpica/source/include/acopcode.h | 2 +- > src/acpica/source/include/acoutput.h | 2 +- > src/acpica/source/include/acparser.h | 2 +- > src/acpica/source/include/acpi.h | 2 +- > src/acpica/source/include/acpiosxf.h | 2 +- > src/acpica/source/include/acpixf.h | 18 ++- > src/acpica/source/include/acpredef.h | 2 +- > src/acpica/source/include/acresrc.h | 2 +- > src/acpica/source/include/acrestyp.h | 2 +- > src/acpica/source/include/acstruct.h | 2 +- > src/acpica/source/include/actables.h | 2 +- > src/acpica/source/include/actbl.h | 2 +- > src/acpica/source/include/actbl1.h | 2 +- > src/acpica/source/include/actbl2.h | 2 +- > src/acpica/source/include/actbl3.h | 2 +- > src/acpica/source/include/actypes.h | 18 ++- > src/acpica/source/include/acutils.h | 2 +- > src/acpica/source/include/amlcode.h | 2 +- > src/acpica/source/include/amlresrc.h | 2 +- > src/acpica/source/include/platform/acenv.h | 2 +- > src/acpica/source/include/platform/acenvex.h | 2 +- > src/acpica/source/include/platform/acgcc.h | 2 +- > src/acpica/source/include/platform/aclinux.h | 2 +- > src/acpica/source/include/platform/aclinuxex.h | 2 +- > .../source/os_specific/service_layers/oslibcfs.c | 2 +- > .../source/os_specific/service_layers/osunixxf.c | 2 +- > src/acpica/source/tools/acpiexec/aecommon.h | 2 +- > src/acpica/source/tools/acpiexec/aehandlers.c | 2 +- > src/acpica/source/tools/acpiexec/aeinitfile.c | 2 +- > src/acpica/source/tools/acpiexec/aeregion.c | 2 +- > 315 files changed, 821 insertions(+), 608 deletions(-) > > diff --git a/src/acpica/source/common/acgetline.c b/src/acpica/source/common/acgetline.c > index 77ca341..2a2232a 100644 > --- a/src/acpica/source/common/acgetline.c > +++ b/src/acpica/source/common/acgetline.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adfile.c b/src/acpica/source/common/adfile.c > index 6a2625a..6248983 100644 > --- a/src/acpica/source/common/adfile.c > +++ b/src/acpica/source/common/adfile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adisasm.c b/src/acpica/source/common/adisasm.c > index 85ae3d0..f4baa62 100644 > --- a/src/acpica/source/common/adisasm.c > +++ b/src/acpica/source/common/adisasm.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -429,8 +429,12 @@ AdAmlDisassemble ( > AcpiDmDumpDataTable (Table); > fprintf (stderr, "Acpi Data Table [%4.4s] decoded\n", > Table->Signature); > - fprintf (stderr, "Formatted output: %s - %u bytes\n", > - DisasmFilename, CmGetFileSize (File)); > + > + if (File) > + { > + fprintf (stderr, "Formatted output: %s - %u bytes\n", > + DisasmFilename, CmGetFileSize (File)); > + } > } > else > { > @@ -448,8 +452,11 @@ AdAmlDisassemble ( > { > AcpiOsPrintf ("/**** Before second load\n"); > > - NsSetupNamespaceListing (File); > - NsDisplayNamespace (); > + if (File) > + { > + NsSetupNamespaceListing (File); > + NsDisplayNamespace (); > + } > AcpiOsPrintf ("*****/\n"); > } > > @@ -529,8 +536,11 @@ AdAmlDisassemble ( > if (AslCompilerdebug) > { > AcpiOsPrintf ("/**** After second load and resource conversion\n"); > - NsSetupNamespaceListing (File); > - NsDisplayNamespace (); > + if (File) > + { > + NsSetupNamespaceListing (File); > + NsDisplayNamespace (); > + } > AcpiOsPrintf ("*****/\n"); > > AcpiDmDumpTree (AcpiGbl_ParseOpRoot); > @@ -559,8 +569,11 @@ AdAmlDisassemble ( > AcpiDmDumpDataTable (Table); > > fprintf (stderr, "Disassembly completed\n"); > - fprintf (stderr, "ASL Output: %s - %u bytes\n", > - DisasmFilename, CmGetFileSize (File)); > + if (File) > + { > + fprintf (stderr, "ASL Output: %s - %u bytes\n", > + DisasmFilename, CmGetFileSize (File)); > + } > > if (Gbl_MapfileFlag) > { > @@ -579,7 +592,7 @@ Cleanup: > ACPI_FREE (Table); > } > > - if (OutToFile && File) > + if (File) > { > if (AslCompilerdebug) /* Display final namespace, with transforms */ > { > diff --git a/src/acpica/source/common/adwalk.c b/src/acpica/source/common/adwalk.c > index aa50195..fe07c07 100644 > --- a/src/acpica/source/common/adwalk.c > +++ b/src/acpica/source/common/adwalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahids.c b/src/acpica/source/common/ahids.c > index 8d008cf..1ff3c7c 100644 > --- a/src/acpica/source/common/ahids.c > +++ b/src/acpica/source/common/ahids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahpredef.c b/src/acpica/source/common/ahpredef.c > index 7123b7f..57e7279 100644 > --- a/src/acpica/source/common/ahpredef.c > +++ b/src/acpica/source/common/ahpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahuuids.c b/src/acpica/source/common/ahuuids.c > index e2da9c1..4e5d087 100644 > --- a/src/acpica/source/common/ahuuids.c > +++ b/src/acpica/source/common/ahuuids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/cmfsize.c b/src/acpica/source/common/cmfsize.c > index 1511683..1e8de3c 100644 > --- a/src/acpica/source/common/cmfsize.c > +++ b/src/acpica/source/common/cmfsize.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmextern.c b/src/acpica/source/common/dmextern.c > index 30196df..72397f0 100644 > --- a/src/acpica/source/common/dmextern.c > +++ b/src/acpica/source/common/dmextern.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmrestag.c b/src/acpica/source/common/dmrestag.c > index d21b111..15c2d84 100644 > --- a/src/acpica/source/common/dmrestag.c > +++ b/src/acpica/source/common/dmrestag.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtable.c b/src/acpica/source/common/dmtable.c > index 8ed2236..b495ad2 100644 > --- a/src/acpica/source/common/dmtable.c > +++ b/src/acpica/source/common/dmtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbdump.c b/src/acpica/source/common/dmtbdump.c > index 235c650..2f2abe6 100644 > --- a/src/acpica/source/common/dmtbdump.c > +++ b/src/acpica/source/common/dmtbdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbinfo.c b/src/acpica/source/common/dmtbinfo.c > index 777928d..309585a 100644 > --- a/src/acpica/source/common/dmtbinfo.c > +++ b/src/acpica/source/common/dmtbinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslanalyze.c b/src/acpica/source/compiler/aslanalyze.c > index 8562ecd..1fae183 100644 > --- a/src/acpica/source/compiler/aslanalyze.c > +++ b/src/acpica/source/compiler/aslanalyze.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslascii.c b/src/acpica/source/compiler/aslascii.c > index 09ab9e9..9a4e127 100644 > --- a/src/acpica/source/compiler/aslascii.c > +++ b/src/acpica/source/compiler/aslascii.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslbtypes.c b/src/acpica/source/compiler/aslbtypes.c > index b7c5fbf..817ecb6 100644 > --- a/src/acpica/source/compiler/aslbtypes.c > +++ b/src/acpica/source/compiler/aslbtypes.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcodegen.c b/src/acpica/source/compiler/aslcodegen.c > index 7c37abd..7136ff1 100644 > --- a/src/acpica/source/compiler/aslcodegen.c > +++ b/src/acpica/source/compiler/aslcodegen.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompile.c b/src/acpica/source/compiler/aslcompile.c > index 4dc0195..6bf0604 100644 > --- a/src/acpica/source/compiler/aslcompile.c > +++ b/src/acpica/source/compiler/aslcompile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -190,10 +190,9 @@ CmDoCompile ( > AslCompilerparse(); > UtEndEvent (Event); > > - /* Check for parse errors */ > + /* Check for parser-detected syntax errors */ > > - Status = AslCheckForErrorExit (); > - if (ACPI_FAILURE (Status)) > + if (Gbl_SyntaxError) > { > fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n"); > LsDumpParseTree (); > diff --git a/src/acpica/source/compiler/aslcompiler.h b/src/acpica/source/compiler/aslcompiler.h > index beb22d0..36c9b9e 100644 > --- a/src/acpica/source/compiler/aslcompiler.h > +++ b/src/acpica/source/compiler/aslcompiler.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompiler.l b/src/acpica/source/compiler/aslcompiler.l > index cd07ef7..53332d8 100644 > --- a/src/acpica/source/compiler/aslcompiler.l > +++ b/src/acpica/source/compiler/aslcompiler.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompiler.y b/src/acpica/source/compiler/aslcompiler.y > index 6472e1d..032d062 100644 > --- a/src/acpica/source/compiler/aslcompiler.y > +++ b/src/acpica/source/compiler/aslcompiler.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asldefine.h b/src/acpica/source/compiler/asldefine.h > index ae64af2..00ad5a5 100644 > --- a/src/acpica/source/compiler/asldefine.h > +++ b/src/acpica/source/compiler/asldefine.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslerror.c b/src/acpica/source/compiler/aslerror.c > index dc8578c..d033fdb 100644 > --- a/src/acpica/source/compiler/aslerror.c > +++ b/src/acpica/source/compiler/aslerror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -990,6 +990,8 @@ AslCompilererror ( > const char *CompilerMessage) > { > > + Gbl_SyntaxError++; > + > AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber, > Gbl_LogicalLineNumber, Gbl_CurrentLineOffset, > Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, > diff --git a/src/acpica/source/compiler/aslfileio.c b/src/acpica/source/compiler/aslfileio.c > index a8c24cc..4d3d963 100644 > --- a/src/acpica/source/compiler/aslfileio.c > +++ b/src/acpica/source/compiler/aslfileio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -140,8 +140,8 @@ FlFileError ( > UINT8 ErrorId) > { > > - sprintf (MsgBuffer, "\"%s\" (%s)", Gbl_Files[FileId].Filename, > - strerror (errno)); > + sprintf (MsgBuffer, "\"%s\" (%s) - %s", Gbl_Files[FileId].Filename, > + Gbl_Files[FileId].Description, strerror (errno)); > AslCommonError (ASL_ERROR, ErrorId, 0, 0, 0, 0, NULL, MsgBuffer); > } > > @@ -170,6 +170,9 @@ FlOpenFile ( > FILE *File; > > > + Gbl_Files[FileId].Filename = Filename; > + Gbl_Files[FileId].Handle = NULL; > + > File = fopen (Filename, Mode); > if (!File) > { > @@ -177,8 +180,7 @@ FlOpenFile ( > AslAbort (); > } > > - Gbl_Files[FileId].Filename = Filename; > - Gbl_Files[FileId].Handle = File; > + Gbl_Files[FileId].Handle = File; > } > > > diff --git a/src/acpica/source/compiler/aslfiles.c b/src/acpica/source/compiler/aslfiles.c > index 4557861..39f6319 100644 > --- a/src/acpica/source/compiler/aslfiles.c > +++ b/src/acpica/source/compiler/aslfiles.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -557,6 +557,8 @@ FlOpenAmlOutputFile ( > 0, 0, 0, 0, NULL, NULL); > return (AE_ERROR); > } > + > + Gbl_Files[ASL_FILE_AML_OUTPUT].Filename = Filename; > } > > /* Open the output AML file in binary mode */ > @@ -635,9 +637,14 @@ FlOpenMiscOutputFiles ( > > if (!Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle) > { > - AslCommonError (ASL_ERROR, ASL_MSG_DEBUG_FILENAME, > - 0, 0, 0, 0, NULL, NULL); > - return (AE_ERROR); > + /* > + * A problem with freopen is that on error, > + * we no longer have stderr. > + */ > + Gbl_DebugFlag = FALSE; > + memcpy (stderr, stdout, sizeof (FILE)); > + FlFileError (ASL_FILE_DEBUG_OUTPUT, ASL_MSG_DEBUG_FILENAME); > + AslAbort (); > } > > AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); > @@ -830,6 +837,26 @@ FlOpenMiscOutputFiles ( > AslCompilerFileHeader (ASL_FILE_NAMESPACE_OUTPUT); > } > > + /* Create/Open a map file if requested */ > + > + if (Gbl_MapfileFlag) > + { > + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_MAP); > + if (!Filename) > + { > + AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, > + 0, 0, 0, 0, NULL, NULL); > + return (AE_ERROR); > + } > + > + /* Open the hex file, text mode (closed at compiler exit) */ > + > + FlOpenFile (ASL_FILE_MAP_OUTPUT, Filename, "w+t"); > + > + AslCompilerSignon (ASL_FILE_MAP_OUTPUT); > + AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT); > + } > + > return (AE_OK); > } > > diff --git a/src/acpica/source/compiler/aslfold.c b/src/acpica/source/compiler/aslfold.c > index 51c355a..82d6c8f 100644 > --- a/src/acpica/source/compiler/aslfold.c > +++ b/src/acpica/source/compiler/aslfold.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslglobal.h b/src/acpica/source/compiler/aslglobal.h > index 7c42e69..a26d752 100644 > --- a/src/acpica/source/compiler/aslglobal.h > +++ b/src/acpica/source/compiler/aslglobal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -199,6 +199,7 @@ ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_PreviousLineNumber, 0); > ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineNumber, 1); > ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_LogicalLineNumber, 1); > ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineOffset, 0); > +ASL_EXTERN UINT8 ASL_INIT_GLOBAL (Gbl_SyntaxError, 0); > > /* Exception reporting */ > > diff --git a/src/acpica/source/compiler/aslhex.c b/src/acpica/source/compiler/aslhex.c > index 1d8056b..39825c8 100644 > --- a/src/acpica/source/compiler/aslhex.c > +++ b/src/acpica/source/compiler/aslhex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllength.c b/src/acpica/source/compiler/asllength.c > index 0c19896..3fbf896 100644 > --- a/src/acpica/source/compiler/asllength.c > +++ b/src/acpica/source/compiler/asllength.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllisting.c b/src/acpica/source/compiler/asllisting.c > index 2c6b53b..b5a4559 100644 > --- a/src/acpica/source/compiler/asllisting.c > +++ b/src/acpica/source/compiler/asllisting.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllistsup.c b/src/acpica/source/compiler/asllistsup.c > index 5162524..c71ace0 100644 > --- a/src/acpica/source/compiler/asllistsup.c > +++ b/src/acpica/source/compiler/asllistsup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslload.c b/src/acpica/source/compiler/aslload.c > index 303fc4c..e6c1f85 100644 > --- a/src/acpica/source/compiler/aslload.c > +++ b/src/acpica/source/compiler/aslload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllookup.c b/src/acpica/source/compiler/asllookup.c > index 435dec9..4a7539a 100644 > --- a/src/acpica/source/compiler/asllookup.c > +++ b/src/acpica/source/compiler/asllookup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmain.c b/src/acpica/source/compiler/aslmain.c > index 6097721..9e27551 100644 > --- a/src/acpica/source/compiler/aslmain.c > +++ b/src/acpica/source/compiler/aslmain.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmap.c b/src/acpica/source/compiler/aslmap.c > index eebaeb3..5aed2b0 100644 > --- a/src/acpica/source/compiler/aslmap.c > +++ b/src/acpica/source/compiler/aslmap.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmapoutput.c b/src/acpica/source/compiler/aslmapoutput.c > index 046ebb7..9537cac 100644 > --- a/src/acpica/source/compiler/aslmapoutput.c > +++ b/src/acpica/source/compiler/aslmapoutput.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -188,7 +188,7 @@ const char *PolarityDecode[] = > * RETURN: None > * > * DESCRIPTION: External interface. > - * Create and open the mapfile and emit all of the collected > + * Map file has already been opened. Emit all of the collected > * hardware mapping information. Includes: GPIO information, > * Serial information, and a dump of the entire ACPI device tree. > * > @@ -198,8 +198,6 @@ void > MpEmitMappingInfo ( > void) > { > - char *NewFilename; > - > > /* Mapfile option enabled? */ > > @@ -208,22 +206,6 @@ MpEmitMappingInfo ( > return; > } > > - /* Create/Open a map file */ > - > - NewFilename = FlGenerateFilename (Gbl_OutputFilenamePrefix, > - FILE_SUFFIX_MAP); > - if (!NewFilename) > - { > - AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, > - 0, 0, 0, 0, NULL, NULL); > - } > - > - /* Open the hex file, text mode (closed at compiler exit) */ > - > - FlOpenFile (ASL_FILE_MAP_OUTPUT, NewFilename, "w+t"); > - AslCompilerSignon (ASL_FILE_MAP_OUTPUT); > - AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT); > - > if (!Gbl_GpioList) > { > FlPrintFile (ASL_FILE_MAP_OUTPUT, > @@ -702,9 +684,6 @@ MpNamespaceXrefBegin ( > > if (Op->Asl.Node == Info->TargetNode) > { > - DevicePathname = AcpiNsGetExternalPathname ( > - Info->TargetNode); > - > while (ParentOp && (!ParentOp->Asl.Node)) > { > ParentOp = ParentOp->Asl.Parent; > @@ -726,6 +705,8 @@ MpNamespaceXrefBegin ( > DevicePathname, HidString); > > Info->References++; > + > + ACPI_FREE (DevicePathname); > } > } > > diff --git a/src/acpica/source/compiler/aslmaputils.c b/src/acpica/source/compiler/aslmaputils.c > index 271a9a8..9b9a03e 100644 > --- a/src/acpica/source/compiler/aslmaputils.c > +++ b/src/acpica/source/compiler/aslmaputils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmessages.c b/src/acpica/source/compiler/aslmessages.c > index 879e3ab..4ea71de 100644 > --- a/src/acpica/source/compiler/aslmessages.c > +++ b/src/acpica/source/compiler/aslmessages.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmessages.h b/src/acpica/source/compiler/aslmessages.h > index bf99a72..12fe9d9 100644 > --- a/src/acpica/source/compiler/aslmessages.h > +++ b/src/acpica/source/compiler/aslmessages.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmethod.c b/src/acpica/source/compiler/aslmethod.c > index 5dc30d7..b8ca5e9 100644 > --- a/src/acpica/source/compiler/aslmethod.c > +++ b/src/acpica/source/compiler/aslmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslnamesp.c b/src/acpica/source/compiler/aslnamesp.c > index 0321dc1..e6d2898 100644 > --- a/src/acpica/source/compiler/aslnamesp.c > +++ b/src/acpica/source/compiler/aslnamesp.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloffset.c b/src/acpica/source/compiler/asloffset.c > index 7b7cf09..1dc432c 100644 > --- a/src/acpica/source/compiler/asloffset.c > +++ b/src/acpica/source/compiler/asloffset.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslopcodes.c b/src/acpica/source/compiler/aslopcodes.c > index b476b06..36044b0 100644 > --- a/src/acpica/source/compiler/aslopcodes.c > +++ b/src/acpica/source/compiler/aslopcodes.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloperands.c b/src/acpica/source/compiler/asloperands.c > index 5533971..ab06d14 100644 > --- a/src/acpica/source/compiler/asloperands.c > +++ b/src/acpica/source/compiler/asloperands.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslopt.c b/src/acpica/source/compiler/aslopt.c > index 3cdaeb0..65fce99 100644 > --- a/src/acpica/source/compiler/aslopt.c > +++ b/src/acpica/source/compiler/aslopt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslparser.y b/src/acpica/source/compiler/aslparser.y > index f850672..588e239 100644 > --- a/src/acpica/source/compiler/aslparser.y > +++ b/src/acpica/source/compiler/aslparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslpredef.c b/src/acpica/source/compiler/aslpredef.c > index 9305ac7..c39483b 100644 > --- a/src/acpica/source/compiler/aslpredef.c > +++ b/src/acpica/source/compiler/aslpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprepkg.c b/src/acpica/source/compiler/aslprepkg.c > index 8184a3d..6b27e91 100644 > --- a/src/acpica/source/compiler/aslprepkg.c > +++ b/src/acpica/source/compiler/aslprepkg.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprintf.c b/src/acpica/source/compiler/aslprintf.c > index 811bc92..1ace80f 100644 > --- a/src/acpica/source/compiler/aslprintf.c > +++ b/src/acpica/source/compiler/aslprintf.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprune.c b/src/acpica/source/compiler/aslprune.c > index 163183b..44221bb 100644 > --- a/src/acpica/source/compiler/aslprune.c > +++ b/src/acpica/source/compiler/aslprune.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslresource.c b/src/acpica/source/compiler/aslresource.c > index 09acd24..2abc7dd 100644 > --- a/src/acpica/source/compiler/aslresource.c > +++ b/src/acpica/source/compiler/aslresource.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype1.c b/src/acpica/source/compiler/aslrestype1.c > index 9991de7..945f1bf 100644 > --- a/src/acpica/source/compiler/aslrestype1.c > +++ b/src/acpica/source/compiler/aslrestype1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype1i.c b/src/acpica/source/compiler/aslrestype1i.c > index 319b547..1394580 100644 > --- a/src/acpica/source/compiler/aslrestype1i.c > +++ b/src/acpica/source/compiler/aslrestype1i.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2.c b/src/acpica/source/compiler/aslrestype2.c > index b639d04..1cbca10 100644 > --- a/src/acpica/source/compiler/aslrestype2.c > +++ b/src/acpica/source/compiler/aslrestype2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2d.c b/src/acpica/source/compiler/aslrestype2d.c > index f55917c..083751f 100644 > --- a/src/acpica/source/compiler/aslrestype2d.c > +++ b/src/acpica/source/compiler/aslrestype2d.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2e.c b/src/acpica/source/compiler/aslrestype2e.c > index 1eb682b..2a24589 100644 > --- a/src/acpica/source/compiler/aslrestype2e.c > +++ b/src/acpica/source/compiler/aslrestype2e.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2q.c b/src/acpica/source/compiler/aslrestype2q.c > index 8b5020f..cfb0405 100644 > --- a/src/acpica/source/compiler/aslrestype2q.c > +++ b/src/acpica/source/compiler/aslrestype2q.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2s.c b/src/acpica/source/compiler/aslrestype2s.c > index 839aa03..779edd0 100644 > --- a/src/acpica/source/compiler/aslrestype2s.c > +++ b/src/acpica/source/compiler/aslrestype2s.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2w.c b/src/acpica/source/compiler/aslrestype2w.c > index 358b5f3..d00a979 100644 > --- a/src/acpica/source/compiler/aslrestype2w.c > +++ b/src/acpica/source/compiler/aslrestype2w.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrules.y b/src/acpica/source/compiler/aslrules.y > index 3e794ab..ed5515c 100644 > --- a/src/acpica/source/compiler/aslrules.y > +++ b/src/acpica/source/compiler/aslrules.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslstartup.c b/src/acpica/source/compiler/aslstartup.c > index 46839ff..0894d45 100644 > --- a/src/acpica/source/compiler/aslstartup.c > +++ b/src/acpica/source/compiler/aslstartup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -160,6 +160,7 @@ AslInitializeGlobals ( > > /* Init compiler globals */ > > + Gbl_SyntaxError = 0; > Gbl_CurrentColumn = 0; > Gbl_CurrentLineNumber = 1; > Gbl_LogicalLineNumber = 1; > diff --git a/src/acpica/source/compiler/aslstubs.c b/src/acpica/source/compiler/aslstubs.c > index a57c4f4..533f7de 100644 > --- a/src/acpica/source/compiler/aslstubs.c > +++ b/src/acpica/source/compiler/aslstubs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslsupport.l b/src/acpica/source/compiler/aslsupport.l > index 2fc591c..c7f1f93 100644 > --- a/src/acpica/source/compiler/aslsupport.l > +++ b/src/acpica/source/compiler/aslsupport.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -141,6 +141,14 @@ typedef struct asl_file_node > ASL_FILE_NODE *Gbl_IncludeFileStack = NULL; > > > +/******************************************************************************* > + * > + * FUNCTION: AslParserCleanup > + * > + * Used to delete the current buffer > + * > + ******************************************************************************/ > + > void > AslParserCleanup ( > void) > @@ -260,7 +268,8 @@ AslPopInputFileStack ( > > > Fnode = Gbl_IncludeFileStack; > - DbgPrint (ASL_PARSE_OUTPUT, "\nPop InputFile Stack, Fnode %p\n\n", Fnode); > + DbgPrint (ASL_PARSE_OUTPUT, > + "\nPop InputFile Stack, Fnode %p\n\n", Fnode); > > if (!Fnode) > { > @@ -320,11 +329,11 @@ AslPushInputFileStack ( > > Fnode = UtLocalCalloc (sizeof (ASL_FILE_NODE)); > > - Fnode->File = yyin; > - Fnode->Next = Gbl_IncludeFileStack; > - Fnode->State = YY_CURRENT_BUFFER; > - Fnode->CurrentLineNumber = Gbl_CurrentLineNumber; > - Fnode->Filename = Gbl_Files[ASL_FILE_INPUT].Filename; > + Fnode->File = yyin; > + Fnode->Next = Gbl_IncludeFileStack; > + Fnode->State = YY_CURRENT_BUFFER; > + Fnode->Filename = Gbl_Files[ASL_FILE_INPUT].Filename; > + Fnode->CurrentLineNumber = Gbl_CurrentLineNumber; > > /* Push it on the stack */ > > @@ -335,7 +344,8 @@ AslPushInputFileStack ( > State = yy_create_buffer (InputFile, YY_BUF_SIZE); > yy_switch_to_buffer (State); > > - DbgPrint (ASL_PARSE_OUTPUT, "\nPush InputFile Stack, returning %p\n\n", InputFile); > + DbgPrint (ASL_PARSE_OUTPUT, > + "\nPush InputFile Stack, returning %p\n\n", InputFile); > > /* Reset the global line count and filename */ > > @@ -385,7 +395,7 @@ AslResetCurrentLineBuffer ( > * > * FUNCTION: AslInsertLineBuffer > * > - * PARAMETERS: SourceChar - One char from the input ASL source file > + * PARAMETERS: SourceChar - One char from the input ASL source file > * > * RETURN: None > * > @@ -426,7 +436,8 @@ AslInsertLineBuffer ( > *Gbl_LineBufPtr = (UINT8) SourceChar; > Gbl_LineBufPtr++; > > - if (Gbl_LineBufPtr > (Gbl_CurrentLineBuffer + (Gbl_LineBufferSize - 1))) > + if (Gbl_LineBufPtr > > + (Gbl_CurrentLineBuffer + (Gbl_LineBufferSize - 1))) > { > #if 0 > /* > @@ -435,9 +446,9 @@ AslInsertLineBuffer ( > */ > sprintf (MsgBuffer, "Max %u", Gbl_LineBufferSize); > AslCommonError (ASL_WARNING, ASL_MSG_LONG_LINE, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, MsgBuffer); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, MsgBuffer); > #endif > > AslResetCurrentLineBuffer (); > @@ -456,12 +467,12 @@ AslInsertLineBuffer ( > * > * FUNCTION: count > * > - * PARAMETERS: yytext - Contains the matched keyword. > - * Type - Keyword/Character type: > - * 0 = anything except a keyword > - * 1 = pseudo-keywords > - * 2 = non-executable ASL keywords > - * 3 = executable ASL keywords > + * PARAMETERS: yytext - Contains the matched keyword. > + * Type - Keyword/Character type: > + * 0 = anything except a keyword > + * 1 = pseudo-keywords > + * 2 = non-executable ASL keywords > + * 3 = executable ASL keywords > * > * RETURN: None > * > @@ -530,7 +541,7 @@ loop: > > /* Eat chars until end-of-comment */ > > - while ((c = input()) != '*' && c != EOF) > + while (((c = input ()) != '*') && (c != EOF)) > { > AslInsertLineBuffer (c); > c1 = c; > @@ -548,16 +559,16 @@ loop: > if ((c1 == '/') && (c == '*')) > { > AslCommonError (ASL_WARNING, ASL_MSG_NESTED_COMMENT, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_InputByteCount, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_InputByteCount, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > } > > /* Comment is closed only if the NEXT character is a slash */ > > AslInsertLineBuffer (c); > > - if ((c1 = input()) != '/' && c1 != EOF) > + if (((c1 = input ()) != '/') && (c1 != EOF)) > { > unput(c1); > goto loop; > @@ -577,9 +588,9 @@ EarlyEOF: > * Premature End-Of-File > */ > AslCommonError (ASL_ERROR, ASL_MSG_EARLY_EOF, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > return (FALSE); > } > > @@ -606,7 +617,7 @@ AslDoCommentType2 ( > AslInsertLineBuffer ('/'); > AslInsertLineBuffer ('/'); > > - while ((c = input()) != '\n' && c != EOF) > + while (((c = input ()) != '\n') && (c != EOF)) > { > AslInsertLineBuffer (c); > } > @@ -754,9 +765,9 @@ DoCharacter: > /* Unknown escape sequence issue warning, but use the character */ > > AslCommonError (ASL_WARNING, ASL_MSG_INVALID_ESCAPE, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > break; > } > break; > @@ -781,9 +792,9 @@ DoCharacter: > if ((Digit == 0) || (Digit > ACPI_ASCII_MAX)) > { > AslCommonError (ASL_WARNING, ASL_MSG_INVALID_STRING, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > } > else > { > @@ -825,9 +836,9 @@ DoCharacter: > if ((Digit == 0) || (Digit > ACPI_ASCII_MAX)) > { > AslCommonError (ASL_WARNING, ASL_MSG_INVALID_STRING, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > } > else > { > @@ -869,9 +880,9 @@ DoCharacter: > * Premature End-Of-File > */ > AslCommonError (ASL_ERROR, ASL_MSG_EARLY_EOF, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > return (FALSE); > > > @@ -885,9 +896,9 @@ CompletedString: > if (!CleanString) > { > AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); > return (FALSE); > } > > @@ -901,8 +912,8 @@ BufferOverflow: > /* Literal was too long */ > > AslCommonError (ASL_ERROR, ASL_MSG_STRING_LENGTH, > - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > - Gbl_CurrentLineOffset, Gbl_CurrentColumn, > - Gbl_Files[ASL_FILE_INPUT].Filename, "Max length 4096"); > + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, > + Gbl_CurrentLineOffset, Gbl_CurrentColumn, > + Gbl_Files[ASL_FILE_INPUT].Filename, "Max length 4096"); > return (FALSE); > } > diff --git a/src/acpica/source/compiler/aslsupport.y b/src/acpica/source/compiler/aslsupport.y > index f5168d3..6f3cfec 100644 > --- a/src/acpica/source/compiler/aslsupport.y > +++ b/src/acpica/source/compiler/aslsupport.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltokens.y b/src/acpica/source/compiler/asltokens.y > index d58c7e1..0e99c24 100644 > --- a/src/acpica/source/compiler/asltokens.y > +++ b/src/acpica/source/compiler/asltokens.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltransform.c b/src/acpica/source/compiler/asltransform.c > index 5ce8624..df5d994 100644 > --- a/src/acpica/source/compiler/asltransform.c > +++ b/src/acpica/source/compiler/asltransform.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltree.c b/src/acpica/source/compiler/asltree.c > index 2e0daef..a13707e 100644 > --- a/src/acpica/source/compiler/asltree.c > +++ b/src/acpica/source/compiler/asltree.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltypes.h b/src/acpica/source/compiler/asltypes.h > index 931a25e..21c64ed 100644 > --- a/src/acpica/source/compiler/asltypes.h > +++ b/src/acpica/source/compiler/asltypes.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltypes.y b/src/acpica/source/compiler/asltypes.y > index a3699d6..b1821f6 100644 > --- a/src/acpica/source/compiler/asltypes.y > +++ b/src/acpica/source/compiler/asltypes.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslutils.c b/src/acpica/source/compiler/aslutils.c > index a2ddd05..eb8a883 100644 > --- a/src/acpica/source/compiler/aslutils.c > +++ b/src/acpica/source/compiler/aslutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -643,20 +643,36 @@ UtStringCacheCalloc ( > { > char *Buffer; > ASL_CACHE_INFO *Cache; > + UINT32 CacheSize = ASL_STRING_CACHE_SIZE; > > > - if (Length > ASL_STRING_CACHE_SIZE) > + if (Length > CacheSize) > { > - Buffer = UtLocalCalloc (Length); > - return (Buffer); > + CacheSize = Length; > + > + if (Gbl_StringCacheList) > + { > + Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); > + > + /* Link new cache buffer just following head of list */ > + > + Cache->Next = Gbl_StringCacheList->Next; > + Gbl_StringCacheList->Next = Cache; > + > + /* Leave cache management pointers alone as they pertain to head */ > + > + Gbl_StringCount++; > + Gbl_StringSize += Length; > + > + return (Cache->Buffer); > + } > } > > if ((Gbl_StringCacheNext + Length) >= Gbl_StringCacheLast) > { > /* Allocate a new buffer */ > > - Cache = UtLocalCalloc (sizeof (Cache->Next) + > - ASL_STRING_CACHE_SIZE); > + Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); > > /* Link new cache buffer to head of list */ > > @@ -666,7 +682,7 @@ UtStringCacheCalloc ( > /* Setup cache management pointers */ > > Gbl_StringCacheNext = Cache->Buffer; > - Gbl_StringCacheLast = Gbl_StringCacheNext + ASL_STRING_CACHE_SIZE; > + Gbl_StringCacheLast = Gbl_StringCacheNext + CacheSize; > } > > Gbl_StringCount++; > diff --git a/src/acpica/source/compiler/asluuid.c b/src/acpica/source/compiler/asluuid.c > index 98a63a3..db2dd34 100644 > --- a/src/acpica/source/compiler/asluuid.c > +++ b/src/acpica/source/compiler/asluuid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslwalks.c b/src/acpica/source/compiler/aslwalks.c > index be7ef48..679feb0 100644 > --- a/src/acpica/source/compiler/aslwalks.c > +++ b/src/acpica/source/compiler/aslwalks.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslxref.c b/src/acpica/source/compiler/aslxref.c > index 5387cbe..ab68b88 100644 > --- a/src/acpica/source/compiler/aslxref.c > +++ b/src/acpica/source/compiler/aslxref.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompile.c b/src/acpica/source/compiler/dtcompile.c > index 10f963c..d5b3347 100644 > --- a/src/acpica/source/compiler/dtcompile.c > +++ b/src/acpica/source/compiler/dtcompile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompiler.h b/src/acpica/source/compiler/dtcompiler.h > index 2eda236..b070c58 100644 > --- a/src/acpica/source/compiler/dtcompiler.h > +++ b/src/acpica/source/compiler/dtcompiler.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtexpress.c b/src/acpica/source/compiler/dtexpress.c > index a46c2eb..2fdd4d2 100644 > --- a/src/acpica/source/compiler/dtexpress.c > +++ b/src/acpica/source/compiler/dtexpress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtfield.c b/src/acpica/source/compiler/dtfield.c > index e3908ba..f3810c2 100644 > --- a/src/acpica/source/compiler/dtfield.c > +++ b/src/acpica/source/compiler/dtfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtio.c b/src/acpica/source/compiler/dtio.c > index 77bbc5d..baec96a 100644 > --- a/src/acpica/source/compiler/dtio.c > +++ b/src/acpica/source/compiler/dtio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtparser.l b/src/acpica/source/compiler/dtparser.l > index 7c26759..b3cdf22 100644 > --- a/src/acpica/source/compiler/dtparser.l > +++ b/src/acpica/source/compiler/dtparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtparser.y b/src/acpica/source/compiler/dtparser.y > index 40e8066..96e6c14 100644 > --- a/src/acpica/source/compiler/dtparser.y > +++ b/src/acpica/source/compiler/dtparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtsubtable.c b/src/acpica/source/compiler/dtsubtable.c > index 13c2a05..a35792d 100644 > --- a/src/acpica/source/compiler/dtsubtable.c > +++ b/src/acpica/source/compiler/dtsubtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttable.c b/src/acpica/source/compiler/dttable.c > index b80f870..56bfad7 100644 > --- a/src/acpica/source/compiler/dttable.c > +++ b/src/acpica/source/compiler/dttable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttemplate.c b/src/acpica/source/compiler/dttemplate.c > index f677f83..b3f32b8 100644 > --- a/src/acpica/source/compiler/dttemplate.c > +++ b/src/acpica/source/compiler/dttemplate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttemplate.h b/src/acpica/source/compiler/dttemplate.h > index 1dfd5cb..9971f71 100644 > --- a/src/acpica/source/compiler/dttemplate.h > +++ b/src/acpica/source/compiler/dttemplate.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtutils.c b/src/acpica/source/compiler/dtutils.c > index 941fe76..5beadd1 100644 > --- a/src/acpica/source/compiler/dtutils.c > +++ b/src/acpica/source/compiler/dtutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/preprocess.h b/src/acpica/source/compiler/preprocess.h > index b5a57f5..998a25a 100644 > --- a/src/acpica/source/compiler/preprocess.h > +++ b/src/acpica/source/compiler/preprocess.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prexpress.c b/src/acpica/source/compiler/prexpress.c > index f787009..513a443 100644 > --- a/src/acpica/source/compiler/prexpress.c > +++ b/src/acpica/source/compiler/prexpress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prmacros.c b/src/acpica/source/compiler/prmacros.c > index 6bd6727..798e29b 100644 > --- a/src/acpica/source/compiler/prmacros.c > +++ b/src/acpica/source/compiler/prmacros.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prparser.l b/src/acpica/source/compiler/prparser.l > index fe73c90..e104107 100644 > --- a/src/acpica/source/compiler/prparser.l > +++ b/src/acpica/source/compiler/prparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prparser.y b/src/acpica/source/compiler/prparser.y > index 71b33c8..990b79b 100644 > --- a/src/acpica/source/compiler/prparser.y > +++ b/src/acpica/source/compiler/prparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prscan.c b/src/acpica/source/compiler/prscan.c > index 943b721..d52a45e 100644 > --- a/src/acpica/source/compiler/prscan.c > +++ b/src/acpica/source/compiler/prscan.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prutils.c b/src/acpica/source/compiler/prutils.c > index a2b5906..10d65a5 100644 > --- a/src/acpica/source/compiler/prutils.c > +++ b/src/acpica/source/compiler/prutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbcmds.c b/src/acpica/source/components/debugger/dbcmds.c > index 0d39139..8c723b3 100644 > --- a/src/acpica/source/components/debugger/dbcmds.c > +++ b/src/acpica/source/components/debugger/dbcmds.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbconvert.c b/src/acpica/source/components/debugger/dbconvert.c > index 61d5418..14caa2b 100644 > --- a/src/acpica/source/components/debugger/dbconvert.c > +++ b/src/acpica/source/components/debugger/dbconvert.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbdisply.c b/src/acpica/source/components/debugger/dbdisply.c > index 7991f0a..04a7591 100644 > --- a/src/acpica/source/components/debugger/dbdisply.c > +++ b/src/acpica/source/components/debugger/dbdisply.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -972,7 +972,7 @@ AcpiDbDisplayGpes ( > GpeIndex = (i * ACPI_GPE_REGISTER_WIDTH) + j; > GpeEventInfo = &GpeBlock->EventInfo[GpeIndex]; > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NONE) > { > /* This GPE is not used (no method or handler), ignore it */ > @@ -1005,7 +1005,7 @@ AcpiDbDisplayGpes ( > AcpiOsPrintf ("RunOnly, "); > } > > - switch (GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) > + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) > { > case ACPI_GPE_DISPATCH_NONE: > > @@ -1016,6 +1016,7 @@ AcpiDbDisplayGpes ( > > AcpiOsPrintf ("Method"); > break; > + > case ACPI_GPE_DISPATCH_HANDLER: > > AcpiOsPrintf ("Handler"); > @@ -1033,10 +1034,15 @@ AcpiDbDisplayGpes ( > AcpiOsPrintf ("Implicit Notify on %u devices", Count); > break; > > + case ACPI_GPE_DISPATCH_RAW_HANDLER: > + > + AcpiOsPrintf ("RawHandler"); > + break; > + > default: > > AcpiOsPrintf ("UNKNOWN: %X", > - GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK); > + ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)); > break; > } > > diff --git a/src/acpica/source/components/debugger/dbexec.c b/src/acpica/source/components/debugger/dbexec.c > index 253b25a..c865c47 100644 > --- a/src/acpica/source/components/debugger/dbexec.c > +++ b/src/acpica/source/components/debugger/dbexec.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbfileio.c b/src/acpica/source/components/debugger/dbfileio.c > index 4521ee6..768d87c 100644 > --- a/src/acpica/source/components/debugger/dbfileio.c > +++ b/src/acpica/source/components/debugger/dbfileio.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbhistry.c b/src/acpica/source/components/debugger/dbhistry.c > index 18de938..ad11d4f 100644 > --- a/src/acpica/source/components/debugger/dbhistry.c > +++ b/src/acpica/source/components/debugger/dbhistry.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbinput.c b/src/acpica/source/components/debugger/dbinput.c > index a85f5ff..fe34a90 100644 > --- a/src/acpica/source/components/debugger/dbinput.c > +++ b/src/acpica/source/components/debugger/dbinput.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbmethod.c b/src/acpica/source/components/debugger/dbmethod.c > index 67aa9c8..72076a7 100644 > --- a/src/acpica/source/components/debugger/dbmethod.c > +++ b/src/acpica/source/components/debugger/dbmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbnames.c b/src/acpica/source/components/debugger/dbnames.c > index 6cbe840..ccaa672 100644 > --- a/src/acpica/source/components/debugger/dbnames.c > +++ b/src/acpica/source/components/debugger/dbnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbstats.c b/src/acpica/source/components/debugger/dbstats.c > index 70224fa..61095e1 100644 > --- a/src/acpica/source/components/debugger/dbstats.c > +++ b/src/acpica/source/components/debugger/dbstats.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbtest.c b/src/acpica/source/components/debugger/dbtest.c > index fd7201a..26bfc1c 100644 > --- a/src/acpica/source/components/debugger/dbtest.c > +++ b/src/acpica/source/components/debugger/dbtest.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbutils.c b/src/acpica/source/components/debugger/dbutils.c > index fa47bd8..fd3445c 100644 > --- a/src/acpica/source/components/debugger/dbutils.c > +++ b/src/acpica/source/components/debugger/dbutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbxface.c b/src/acpica/source/components/debugger/dbxface.c > index d4cc9e0..ac03ccc 100644 > --- a/src/acpica/source/components/debugger/dbxface.c > +++ b/src/acpica/source/components/debugger/dbxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmbuffer.c b/src/acpica/source/components/disassembler/dmbuffer.c > index 7275eca..8ad879c 100644 > --- a/src/acpica/source/components/disassembler/dmbuffer.c > +++ b/src/acpica/source/components/disassembler/dmbuffer.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmcstyle.c b/src/acpica/source/components/disassembler/dmcstyle.c > index 73d7de2..951af09 100644 > --- a/src/acpica/source/components/disassembler/dmcstyle.c > +++ b/src/acpica/source/components/disassembler/dmcstyle.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmdeferred.c b/src/acpica/source/components/disassembler/dmdeferred.c > index c3fb456..7e654f2 100644 > --- a/src/acpica/source/components/disassembler/dmdeferred.c > +++ b/src/acpica/source/components/disassembler/dmdeferred.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmnames.c b/src/acpica/source/components/disassembler/dmnames.c > index cb4c63b..45df12a 100644 > --- a/src/acpica/source/components/disassembler/dmnames.c > +++ b/src/acpica/source/components/disassembler/dmnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmobject.c b/src/acpica/source/components/disassembler/dmobject.c > index 0a01264..c4680ef 100644 > --- a/src/acpica/source/components/disassembler/dmobject.c > +++ b/src/acpica/source/components/disassembler/dmobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmopcode.c b/src/acpica/source/components/disassembler/dmopcode.c > index f4f2cf6..99d3ead 100644 > --- a/src/acpica/source/components/disassembler/dmopcode.c > +++ b/src/acpica/source/components/disassembler/dmopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrc.c b/src/acpica/source/components/disassembler/dmresrc.c > index 649fe4a..654d20b 100644 > --- a/src/acpica/source/components/disassembler/dmresrc.c > +++ b/src/acpica/source/components/disassembler/dmresrc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcl.c b/src/acpica/source/components/disassembler/dmresrcl.c > index ea2c732..b19dffd 100644 > --- a/src/acpica/source/components/disassembler/dmresrcl.c > +++ b/src/acpica/source/components/disassembler/dmresrcl.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcl2.c b/src/acpica/source/components/disassembler/dmresrcl2.c > index 5c60cd4..a9eb885 100644 > --- a/src/acpica/source/components/disassembler/dmresrcl2.c > +++ b/src/acpica/source/components/disassembler/dmresrcl2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcs.c b/src/acpica/source/components/disassembler/dmresrcs.c > index bc28828..cb2084f 100644 > --- a/src/acpica/source/components/disassembler/dmresrcs.c > +++ b/src/acpica/source/components/disassembler/dmresrcs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmutils.c b/src/acpica/source/components/disassembler/dmutils.c > index d48eed7..382ec79 100644 > --- a/src/acpica/source/components/disassembler/dmutils.c > +++ b/src/acpica/source/components/disassembler/dmutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmwalk.c b/src/acpica/source/components/disassembler/dmwalk.c > index b89faf9..79a1872 100644 > --- a/src/acpica/source/components/disassembler/dmwalk.c > +++ b/src/acpica/source/components/disassembler/dmwalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsargs.c b/src/acpica/source/components/dispatcher/dsargs.c > index d70b6a9..8acb5dc 100644 > --- a/src/acpica/source/components/dispatcher/dsargs.c > +++ b/src/acpica/source/components/dispatcher/dsargs.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dscontrol.c b/src/acpica/source/components/dispatcher/dscontrol.c > index 85df0e3..218cbe9 100644 > --- a/src/acpica/source/components/dispatcher/dscontrol.c > +++ b/src/acpica/source/components/dispatcher/dscontrol.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsfield.c b/src/acpica/source/components/dispatcher/dsfield.c > index d14434b..37d4cc1 100644 > --- a/src/acpica/source/components/dispatcher/dsfield.c > +++ b/src/acpica/source/components/dispatcher/dsfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsinit.c b/src/acpica/source/components/dispatcher/dsinit.c > index f68c66e..585e127 100644 > --- a/src/acpica/source/components/dispatcher/dsinit.c > +++ b/src/acpica/source/components/dispatcher/dsinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsmethod.c b/src/acpica/source/components/dispatcher/dsmethod.c > index d8d8230..43ee55d 100644 > --- a/src/acpica/source/components/dispatcher/dsmethod.c > +++ b/src/acpica/source/components/dispatcher/dsmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsmthdat.c b/src/acpica/source/components/dispatcher/dsmthdat.c > index 7f94325..2b7fce2 100644 > --- a/src/acpica/source/components/dispatcher/dsmthdat.c > +++ b/src/acpica/source/components/dispatcher/dsmthdat.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsobject.c b/src/acpica/source/components/dispatcher/dsobject.c > index 59d4656..b5cad38 100644 > --- a/src/acpica/source/components/dispatcher/dsobject.c > +++ b/src/acpica/source/components/dispatcher/dsobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsopcode.c b/src/acpica/source/components/dispatcher/dsopcode.c > index c1f265d..6a761f5 100644 > --- a/src/acpica/source/components/dispatcher/dsopcode.c > +++ b/src/acpica/source/components/dispatcher/dsopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsutils.c b/src/acpica/source/components/dispatcher/dsutils.c > index 81d73cb..b98fc9a 100644 > --- a/src/acpica/source/components/dispatcher/dsutils.c > +++ b/src/acpica/source/components/dispatcher/dsutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswexec.c b/src/acpica/source/components/dispatcher/dswexec.c > index 877d30f..f650ced 100644 > --- a/src/acpica/source/components/dispatcher/dswexec.c > +++ b/src/acpica/source/components/dispatcher/dswexec.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswload.c b/src/acpica/source/components/dispatcher/dswload.c > index de70dee..be090fc 100644 > --- a/src/acpica/source/components/dispatcher/dswload.c > +++ b/src/acpica/source/components/dispatcher/dswload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswload2.c b/src/acpica/source/components/dispatcher/dswload2.c > index 4fc1485..312b2cd 100644 > --- a/src/acpica/source/components/dispatcher/dswload2.c > +++ b/src/acpica/source/components/dispatcher/dswload2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswscope.c b/src/acpica/source/components/dispatcher/dswscope.c > index 7caa301..9865dcd 100644 > --- a/src/acpica/source/components/dispatcher/dswscope.c > +++ b/src/acpica/source/components/dispatcher/dswscope.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswstate.c b/src/acpica/source/components/dispatcher/dswstate.c > index 4d24d2c..e5ea508 100644 > --- a/src/acpica/source/components/dispatcher/dswstate.c > +++ b/src/acpica/source/components/dispatcher/dswstate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evevent.c b/src/acpica/source/components/events/evevent.c > index f43eeff..e447356 100644 > --- a/src/acpica/source/components/events/evevent.c > +++ b/src/acpica/source/components/events/evevent.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evglock.c b/src/acpica/source/components/events/evglock.c > index fa1954a..e1ebf19 100644 > --- a/src/acpica/source/components/events/evglock.c > +++ b/src/acpica/source/components/events/evglock.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evgpe.c b/src/acpica/source/components/events/evgpe.c > index ea1a3a6..16428d6 100644 > --- a/src/acpica/source/components/events/evgpe.c > +++ b/src/acpica/source/components/events/evgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -203,18 +203,6 @@ AcpiEvEnableGpe ( > ACPI_FUNCTION_TRACE (EvEnableGpe); > > > - /* > - * We will only allow a GPE to be enabled if it has either an associated > - * method (_Lxx/_Exx) or a handler, or is using the implicit notify > - * feature. Otherwise, the GPE will be immediately disabled by > - * AcpiEvGpeDispatch the first time it fires. > - */ > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_NONE) > - { > - return_ACPI_STATUS (AE_NO_HANDLER); > - } > - > /* Clear the GPE (of stale events) */ > > Status = AcpiHwClearGpe (GpeEventInfo); > @@ -225,7 +213,7 @@ AcpiEvEnableGpe ( > > /* Enable the requested GPE */ > > - Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); > + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE_SAVE); > return_ACPI_STATUS (Status); > } > > @@ -315,7 +303,7 @@ AcpiEvRemoveGpeReference ( > Status = AcpiEvUpdateGpeEnableMask (GpeEventInfo); > if (ACPI_SUCCESS (Status)) > { > - Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE); > + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE_SAVE); > } > > if (ACPI_FAILURE (Status)) > @@ -455,7 +443,11 @@ AcpiEvGpeDetect ( > { > ACPI_STATUS Status; > ACPI_GPE_BLOCK_INFO *GpeBlock; > + ACPI_NAMESPACE_NODE *GpeDevice; > ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; > + ACPI_GPE_EVENT_INFO *GpeEventInfo; > + UINT32 GpeNumber; > + ACPI_GPE_HANDLER_INFO *GpeHandlerInfo; > UINT32 IntStatus = ACPI_INTERRUPT_NOT_HANDLED; > UINT8 EnabledStatusByte; > UINT32 StatusReg; > @@ -486,6 +478,8 @@ AcpiEvGpeDetect ( > GpeBlock = GpeXruptList->GpeBlockListHead; > while (GpeBlock) > { > + GpeDevice = GpeBlock->Node; > + > /* > * Read all of the 8-bit GPE status and enable registers in this GPE > * block, saving all of them. Find all currently active GP events. > @@ -554,16 +548,55 @@ AcpiEvGpeDetect ( > { > /* Examine one GPE bit */ > > + GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * > + ACPI_GPE_REGISTER_WIDTH) + j]; > + GpeNumber = j + GpeRegisterInfo->BaseGpeNumber; > + > if (EnabledStatusByte & (1 << j)) > { > - /* > - * Found an active GPE. Dispatch the event to a handler > - * or method. > - */ > - IntStatus |= AcpiEvGpeDispatch (GpeBlock->Node, > - &GpeBlock->EventInfo[((ACPI_SIZE) i * > - ACPI_GPE_REGISTER_WIDTH) + j], > - j + GpeRegisterInfo->BaseGpeNumber); > + /* Invoke global event handler if present */ > + > + AcpiGpeCount++; > + if (AcpiGbl_GlobalEventHandler) > + { > + AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, > + GpeDevice, GpeNumber, > + AcpiGbl_GlobalEventHandlerContext); > + } > + > + /* Found an active GPE */ > + > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER) > + { > + /* Dispatch the event to a raw handler */ > + > + GpeHandlerInfo = GpeEventInfo->Dispatch.Handler; > + > + /* > + * There is no protection around the namespace node > + * and the GPE handler to ensure a safe destruction > + * because: > + * 1. The namespace node is expected to always > + * exist after loading a table. > + * 2. The GPE handler is expected to be flushed by > + * AcpiOsWaitEventsComplete() before the > + * destruction. > + */ > + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); > + IntStatus |= GpeHandlerInfo->Address ( > + GpeDevice, GpeNumber, GpeHandlerInfo->Context); > + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); > + } > + else > + { > + /* > + * Dispatch the event to a standard handler or > + * method. > + */ > + IntStatus |= AcpiEvGpeDispatch (GpeDevice, > + GpeEventInfo, GpeNumber); > + } > } > } > } > @@ -599,8 +632,7 @@ AcpiEvAsynchExecuteGpeMethod ( > void *Context) > { > ACPI_GPE_EVENT_INFO *GpeEventInfo = Context; > - ACPI_STATUS Status; > - ACPI_GPE_EVENT_INFO *LocalGpeEventInfo; > + ACPI_STATUS Status = AE_OK; > ACPI_EVALUATE_INFO *Info; > ACPI_GPE_NOTIFY_INFO *Notify; > > @@ -608,49 +640,9 @@ AcpiEvAsynchExecuteGpeMethod ( > ACPI_FUNCTION_TRACE (EvAsynchExecuteGpeMethod); > > > - /* Allocate a local GPE block */ > - > - LocalGpeEventInfo = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_EVENT_INFO)); > - if (!LocalGpeEventInfo) > - { > - ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, > - "while handling a GPE")); > - return_VOID; > - } > - > - Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); > - if (ACPI_FAILURE (Status)) > - { > - ACPI_FREE (LocalGpeEventInfo); > - return_VOID; > - } > - > - /* Must revalidate the GpeNumber/GpeBlock */ > - > - if (!AcpiEvValidGpeEvent (GpeEventInfo)) > - { > - Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS); > - ACPI_FREE (LocalGpeEventInfo); > - return_VOID; > - } > - > - /* > - * Take a snapshot of the GPE info for this level - we copy the info to > - * prevent a race condition with RemoveHandler/RemoveBlock. > - */ > - ACPI_MEMCPY (LocalGpeEventInfo, GpeEventInfo, > - sizeof (ACPI_GPE_EVENT_INFO)); > - > - Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS); > - if (ACPI_FAILURE (Status)) > - { > - ACPI_FREE (LocalGpeEventInfo); > - return_VOID; > - } > - > /* Do the correct dispatch - normal method or implicit notify */ > > - switch (LocalGpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) > + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) > { > case ACPI_GPE_DISPATCH_NOTIFY: > /* > @@ -664,7 +656,7 @@ AcpiEvAsynchExecuteGpeMethod ( > * June 2012: Expand implicit notify mechanism to support > * notifies on multiple device objects. > */ > - Notify = LocalGpeEventInfo->Dispatch.NotifyList; > + Notify = GpeEventInfo->Dispatch.NotifyList; > while (ACPI_SUCCESS (Status) && Notify) > { > Status = AcpiEvQueueNotifyRequest (Notify->DeviceNode, > @@ -689,7 +681,7 @@ AcpiEvAsynchExecuteGpeMethod ( > * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the > * _Lxx/_Exx control method that corresponds to this GPE > */ > - Info->PrefixNode = LocalGpeEventInfo->Dispatch.MethodNode; > + Info->PrefixNode = GpeEventInfo->Dispatch.MethodNode; > Info->Flags = ACPI_IGNORE_RETURN_VALUE; > > Status = AcpiNsEvaluate (Info); > @@ -700,23 +692,26 @@ AcpiEvAsynchExecuteGpeMethod ( > { > ACPI_EXCEPTION ((AE_INFO, Status, > "while evaluating GPE method [%4.4s]", > - AcpiUtGetNodeName (LocalGpeEventInfo->Dispatch.MethodNode))); > + AcpiUtGetNodeName (GpeEventInfo->Dispatch.MethodNode))); > } > break; > > default: > > - return_VOID; /* Should never happen */ > + goto ErrorExit; /* Should never happen */ > } > > /* Defer enabling of GPE until all notify handlers are done */ > > Status = AcpiOsExecute (OSL_NOTIFY_HANDLER, > - AcpiEvAsynchEnableGpe, LocalGpeEventInfo); > - if (ACPI_FAILURE (Status)) > + AcpiEvAsynchEnableGpe, GpeEventInfo); > + if (ACPI_SUCCESS (Status)) > { > - ACPI_FREE (LocalGpeEventInfo); > + return_VOID; > } > + > +ErrorExit: > + AcpiEvAsynchEnableGpe (GpeEventInfo); > return_VOID; > } > > @@ -740,11 +735,13 @@ AcpiEvAsynchEnableGpe ( > void *Context) > { > ACPI_GPE_EVENT_INFO *GpeEventInfo = Context; > + ACPI_CPU_FLAGS Flags; > > > + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); > (void) AcpiEvFinishGpe (GpeEventInfo); > + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); > > - ACPI_FREE (GpeEventInfo); > return; > } > > @@ -785,7 +782,7 @@ AcpiEvFinishGpe ( > > /* > * Enable this GPE, conditionally. This means that the GPE will > - * only be physically enabled if the EnableForRun bit is set > + * only be physically enabled if the EnableMask bit is set > * in the EventInfo. > */ > (void) AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_CONDITIONAL_ENABLE); > @@ -823,15 +820,6 @@ AcpiEvGpeDispatch ( > ACPI_FUNCTION_TRACE (EvGpeDispatch); > > > - /* Invoke global event handler if present */ > - > - AcpiGpeCount++; > - if (AcpiGbl_GlobalEventHandler) > - { > - AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, GpeDevice, > - GpeNumber, AcpiGbl_GlobalEventHandlerContext); > - } > - > /* > * Always disable the GPE so that it does not keep firing before > * any asynchronous activity completes (either from the execution > @@ -874,7 +862,7 @@ AcpiEvGpeDispatch ( > * If there is neither a handler nor a method, leave the GPE > * disabled. > */ > - switch (GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) > + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) > { > case ACPI_GPE_DISPATCH_HANDLER: > > diff --git a/src/acpica/source/components/events/evgpeblk.c b/src/acpica/source/components/events/evgpeblk.c > index 4de91c1..e067457 100644 > --- a/src/acpica/source/components/events/evgpeblk.c > +++ b/src/acpica/source/components/events/evgpeblk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -590,8 +590,9 @@ AcpiEvInitializeGpeBlock ( > * Ignore GPEs that have no corresponding _Lxx/_Exx method > * and GPEs that are used to wake the system > */ > - if (((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == ACPI_GPE_DISPATCH_NONE) || > - ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == ACPI_GPE_DISPATCH_HANDLER) || > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NONE) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_RAW_HANDLER) || > (GpeEventInfo->Flags & ACPI_GPE_CAN_WAKE)) > { > continue; > diff --git a/src/acpica/source/components/events/evgpeinit.c b/src/acpica/source/components/events/evgpeinit.c > index 237a96c..5848b75 100644 > --- a/src/acpica/source/components/events/evgpeinit.c > +++ b/src/acpica/source/components/events/evgpeinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -491,15 +491,17 @@ AcpiEvMatchGpeMethod ( > return_ACPI_STATUS (AE_OK); > } > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > /* If there is already a handler, ignore this GPE method */ > > return_ACPI_STATUS (AE_OK); > } > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_METHOD) > { > /* > diff --git a/src/acpica/source/components/events/evgpeutil.c b/src/acpica/source/components/events/evgpeutil.c > index 0410bae..f204bba 100644 > --- a/src/acpica/source/components/events/evgpeutil.c > +++ b/src/acpica/source/components/events/evgpeutil.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -187,60 +187,6 @@ UnlockAndExit: > > /******************************************************************************* > * > - * FUNCTION: AcpiEvValidGpeEvent > - * > - * PARAMETERS: GpeEventInfo - Info for this GPE > - * > - * RETURN: TRUE if the GpeEvent is valid > - * > - * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL. > - * Should be called only when the GPE lists are semaphore locked > - * and not subject to change. > - * > - ******************************************************************************/ > - > -BOOLEAN > -AcpiEvValidGpeEvent ( > - ACPI_GPE_EVENT_INFO *GpeEventInfo) > -{ > - ACPI_GPE_XRUPT_INFO *GpeXruptBlock; > - ACPI_GPE_BLOCK_INFO *GpeBlock; > - > - > - ACPI_FUNCTION_ENTRY (); > - > - > - /* No need for spin lock since we are not changing any list elements */ > - > - /* Walk the GPE interrupt levels */ > - > - GpeXruptBlock = AcpiGbl_GpeXruptListHead; > - while (GpeXruptBlock) > - { > - GpeBlock = GpeXruptBlock->GpeBlockListHead; > - > - /* Walk the GPE blocks on this interrupt level */ > - > - while (GpeBlock) > - { > - if ((&GpeBlock->EventInfo[0] <= GpeEventInfo) && > - (&GpeBlock->EventInfo[GpeBlock->GpeCount] > GpeEventInfo)) > - { > - return (TRUE); > - } > - > - GpeBlock = GpeBlock->Next; > - } > - > - GpeXruptBlock = GpeXruptBlock->Next; > - } > - > - return (FALSE); > -} > - > - > -/******************************************************************************* > - * > * FUNCTION: AcpiEvGetGpeDevice > * > * PARAMETERS: GPE_WALK_CALLBACK > @@ -488,8 +434,10 @@ AcpiEvDeleteGpeHandlers ( > GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * > ACPI_GPE_REGISTER_WIDTH) + j]; > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > /* Delete an installed handler block */ > > @@ -497,7 +445,7 @@ AcpiEvDeleteGpeHandlers ( > GpeEventInfo->Dispatch.Handler = NULL; > GpeEventInfo->Flags &= ~ACPI_GPE_DISPATCH_MASK; > } > - else if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + else if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NOTIFY) > { > /* Delete the implicit notification device list */ > diff --git a/src/acpica/source/components/events/evhandler.c b/src/acpica/source/components/events/evhandler.c > index b67ba3e..d02ea53 100644 > --- a/src/acpica/source/components/events/evhandler.c > +++ b/src/acpica/source/components/events/evhandler.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evmisc.c b/src/acpica/source/components/events/evmisc.c > index 8b2c3ff..1735038 100644 > --- a/src/acpica/source/components/events/evmisc.c > +++ b/src/acpica/source/components/events/evmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evregion.c b/src/acpica/source/components/events/evregion.c > index ec681da..bd0fd7b 100644 > --- a/src/acpica/source/components/events/evregion.c > +++ b/src/acpica/source/components/events/evregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evrgnini.c b/src/acpica/source/components/events/evrgnini.c > index d439c31..405af22 100644 > --- a/src/acpica/source/components/events/evrgnini.c > +++ b/src/acpica/source/components/events/evrgnini.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evsci.c b/src/acpica/source/components/events/evsci.c > index ec6c1c1..987b03c 100644 > --- a/src/acpica/source/components/events/evsci.c > +++ b/src/acpica/source/components/events/evsci.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxface.c b/src/acpica/source/components/events/evxface.c > index 9b8a1ce..5e3391d 100644 > --- a/src/acpica/source/components/events/evxface.c > +++ b/src/acpica/source/components/events/evxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -124,6 +124,21 @@ > #define _COMPONENT ACPI_EVENTS > ACPI_MODULE_NAME ("evxface") > > +#if (!ACPI_REDUCED_HARDWARE) > + > +/* Local prototypes */ > + > +static ACPI_STATUS > +AcpiEvInstallGpeHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + BOOLEAN IsRawHandler, > + ACPI_GPE_HANDLER Address, > + void *Context); > + > +#endif > + > > /******************************************************************************* > * > @@ -894,27 +909,31 @@ ACPI_EXPORT_SYMBOL (AcpiRemoveFixedEventHandler) > > /******************************************************************************* > * > - * FUNCTION: AcpiInstallGpeHandler > + * FUNCTION: AcpiEvInstallGpeHandler > * > * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > * defined GPEs) > * GpeNumber - The GPE number within the GPE block > * Type - Whether this GPE should be treated as an > * edge- or level-triggered interrupt. > + * IsRawHandler - Whether this GPE should be handled using > + * the special GPE handler mode. > * Address - Address of the handler > * Context - Value passed to the handler on each GPE > * > * RETURN: Status > * > - * DESCRIPTION: Install a handler for a General Purpose Event. > + * DESCRIPTION: Internal function to install a handler for a General Purpose > + * Event. > * > ******************************************************************************/ > > -ACPI_STATUS > -AcpiInstallGpeHandler ( > +static ACPI_STATUS > +AcpiEvInstallGpeHandler ( > ACPI_HANDLE GpeDevice, > UINT32 GpeNumber, > UINT32 Type, > + BOOLEAN IsRawHandler, > ACPI_GPE_HANDLER Address, > void *Context) > { > @@ -924,7 +943,7 @@ AcpiInstallGpeHandler ( > ACPI_CPU_FLAGS Flags; > > > - ACPI_FUNCTION_TRACE (AcpiInstallGpeHandler); > + ACPI_FUNCTION_TRACE (EvInstallGpeHandler); > > > /* Parameter validation */ > @@ -962,8 +981,10 @@ AcpiInstallGpeHandler ( > > /* Make sure that there isn't a handler there already */ > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_HANDLER) || > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > Status = AE_ALREADY_EXISTS; > goto FreeAndExit; > @@ -980,8 +1001,10 @@ AcpiInstallGpeHandler ( > * automatically during initialization, in which case it has to be > * disabled now to avoid spurious execution of the handler. > */ > - if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) || > - (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) && > + if (((ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_METHOD) || > + (ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_NOTIFY)) && > GpeEventInfo->RuntimeCount) > { > Handler->OriginallyEnabled = TRUE; > @@ -1002,7 +1025,8 @@ AcpiInstallGpeHandler ( > /* Setup up dispatch flags to indicate handler (vs. method/notify) */ > > GpeEventInfo->Flags &= ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK); > - GpeEventInfo->Flags |= (UINT8) (Type | ACPI_GPE_DISPATCH_HANDLER); > + GpeEventInfo->Flags |= (UINT8) (Type | (IsRawHandler ? > + ACPI_GPE_DISPATCH_RAW_HANDLER : ACPI_GPE_DISPATCH_HANDLER)); > > AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); > > @@ -1017,11 +1041,91 @@ FreeAndExit: > goto UnlockAndExit; > } > > + > +/******************************************************************************* > + * > + * FUNCTION: AcpiInstallGpeHandler > + * > + * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > + * defined GPEs) > + * GpeNumber - The GPE number within the GPE block > + * Type - Whether this GPE should be treated as an > + * edge- or level-triggered interrupt. > + * Address - Address of the handler > + * Context - Value passed to the handler on each GPE > + * > + * RETURN: Status > + * > + * DESCRIPTION: Install a handler for a General Purpose Event. > + * > + ******************************************************************************/ > + > +ACPI_STATUS > +AcpiInstallGpeHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + ACPI_GPE_HANDLER Address, > + void *Context) > +{ > + ACPI_STATUS Status; > + > + > + ACPI_FUNCTION_TRACE (AcpiInstallGpeHandler); > + > + > + Status = AcpiEvInstallGpeHandler (GpeDevice, GpeNumber, Type, FALSE, > + Address, Context); > + > + return_ACPI_STATUS (Status); > +} > + > ACPI_EXPORT_SYMBOL (AcpiInstallGpeHandler) > > > /******************************************************************************* > * > + * FUNCTION: AcpiInstallGpeRawHandler > + * > + * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > + * defined GPEs) > + * GpeNumber - The GPE number within the GPE block > + * Type - Whether this GPE should be treated as an > + * edge- or level-triggered interrupt. > + * Address - Address of the handler > + * Context - Value passed to the handler on each GPE > + * > + * RETURN: Status > + * > + * DESCRIPTION: Install a handler for a General Purpose Event. > + * > + ******************************************************************************/ > + > +ACPI_STATUS > +AcpiInstallGpeRawHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + ACPI_GPE_HANDLER Address, > + void *Context) > +{ > + ACPI_STATUS Status; > + > + > + ACPI_FUNCTION_TRACE (AcpiInstallGpeRawHandler); > + > + > + Status = AcpiEvInstallGpeHandler (GpeDevice, GpeNumber, Type, TRUE, > + Address, Context); > + > + return_ACPI_STATUS (Status); > +} > + > +ACPI_EXPORT_SYMBOL (AcpiInstallGpeRawHandler) > + > + > +/******************************************************************************* > + * > * FUNCTION: AcpiRemoveGpeHandler > * > * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT > @@ -1076,8 +1180,10 @@ AcpiRemoveGpeHandler ( > > /* Make sure that a handler is indeed installed */ > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != > - ACPI_GPE_DISPATCH_HANDLER) > + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > + ACPI_GPE_DISPATCH_HANDLER) && > + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > + ACPI_GPE_DISPATCH_RAW_HANDLER)) > { > Status = AE_NOT_EXIST; > goto UnlockAndExit; > @@ -1094,6 +1200,7 @@ AcpiRemoveGpeHandler ( > /* Remove the handler */ > > Handler = GpeEventInfo->Dispatch.Handler; > + GpeEventInfo->Dispatch.Handler = NULL; > > /* Restore Method node (if any), set dispatch flags */ > > @@ -1107,8 +1214,10 @@ AcpiRemoveGpeHandler ( > * enabled, it should be enabled at this point to restore the > * post-initialization configuration. > */ > - if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) || > - (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) && > + if (((ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_METHOD) || > + (ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == > + ACPI_GPE_DISPATCH_NOTIFY)) && > Handler->OriginallyEnabled) > { > (void) AcpiEvAddGpeReference (GpeEventInfo); > diff --git a/src/acpica/source/components/events/evxfevnt.c b/src/acpica/source/components/events/evxfevnt.c > index caa3810..426a0be 100644 > --- a/src/acpica/source/components/events/evxfevnt.c > +++ b/src/acpica/source/components/events/evxfevnt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxfgpe.c b/src/acpica/source/components/events/evxfgpe.c > index 5da1775..f4f0da1 100644 > --- a/src/acpica/source/components/events/evxfgpe.c > +++ b/src/acpica/source/components/events/evxfgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -219,7 +219,7 @@ AcpiEnableGpe ( > GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber); > if (GpeEventInfo) > { > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > ACPI_GPE_DISPATCH_NONE) > { > Status = AcpiEvAddGpeReference (GpeEventInfo); > @@ -293,12 +293,21 @@ ACPI_EXPORT_SYMBOL (AcpiDisableGpe) > * RETURN: Status > * > * DESCRIPTION: Enable or disable an individual GPE. This function bypasses > - * the reference count mechanism used in the AcpiEnableGpe and > - * AcpiDisableGpe interfaces -- and should be used with care. > - * > - * Note: Typically used to disable a runtime GPE for short period of time, > - * then re-enable it, without disturbing the existing reference counts. This > - * is useful, for example, in the Embedded Controller (EC) driver. > + * the reference count mechanism used in the AcpiEnableGpe(), > + * AcpiDisableGpe() interfaces. > + * This API is typically used by the GPE raw handler mode driver > + * to switch between the polling mode and the interrupt mode after > + * the driver has enabled the GPE. > + * The APIs should be invoked in this order: > + * AcpiEnableGpe() <- Ensure the reference count > 0 > + * AcpiSetGpe(ACPI_GPE_DISABLE) <- Enter polling mode > + * AcpiSetGpe(ACPI_GPE_ENABLE) <- Leave polling mode > + * AcpiDisableGpe() <- Decrease the reference count > + * > + * Note: If a GPE is shared by 2 silicon components, then both the drivers > + * should support GPE polling mode or disabling the GPE for long period > + * for one driver may break the other. So use it with care since all > + * firmware _Lxx/_Exx handlers currently rely on the GPE interrupt mode. > * > ******************************************************************************/ > > @@ -333,7 +342,7 @@ AcpiSetGpe ( > { > case ACPI_GPE_ENABLE: > > - Status = AcpiEvEnableGpe (GpeEventInfo); > + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); > break; > > case ACPI_GPE_DISABLE: > @@ -502,7 +511,7 @@ AcpiSetupGpeForWake ( > * known as an "implicit notify". Note: The GPE is assumed to be > * level-triggered (for windows compatibility). > */ > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NONE) > { > /* > @@ -517,7 +526,7 @@ AcpiSetupGpeForWake ( > * If we already have an implicit notify on this GPE, add > * this device to the notify list. > */ > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == > ACPI_GPE_DISPATCH_NOTIFY) > { > /* Ensure that the device is not already in the list */ > @@ -874,6 +883,44 @@ AcpiEnableAllRuntimeGpes ( > ACPI_EXPORT_SYMBOL (AcpiEnableAllRuntimeGpes) > > > +/****************************************************************************** > + * > + * FUNCTION: AcpiEnableAllWakeupGpes > + * > + * PARAMETERS: None > + * > + * RETURN: Status > + * > + * DESCRIPTION: Enable all "wakeup" GPEs and disable all of the other GPEs, in > + * all GPE blocks. > + * > + ******************************************************************************/ > + > +ACPI_STATUS > +AcpiEnableAllWakeupGpes ( > + void) > +{ > + ACPI_STATUS Status; > + > + > + ACPI_FUNCTION_TRACE (AcpiEnableAllWakeupGpes); > + > + > + Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); > + if (ACPI_FAILURE (Status)) > + { > + return_ACPI_STATUS (Status); > + } > + > + Status = AcpiHwEnableAllWakeupGpes (); > + (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS); > + > + return_ACPI_STATUS (Status); > +} > + > +ACPI_EXPORT_SYMBOL (AcpiEnableAllWakeupGpes) > + > + > /******************************************************************************* > * > * FUNCTION: AcpiInstallGpeBlock > diff --git a/src/acpica/source/components/events/evxfregn.c b/src/acpica/source/components/events/evxfregn.c > index a305e3f..e220676 100644 > --- a/src/acpica/source/components/events/evxfregn.c > +++ b/src/acpica/source/components/events/evxfregn.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exconfig.c b/src/acpica/source/components/executer/exconfig.c > index 2fd6e36..c311a69 100644 > --- a/src/acpica/source/components/executer/exconfig.c > +++ b/src/acpica/source/components/executer/exconfig.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exconvrt.c b/src/acpica/source/components/executer/exconvrt.c > index 00f0310..1cf54e2 100644 > --- a/src/acpica/source/components/executer/exconvrt.c > +++ b/src/acpica/source/components/executer/exconvrt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/excreate.c b/src/acpica/source/components/executer/excreate.c > index 90a389a..90a3632 100644 > --- a/src/acpica/source/components/executer/excreate.c > +++ b/src/acpica/source/components/executer/excreate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exdebug.c b/src/acpica/source/components/executer/exdebug.c > index eb1daad..64fef55 100644 > --- a/src/acpica/source/components/executer/exdebug.c > +++ b/src/acpica/source/components/executer/exdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exdump.c b/src/acpica/source/components/executer/exdump.c > index 4d6a186..8d318a0 100644 > --- a/src/acpica/source/components/executer/exdump.c > +++ b/src/acpica/source/components/executer/exdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exfield.c b/src/acpica/source/components/executer/exfield.c > index e33f82c..3083985 100644 > --- a/src/acpica/source/components/executer/exfield.c > +++ b/src/acpica/source/components/executer/exfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exfldio.c b/src/acpica/source/components/executer/exfldio.c > index e29ae66..3e6b18f 100644 > --- a/src/acpica/source/components/executer/exfldio.c > +++ b/src/acpica/source/components/executer/exfldio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exmisc.c b/src/acpica/source/components/executer/exmisc.c > index 94053d5..d92b271 100644 > --- a/src/acpica/source/components/executer/exmisc.c > +++ b/src/acpica/source/components/executer/exmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exmutex.c b/src/acpica/source/components/executer/exmutex.c > index 962b9c1..c688a50 100644 > --- a/src/acpica/source/components/executer/exmutex.c > +++ b/src/acpica/source/components/executer/exmutex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exnames.c b/src/acpica/source/components/executer/exnames.c > index 67f7930..b402d3b 100644 > --- a/src/acpica/source/components/executer/exnames.c > +++ b/src/acpica/source/components/executer/exnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg1.c b/src/acpica/source/components/executer/exoparg1.c > index 8ce7610..c7addbd 100644 > --- a/src/acpica/source/components/executer/exoparg1.c > +++ b/src/acpica/source/components/executer/exoparg1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg2.c b/src/acpica/source/components/executer/exoparg2.c > index 2519dca..399b259 100644 > --- a/src/acpica/source/components/executer/exoparg2.c > +++ b/src/acpica/source/components/executer/exoparg2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg3.c b/src/acpica/source/components/executer/exoparg3.c > index 4e6842b..507720f 100644 > --- a/src/acpica/source/components/executer/exoparg3.c > +++ b/src/acpica/source/components/executer/exoparg3.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg6.c b/src/acpica/source/components/executer/exoparg6.c > index 9cd26e0..a7d76d6 100644 > --- a/src/acpica/source/components/executer/exoparg6.c > +++ b/src/acpica/source/components/executer/exoparg6.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exprep.c b/src/acpica/source/components/executer/exprep.c > index dc764bb..d84ccc3 100644 > --- a/src/acpica/source/components/executer/exprep.c > +++ b/src/acpica/source/components/executer/exprep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exregion.c b/src/acpica/source/components/executer/exregion.c > index 544412e..5b66ffa 100644 > --- a/src/acpica/source/components/executer/exregion.c > +++ b/src/acpica/source/components/executer/exregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresnte.c b/src/acpica/source/components/executer/exresnte.c > index 7640a01..d72ec55 100644 > --- a/src/acpica/source/components/executer/exresnte.c > +++ b/src/acpica/source/components/executer/exresnte.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresolv.c b/src/acpica/source/components/executer/exresolv.c > index 35bb6bb..e874342 100644 > --- a/src/acpica/source/components/executer/exresolv.c > +++ b/src/acpica/source/components/executer/exresolv.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresop.c b/src/acpica/source/components/executer/exresop.c > index 6dc28aa..fab4993 100644 > --- a/src/acpica/source/components/executer/exresop.c > +++ b/src/acpica/source/components/executer/exresop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstore.c b/src/acpica/source/components/executer/exstore.c > index cf47621..47c212d 100644 > --- a/src/acpica/source/components/executer/exstore.c > +++ b/src/acpica/source/components/executer/exstore.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstoren.c b/src/acpica/source/components/executer/exstoren.c > index 82944c5..c1879b4 100644 > --- a/src/acpica/source/components/executer/exstoren.c > +++ b/src/acpica/source/components/executer/exstoren.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstorob.c b/src/acpica/source/components/executer/exstorob.c > index f36e9fc..48c3440 100644 > --- a/src/acpica/source/components/executer/exstorob.c > +++ b/src/acpica/source/components/executer/exstorob.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exsystem.c b/src/acpica/source/components/executer/exsystem.c > index 0bce72a..49ec2e9 100644 > --- a/src/acpica/source/components/executer/exsystem.c > +++ b/src/acpica/source/components/executer/exsystem.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exutils.c b/src/acpica/source/components/executer/exutils.c > index 63bfb84..b432cba 100644 > --- a/src/acpica/source/components/executer/exutils.c > +++ b/src/acpica/source/components/executer/exutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwacpi.c b/src/acpica/source/components/hardware/hwacpi.c > index 0dff876..0530383 100644 > --- a/src/acpica/source/components/hardware/hwacpi.c > +++ b/src/acpica/source/components/hardware/hwacpi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwesleep.c b/src/acpica/source/components/hardware/hwesleep.c > index 0dab77a..ba8acdc 100644 > --- a/src/acpica/source/components/hardware/hwesleep.c > +++ b/src/acpica/source/components/hardware/hwesleep.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwgpe.c b/src/acpica/source/components/hardware/hwgpe.c > index 0125685..d39b7ac 100644 > --- a/src/acpica/source/components/hardware/hwgpe.c > +++ b/src/acpica/source/components/hardware/hwgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -130,6 +130,11 @@ AcpiHwEnableWakeupGpeBlock ( > ACPI_GPE_BLOCK_INFO *GpeBlock, > void *Context); > > +static ACPI_STATUS > +AcpiHwGpeEnableWrite ( > + UINT8 EnableMask, > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo); > + > > /****************************************************************************** > * > @@ -200,13 +205,13 @@ AcpiHwLowSetGpe ( > /* Set or clear just the bit that corresponds to this GPE */ > > RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); > - switch (Action) > + switch (Action & ~ACPI_GPE_SAVE_MASK) > { > case ACPI_GPE_CONDITIONAL_ENABLE: > > - /* Only enable if the EnableForRun bit is set */ > + /* Only enable if the corresponding EnableMask bit is set */ > > - if (!(RegisterBit & GpeRegisterInfo->EnableForRun)) > + if (!(RegisterBit & GpeRegisterInfo->EnableMask)) > { > return (AE_BAD_PARAMETER); > } > @@ -232,6 +237,10 @@ AcpiHwLowSetGpe ( > /* Write the updated enable mask */ > > Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress); > + if (ACPI_SUCCESS (Status) && (Action & ACPI_GPE_SAVE_MASK)) > + { > + GpeRegisterInfo->EnableMask = (UINT8) EnableMask; > + } > return (Status); > } > > @@ -315,7 +324,7 @@ AcpiHwGetGpeStatus ( > > /* GPE currently handled? */ > > - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != > + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != > ACPI_GPE_DISPATCH_NONE) > { > LocalEventStatus |= ACPI_EVENT_FLAG_HAS_HANDLER; > @@ -365,6 +374,37 @@ AcpiHwGetGpeStatus ( > > /****************************************************************************** > * > + * FUNCTION: AcpiHwGpeEnableWrite > + * > + * PARAMETERS: EnableMask - Bit mask to write to the GPE register > + * GpeRegisterInfo - Gpe Register info > + * > + * RETURN: Status > + * > + * DESCRIPTION: Write the enable mask byte to the given GPE register. > + * > + ******************************************************************************/ > + > +static ACPI_STATUS > +AcpiHwGpeEnableWrite ( > + UINT8 EnableMask, > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo) > +{ > + ACPI_STATUS Status; > + > + > + Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress); > + if (ACPI_SUCCESS (Status)) > + { > + GpeRegisterInfo->EnableMask = EnableMask; > + } > + > + return (Status); > +} > + > + > +/****************************************************************************** > + * > * FUNCTION: AcpiHwDisableGpeBlock > * > * PARAMETERS: GpeXruptInfo - GPE Interrupt info > @@ -392,7 +432,7 @@ AcpiHwDisableGpeBlock ( > { > /* Disable all GPEs in this register */ > > - Status = AcpiHwWrite (0x00, &GpeBlock->RegisterInfo[i].EnableAddress); > + Status = AcpiHwGpeEnableWrite (0x00, &GpeBlock->RegisterInfo[i]); > if (ACPI_FAILURE (Status)) > { > return (Status); > @@ -465,6 +505,7 @@ AcpiHwEnableRuntimeGpeBlock ( > { > UINT32 i; > ACPI_STATUS Status; > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; > > > /* NOTE: assumes that all GPEs are currently disabled */ > @@ -473,15 +514,16 @@ AcpiHwEnableRuntimeGpeBlock ( > > for (i = 0; i < GpeBlock->RegisterCount; i++) > { > - if (!GpeBlock->RegisterInfo[i].EnableForRun) > + GpeRegisterInfo = &GpeBlock->RegisterInfo[i]; > + if (!GpeRegisterInfo->EnableForRun) > { > continue; > } > > /* Enable all "runtime" GPEs in this register */ > > - Status = AcpiHwWrite (GpeBlock->RegisterInfo[i].EnableForRun, > - &GpeBlock->RegisterInfo[i].EnableAddress); > + Status = AcpiHwGpeEnableWrite (GpeRegisterInfo->EnableForRun, > + GpeRegisterInfo); > if (ACPI_FAILURE (Status)) > { > return (Status); > @@ -514,21 +556,21 @@ AcpiHwEnableWakeupGpeBlock ( > { > UINT32 i; > ACPI_STATUS Status; > + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; > > > /* Examine each GPE Register within the block */ > > for (i = 0; i < GpeBlock->RegisterCount; i++) > { > - if (!GpeBlock->RegisterInfo[i].EnableForWake) > - { > - continue; > - } > - > - /* Enable all "wake" GPEs in this register */ > - > - Status = AcpiHwWrite (GpeBlock->RegisterInfo[i].EnableForWake, > - &GpeBlock->RegisterInfo[i].EnableAddress); > + GpeRegisterInfo = &GpeBlock->RegisterInfo[i]; > + > + /* > + * Enable all "wake" GPEs in this register and disable the > + * remaining ones. > + */ > + Status = AcpiHwGpeEnableWrite (GpeRegisterInfo->EnableForWake, > + GpeRegisterInfo); > if (ACPI_FAILURE (Status)) > { > return (Status); > diff --git a/src/acpica/source/components/hardware/hwpci.c b/src/acpica/source/components/hardware/hwpci.c > index 4470b5c..da7674c 100644 > --- a/src/acpica/source/components/hardware/hwpci.c > +++ b/src/acpica/source/components/hardware/hwpci.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwregs.c b/src/acpica/source/components/hardware/hwregs.c > index 7df29fd..492833e 100644 > --- a/src/acpica/source/components/hardware/hwregs.c > +++ b/src/acpica/source/components/hardware/hwregs.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwsleep.c b/src/acpica/source/components/hardware/hwsleep.c > index 4501598..6438ea7 100644 > --- a/src/acpica/source/components/hardware/hwsleep.c > +++ b/src/acpica/source/components/hardware/hwsleep.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwvalid.c b/src/acpica/source/components/hardware/hwvalid.c > index dbbb3bb..410c42c 100644 > --- a/src/acpica/source/components/hardware/hwvalid.c > +++ b/src/acpica/source/components/hardware/hwvalid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwxface.c b/src/acpica/source/components/hardware/hwxface.c > index 4687ae1..12c4ffb 100644 > --- a/src/acpica/source/components/hardware/hwxface.c > +++ b/src/acpica/source/components/hardware/hwxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwxfsleep.c b/src/acpica/source/components/hardware/hwxfsleep.c > index db64da6..2c7066b 100644 > --- a/src/acpica/source/components/hardware/hwxfsleep.c > +++ b/src/acpica/source/components/hardware/hwxfsleep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsaccess.c b/src/acpica/source/components/namespace/nsaccess.c > index 37f6913..58d56e5 100644 > --- a/src/acpica/source/components/namespace/nsaccess.c > +++ b/src/acpica/source/components/namespace/nsaccess.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsalloc.c b/src/acpica/source/components/namespace/nsalloc.c > index c4a08cd..293bf26 100644 > --- a/src/acpica/source/components/namespace/nsalloc.c > +++ b/src/acpica/source/components/namespace/nsalloc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsarguments.c b/src/acpica/source/components/namespace/nsarguments.c > index 792cd59..08e0716 100644 > --- a/src/acpica/source/components/namespace/nsarguments.c > +++ b/src/acpica/source/components/namespace/nsarguments.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsconvert.c b/src/acpica/source/components/namespace/nsconvert.c > index 7226917..be20f43 100644 > --- a/src/acpica/source/components/namespace/nsconvert.c > +++ b/src/acpica/source/components/namespace/nsconvert.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsdump.c b/src/acpica/source/components/namespace/nsdump.c > index 5631cab..3d0e596 100644 > --- a/src/acpica/source/components/namespace/nsdump.c > +++ b/src/acpica/source/components/namespace/nsdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsdumpdv.c b/src/acpica/source/components/namespace/nsdumpdv.c > index 8510eb2..8e570d1 100644 > --- a/src/acpica/source/components/namespace/nsdumpdv.c > +++ b/src/acpica/source/components/namespace/nsdumpdv.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nseval.c b/src/acpica/source/components/namespace/nseval.c > index 2f32e5e..b6d662b 100644 > --- a/src/acpica/source/components/namespace/nseval.c > +++ b/src/acpica/source/components/namespace/nseval.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsinit.c b/src/acpica/source/components/namespace/nsinit.c > index 2c4db99..279b409 100644 > --- a/src/acpica/source/components/namespace/nsinit.c > +++ b/src/acpica/source/components/namespace/nsinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsload.c b/src/acpica/source/components/namespace/nsload.c > index e15e6a4..590be03 100644 > --- a/src/acpica/source/components/namespace/nsload.c > +++ b/src/acpica/source/components/namespace/nsload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsnames.c b/src/acpica/source/components/namespace/nsnames.c > index 2dc5d7b..2c7d9b9 100644 > --- a/src/acpica/source/components/namespace/nsnames.c > +++ b/src/acpica/source/components/namespace/nsnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsobject.c b/src/acpica/source/components/namespace/nsobject.c > index 7a0d8ef..50b1d65 100644 > --- a/src/acpica/source/components/namespace/nsobject.c > +++ b/src/acpica/source/components/namespace/nsobject.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsparse.c b/src/acpica/source/components/namespace/nsparse.c > index f880207..da137e8 100644 > --- a/src/acpica/source/components/namespace/nsparse.c > +++ b/src/acpica/source/components/namespace/nsparse.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nspredef.c b/src/acpica/source/components/namespace/nspredef.c > index 820710d..8a522d2 100644 > --- a/src/acpica/source/components/namespace/nspredef.c > +++ b/src/acpica/source/components/namespace/nspredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsprepkg.c b/src/acpica/source/components/namespace/nsprepkg.c > index b44d12b..085ccd2 100644 > --- a/src/acpica/source/components/namespace/nsprepkg.c > +++ b/src/acpica/source/components/namespace/nsprepkg.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsrepair.c b/src/acpica/source/components/namespace/nsrepair.c > index cf3c411..736933a 100644 > --- a/src/acpica/source/components/namespace/nsrepair.c > +++ b/src/acpica/source/components/namespace/nsrepair.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsrepair2.c b/src/acpica/source/components/namespace/nsrepair2.c > index ffba457..3300819 100644 > --- a/src/acpica/source/components/namespace/nsrepair2.c > +++ b/src/acpica/source/components/namespace/nsrepair2.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nssearch.c b/src/acpica/source/components/namespace/nssearch.c > index 9169866..81cac95 100644 > --- a/src/acpica/source/components/namespace/nssearch.c > +++ b/src/acpica/source/components/namespace/nssearch.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsutils.c b/src/acpica/source/components/namespace/nsutils.c > index b237390..220c447 100644 > --- a/src/acpica/source/components/namespace/nsutils.c > +++ b/src/acpica/source/components/namespace/nsutils.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nswalk.c b/src/acpica/source/components/namespace/nswalk.c > index bcbed65..aa23760 100644 > --- a/src/acpica/source/components/namespace/nswalk.c > +++ b/src/acpica/source/components/namespace/nswalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfeval.c b/src/acpica/source/components/namespace/nsxfeval.c > index 5425a54..7e23365 100644 > --- a/src/acpica/source/components/namespace/nsxfeval.c > +++ b/src/acpica/source/components/namespace/nsxfeval.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfname.c b/src/acpica/source/components/namespace/nsxfname.c > index f45a2bd..4c71e37 100644 > --- a/src/acpica/source/components/namespace/nsxfname.c > +++ b/src/acpica/source/components/namespace/nsxfname.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfobj.c b/src/acpica/source/components/namespace/nsxfobj.c > index 763e044..2ca409f 100644 > --- a/src/acpica/source/components/namespace/nsxfobj.c > +++ b/src/acpica/source/components/namespace/nsxfobj.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psargs.c b/src/acpica/source/components/parser/psargs.c > index ad86a1f..2453ab1 100644 > --- a/src/acpica/source/components/parser/psargs.c > +++ b/src/acpica/source/components/parser/psargs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psloop.c b/src/acpica/source/components/parser/psloop.c > index cf52d5f..d75ac83 100644 > --- a/src/acpica/source/components/parser/psloop.c > +++ b/src/acpica/source/components/parser/psloop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psobject.c b/src/acpica/source/components/parser/psobject.c > index 705aa6c..a236ff5 100644 > --- a/src/acpica/source/components/parser/psobject.c > +++ b/src/acpica/source/components/parser/psobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psopcode.c b/src/acpica/source/components/parser/psopcode.c > index 40243a5..1f94916 100644 > --- a/src/acpica/source/components/parser/psopcode.c > +++ b/src/acpica/source/components/parser/psopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psopinfo.c b/src/acpica/source/components/parser/psopinfo.c > index 198d9a3..a059b74 100644 > --- a/src/acpica/source/components/parser/psopinfo.c > +++ b/src/acpica/source/components/parser/psopinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psparse.c b/src/acpica/source/components/parser/psparse.c > index afbcc62..71c3fa0 100644 > --- a/src/acpica/source/components/parser/psparse.c > +++ b/src/acpica/source/components/parser/psparse.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psscope.c b/src/acpica/source/components/parser/psscope.c > index 3c0fb90..f44ea48 100644 > --- a/src/acpica/source/components/parser/psscope.c > +++ b/src/acpica/source/components/parser/psscope.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/pstree.c b/src/acpica/source/components/parser/pstree.c > index fc2477b..392204e 100644 > --- a/src/acpica/source/components/parser/pstree.c > +++ b/src/acpica/source/components/parser/pstree.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psutils.c b/src/acpica/source/components/parser/psutils.c > index bce4010..328ff5b 100644 > --- a/src/acpica/source/components/parser/psutils.c > +++ b/src/acpica/source/components/parser/psutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/pswalk.c b/src/acpica/source/components/parser/pswalk.c > index 1605428..a447970 100644 > --- a/src/acpica/source/components/parser/pswalk.c > +++ b/src/acpica/source/components/parser/pswalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psxface.c b/src/acpica/source/components/parser/psxface.c > index 8930af0..09833b6 100644 > --- a/src/acpica/source/components/parser/psxface.c > +++ b/src/acpica/source/components/parser/psxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsaddr.c b/src/acpica/source/components/resources/rsaddr.c > index 9c7f2aa..583f3ef 100644 > --- a/src/acpica/source/components/resources/rsaddr.c > +++ b/src/acpica/source/components/resources/rsaddr.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rscalc.c b/src/acpica/source/components/resources/rscalc.c > index 2b6a4f9..33a438e 100644 > --- a/src/acpica/source/components/resources/rscalc.c > +++ b/src/acpica/source/components/resources/rscalc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rscreate.c b/src/acpica/source/components/resources/rscreate.c > index deaaba5..dd430ef 100644 > --- a/src/acpica/source/components/resources/rscreate.c > +++ b/src/acpica/source/components/resources/rscreate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsdump.c b/src/acpica/source/components/resources/rsdump.c > index 34b4abf..0d3d2b7 100644 > --- a/src/acpica/source/components/resources/rsdump.c > +++ b/src/acpica/source/components/resources/rsdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsdumpinfo.c b/src/acpica/source/components/resources/rsdumpinfo.c > index bb41c71..c57f2ca 100644 > --- a/src/acpica/source/components/resources/rsdumpinfo.c > +++ b/src/acpica/source/components/resources/rsdumpinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsinfo.c b/src/acpica/source/components/resources/rsinfo.c > index da2cb5d..bf19c39 100644 > --- a/src/acpica/source/components/resources/rsinfo.c > +++ b/src/acpica/source/components/resources/rsinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsio.c b/src/acpica/source/components/resources/rsio.c > index a641c0c..8f39d14 100644 > --- a/src/acpica/source/components/resources/rsio.c > +++ b/src/acpica/source/components/resources/rsio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsirq.c b/src/acpica/source/components/resources/rsirq.c > index 33f400f..0ce5dfd 100644 > --- a/src/acpica/source/components/resources/rsirq.c > +++ b/src/acpica/source/components/resources/rsirq.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rslist.c b/src/acpica/source/components/resources/rslist.c > index ea2d1d5..4fda294 100644 > --- a/src/acpica/source/components/resources/rslist.c > +++ b/src/acpica/source/components/resources/rslist.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsmemory.c b/src/acpica/source/components/resources/rsmemory.c > index ae94a1f..07d7225 100644 > --- a/src/acpica/source/components/resources/rsmemory.c > +++ b/src/acpica/source/components/resources/rsmemory.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsmisc.c b/src/acpica/source/components/resources/rsmisc.c > index 8de7ca5..7871715 100644 > --- a/src/acpica/source/components/resources/rsmisc.c > +++ b/src/acpica/source/components/resources/rsmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsserial.c b/src/acpica/source/components/resources/rsserial.c > index b71dcad..acec6fb 100644 > --- a/src/acpica/source/components/resources/rsserial.c > +++ b/src/acpica/source/components/resources/rsserial.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsutils.c b/src/acpica/source/components/resources/rsutils.c > index 42ff2a3..55445b0 100644 > --- a/src/acpica/source/components/resources/rsutils.c > +++ b/src/acpica/source/components/resources/rsutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsxface.c b/src/acpica/source/components/resources/rsxface.c > index 9e9af3a..86b35a6 100644 > --- a/src/acpica/source/components/resources/rsxface.c > +++ b/src/acpica/source/components/resources/rsxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbdata.c b/src/acpica/source/components/tables/tbdata.c > index 10924ab..ee352c8 100644 > --- a/src/acpica/source/components/tables/tbdata.c > +++ b/src/acpica/source/components/tables/tbdata.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbfadt.c b/src/acpica/source/components/tables/tbfadt.c > index f3f27cd..93d76da 100644 > --- a/src/acpica/source/components/tables/tbfadt.c > +++ b/src/acpica/source/components/tables/tbfadt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbfind.c b/src/acpica/source/components/tables/tbfind.c > index 56b4e8a..c7acd1c 100644 > --- a/src/acpica/source/components/tables/tbfind.c > +++ b/src/acpica/source/components/tables/tbfind.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbinstal.c b/src/acpica/source/components/tables/tbinstal.c > index 38de06c..88e10ba 100644 > --- a/src/acpica/source/components/tables/tbinstal.c > +++ b/src/acpica/source/components/tables/tbinstal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbprint.c b/src/acpica/source/components/tables/tbprint.c > index d4bba45..90a1a52 100644 > --- a/src/acpica/source/components/tables/tbprint.c > +++ b/src/acpica/source/components/tables/tbprint.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbutils.c b/src/acpica/source/components/tables/tbutils.c > index ec1843c..b2fdb91 100644 > --- a/src/acpica/source/components/tables/tbutils.c > +++ b/src/acpica/source/components/tables/tbutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxface.c b/src/acpica/source/components/tables/tbxface.c > index df4e402..d2351d3 100644 > --- a/src/acpica/source/components/tables/tbxface.c > +++ b/src/acpica/source/components/tables/tbxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxfload.c b/src/acpica/source/components/tables/tbxfload.c > index 88834db..83f6420 100644 > --- a/src/acpica/source/components/tables/tbxfload.c > +++ b/src/acpica/source/components/tables/tbxfload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxfroot.c b/src/acpica/source/components/tables/tbxfroot.c > index 8354e94..8c6be13 100644 > --- a/src/acpica/source/components/tables/tbxfroot.c > +++ b/src/acpica/source/components/tables/tbxfroot.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utaddress.c b/src/acpica/source/components/utilities/utaddress.c > index 864c0c3..ddfe826 100644 > --- a/src/acpica/source/components/utilities/utaddress.c > +++ b/src/acpica/source/components/utilities/utaddress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utalloc.c b/src/acpica/source/components/utilities/utalloc.c > index dd7c8d6..0c8c928 100644 > --- a/src/acpica/source/components/utilities/utalloc.c > +++ b/src/acpica/source/components/utilities/utalloc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utbuffer.c b/src/acpica/source/components/utilities/utbuffer.c > index cc2d769..d4a65b4 100644 > --- a/src/acpica/source/components/utilities/utbuffer.c > +++ b/src/acpica/source/components/utilities/utbuffer.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utcache.c b/src/acpica/source/components/utilities/utcache.c > index cb8116e..25c8e0e 100644 > --- a/src/acpica/source/components/utilities/utcache.c > +++ b/src/acpica/source/components/utilities/utcache.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utcopy.c b/src/acpica/source/components/utilities/utcopy.c > index ea70d13..7dfc104 100644 > --- a/src/acpica/source/components/utilities/utcopy.c > +++ b/src/acpica/source/components/utilities/utcopy.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdebug.c b/src/acpica/source/components/utilities/utdebug.c > index 5c86223..60c6067 100644 > --- a/src/acpica/source/components/utilities/utdebug.c > +++ b/src/acpica/source/components/utilities/utdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdecode.c b/src/acpica/source/components/utilities/utdecode.c > index fcd6393..eb0dc9f 100644 > --- a/src/acpica/source/components/utilities/utdecode.c > +++ b/src/acpica/source/components/utilities/utdecode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdelete.c b/src/acpica/source/components/utilities/utdelete.c > index e6825ca..80b8f98 100644 > --- a/src/acpica/source/components/utilities/utdelete.c > +++ b/src/acpica/source/components/utilities/utdelete.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uterror.c b/src/acpica/source/components/utilities/uterror.c > index 5d7dfca..52b9ae0 100644 > --- a/src/acpica/source/components/utilities/uterror.c > +++ b/src/acpica/source/components/utilities/uterror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uteval.c b/src/acpica/source/components/utilities/uteval.c > index 00f1483..dd754c0 100644 > --- a/src/acpica/source/components/utilities/uteval.c > +++ b/src/acpica/source/components/utilities/uteval.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utexcep.c b/src/acpica/source/components/utilities/utexcep.c > index 2c046c4..dd63a12 100644 > --- a/src/acpica/source/components/utilities/utexcep.c > +++ b/src/acpica/source/components/utilities/utexcep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utfileio.c b/src/acpica/source/components/utilities/utfileio.c > index 956f300..e24e81f 100644 > --- a/src/acpica/source/components/utilities/utfileio.c > +++ b/src/acpica/source/components/utilities/utfileio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utglobal.c b/src/acpica/source/components/utilities/utglobal.c > index 34438c8..3f09d56 100644 > --- a/src/acpica/source/components/utilities/utglobal.c > +++ b/src/acpica/source/components/utilities/utglobal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uthex.c b/src/acpica/source/components/utilities/uthex.c > index 80ad2ba..500ab40 100644 > --- a/src/acpica/source/components/utilities/uthex.c > +++ b/src/acpica/source/components/utilities/uthex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utids.c b/src/acpica/source/components/utilities/utids.c > index 5f15f62..f611997 100644 > --- a/src/acpica/source/components/utilities/utids.c > +++ b/src/acpica/source/components/utilities/utids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utinit.c b/src/acpica/source/components/utilities/utinit.c > index 7c0b67b..6f701ad 100644 > --- a/src/acpica/source/components/utilities/utinit.c > +++ b/src/acpica/source/components/utilities/utinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utlock.c b/src/acpica/source/components/utilities/utlock.c > index 1d7dadc..7ce13ef 100644 > --- a/src/acpica/source/components/utilities/utlock.c > +++ b/src/acpica/source/components/utilities/utlock.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmath.c b/src/acpica/source/components/utilities/utmath.c > index 95a9d72..dafba6d 100644 > --- a/src/acpica/source/components/utilities/utmath.c > +++ b/src/acpica/source/components/utilities/utmath.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmisc.c b/src/acpica/source/components/utilities/utmisc.c > index 5e86e0a..30d23d8 100644 > --- a/src/acpica/source/components/utilities/utmisc.c > +++ b/src/acpica/source/components/utilities/utmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmutex.c b/src/acpica/source/components/utilities/utmutex.c > index 1537422..f5b864f 100644 > --- a/src/acpica/source/components/utilities/utmutex.c > +++ b/src/acpica/source/components/utilities/utmutex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utobject.c b/src/acpica/source/components/utilities/utobject.c > index 4c64061..fb4efaf 100644 > --- a/src/acpica/source/components/utilities/utobject.c > +++ b/src/acpica/source/components/utilities/utobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utosi.c b/src/acpica/source/components/utilities/utosi.c > index 3b49ded..e578d2f 100644 > --- a/src/acpica/source/components/utilities/utosi.c > +++ b/src/acpica/source/components/utilities/utosi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utownerid.c b/src/acpica/source/components/utilities/utownerid.c > index 1ae1398..bf391e1 100644 > --- a/src/acpica/source/components/utilities/utownerid.c > +++ b/src/acpica/source/components/utilities/utownerid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utpredef.c b/src/acpica/source/components/utilities/utpredef.c > index ab275ee..19561be 100644 > --- a/src/acpica/source/components/utilities/utpredef.c > +++ b/src/acpica/source/components/utilities/utpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utprint.c b/src/acpica/source/components/utilities/utprint.c > index 543bad8..50082f3 100644 > --- a/src/acpica/source/components/utilities/utprint.c > +++ b/src/acpica/source/components/utilities/utprint.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utresrc.c b/src/acpica/source/components/utilities/utresrc.c > index 3569fcf..44a4c66 100644 > --- a/src/acpica/source/components/utilities/utresrc.c > +++ b/src/acpica/source/components/utilities/utresrc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstate.c b/src/acpica/source/components/utilities/utstate.c > index cf96d8e..53aabbb 100644 > --- a/src/acpica/source/components/utilities/utstate.c > +++ b/src/acpica/source/components/utilities/utstate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstring.c b/src/acpica/source/components/utilities/utstring.c > index 2d218c3..953f304 100644 > --- a/src/acpica/source/components/utilities/utstring.c > +++ b/src/acpica/source/components/utilities/utstring.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uttrack.c b/src/acpica/source/components/utilities/uttrack.c > index 43a993a..284bee0 100644 > --- a/src/acpica/source/components/utilities/uttrack.c > +++ b/src/acpica/source/components/utilities/uttrack.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utuuid.c b/src/acpica/source/components/utilities/utuuid.c > index 65338cc..f0d740d 100644 > --- a/src/acpica/source/components/utilities/utuuid.c > +++ b/src/acpica/source/components/utilities/utuuid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxface.c b/src/acpica/source/components/utilities/utxface.c > index 7f2752c..e01c4d5 100644 > --- a/src/acpica/source/components/utilities/utxface.c > +++ b/src/acpica/source/components/utilities/utxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxferror.c b/src/acpica/source/components/utilities/utxferror.c > index 7b11f4c..bdbab99 100644 > --- a/src/acpica/source/components/utilities/utxferror.c > +++ b/src/acpica/source/components/utilities/utxferror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxfinit.c b/src/acpica/source/components/utilities/utxfinit.c > index a50cc55..91feda7 100644 > --- a/src/acpica/source/components/utilities/utxfinit.c > +++ b/src/acpica/source/components/utilities/utxfinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acapps.h b/src/acpica/source/include/acapps.h > index 6536048..21e71f4 100644 > --- a/src/acpica/source/include/acapps.h > +++ b/src/acpica/source/include/acapps.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -124,7 +124,7 @@ > /* Common info for tool signons */ > > #define ACPICA_NAME "Intel ACPI Component Architecture" > -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2014 Intel Corporation" > +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2015 Intel Corporation" > > #if ACPI_MACHINE_WIDTH == 64 > #define ACPI_WIDTH "-64" > diff --git a/src/acpica/source/include/acbuffer.h b/src/acpica/source/include/acbuffer.h > index 9ccb3ea..bbcff57 100644 > --- a/src/acpica/source/include/acbuffer.h > +++ b/src/acpica/source/include/acbuffer.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/accommon.h b/src/acpica/source/include/accommon.h > index 57735c5..76dc38a 100644 > --- a/src/acpica/source/include/accommon.h > +++ b/src/acpica/source/include/accommon.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acconfig.h b/src/acpica/source/include/acconfig.h > index 3c7a3bd..41fa33d 100644 > --- a/src/acpica/source/include/acconfig.h > +++ b/src/acpica/source/include/acconfig.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdebug.h b/src/acpica/source/include/acdebug.h > index b6105c2..5c32d46 100644 > --- a/src/acpica/source/include/acdebug.h > +++ b/src/acpica/source/include/acdebug.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdisasm.h b/src/acpica/source/include/acdisasm.h > index f0cadef..0394728 100644 > --- a/src/acpica/source/include/acdisasm.h > +++ b/src/acpica/source/include/acdisasm.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdispat.h b/src/acpica/source/include/acdispat.h > index 2a47c52..238cdde 100644 > --- a/src/acpica/source/include/acdispat.h > +++ b/src/acpica/source/include/acdispat.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acevents.h b/src/acpica/source/include/acevents.h > index 8ca726c..467e14f 100644 > --- a/src/acpica/source/include/acevents.h > +++ b/src/acpica/source/include/acevents.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -269,10 +269,6 @@ AcpiEvWalkGpeList ( > ACPI_GPE_CALLBACK GpeWalkCallback, > void *Context); > > -BOOLEAN > -AcpiEvValidGpeEvent ( > - ACPI_GPE_EVENT_INFO *GpeEventInfo); > - > ACPI_STATUS > AcpiEvGetGpeDevice ( > ACPI_GPE_XRUPT_INFO *GpeXruptInfo, > diff --git a/src/acpica/source/include/acexcep.h b/src/acpica/source/include/acexcep.h > index 89d9852..90511b2 100644 > --- a/src/acpica/source/include/acexcep.h > +++ b/src/acpica/source/include/acexcep.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acglobal.h b/src/acpica/source/include/acglobal.h > index 91712b4..fe3ac39 100644 > --- a/src/acpica/source/include/acglobal.h > +++ b/src/acpica/source/include/acglobal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/achware.h b/src/acpica/source/include/achware.h > index ed39a36..6134bda 100644 > --- a/src/acpica/source/include/achware.h > +++ b/src/acpica/source/include/achware.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acinterp.h b/src/acpica/source/include/acinterp.h > index 739a0de..f0edcb1 100644 > --- a/src/acpica/source/include/acinterp.h > +++ b/src/acpica/source/include/acinterp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/aclocal.h b/src/acpica/source/include/aclocal.h > index f55c00a..96f292b 100644 > --- a/src/acpica/source/include/aclocal.h > +++ b/src/acpica/source/include/aclocal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -592,6 +592,7 @@ typedef struct acpi_gpe_register_info > UINT16 BaseGpeNumber; /* Base GPE number for this register */ > UINT8 EnableForWake; /* GPEs to keep enabled when sleeping */ > UINT8 EnableForRun; /* GPEs to keep enabled when running */ > + UINT8 EnableMask; /* Current mask of enabled GPEs */ > > } ACPI_GPE_REGISTER_INFO; > > diff --git a/src/acpica/source/include/acmacros.h b/src/acpica/source/include/acmacros.h > index aa8bd56..ba3d526 100644 > --- a/src/acpica/source/include/acmacros.h > +++ b/src/acpica/source/include/acmacros.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acnames.h b/src/acpica/source/include/acnames.h > index b4fed5e..e87f927 100644 > --- a/src/acpica/source/include/acnames.h > +++ b/src/acpica/source/include/acnames.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acnamesp.h b/src/acpica/source/include/acnamesp.h > index 883e9c4..b66d3e4 100644 > --- a/src/acpica/source/include/acnamesp.h > +++ b/src/acpica/source/include/acnamesp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acobject.h b/src/acpica/source/include/acobject.h > index 6e3d0de..0712e75 100644 > --- a/src/acpica/source/include/acobject.h > +++ b/src/acpica/source/include/acobject.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acopcode.h b/src/acpica/source/include/acopcode.h > index 4ee0497..45423f3 100644 > --- a/src/acpica/source/include/acopcode.h > +++ b/src/acpica/source/include/acopcode.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acoutput.h b/src/acpica/source/include/acoutput.h > index 2311c44..f0cd27a 100644 > --- a/src/acpica/source/include/acoutput.h > +++ b/src/acpica/source/include/acoutput.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acparser.h b/src/acpica/source/include/acparser.h > index 0899969..abbde50 100644 > --- a/src/acpica/source/include/acparser.h > +++ b/src/acpica/source/include/acparser.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpi.h b/src/acpica/source/include/acpi.h > index 3f39932..1d694a5 100644 > --- a/src/acpica/source/include/acpi.h > +++ b/src/acpica/source/include/acpi.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpiosxf.h b/src/acpica/source/include/acpiosxf.h > index 21e6ed9..68d79c7 100644 > --- a/src/acpica/source/include/acpiosxf.h > +++ b/src/acpica/source/include/acpiosxf.h > @@ -10,7 +10,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpixf.h b/src/acpica/source/include/acpixf.h > index 23f965f..fa8f9ab 100644 > --- a/src/acpica/source/include/acpixf.h > +++ b/src/acpica/source/include/acpixf.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -118,7 +118,7 @@ > > /* Current ACPICA subsystem version in YYYYMMDD format */ > > -#define ACPI_CA_VERSION 0x20141107 > +#define ACPI_CA_VERSION 0x20150204 > > #include "acconfig.h" > #include "actypes.h" > @@ -776,6 +776,15 @@ AcpiInstallGpeHandler ( > > ACPI_HW_DEPENDENT_RETURN_STATUS ( > ACPI_STATUS > +AcpiInstallGpeRawHandler ( > + ACPI_HANDLE GpeDevice, > + UINT32 GpeNumber, > + UINT32 Type, > + ACPI_GPE_HANDLER Address, > + void *Context)) > + > +ACPI_HW_DEPENDENT_RETURN_STATUS ( > +ACPI_STATUS > AcpiRemoveGpeHandler ( > ACPI_HANDLE GpeDevice, > UINT32 GpeNumber, > @@ -960,6 +969,11 @@ AcpiEnableAllRuntimeGpes ( > > ACPI_HW_DEPENDENT_RETURN_STATUS ( > ACPI_STATUS > +AcpiEnableAllWakeupGpes ( > + void)) > + > +ACPI_HW_DEPENDENT_RETURN_STATUS ( > +ACPI_STATUS > AcpiGetGpeDevice ( > UINT32 GpeIndex, > ACPI_HANDLE *GpeDevice)) > diff --git a/src/acpica/source/include/acpredef.h b/src/acpica/source/include/acpredef.h > index 1c1776a..b03f64b 100644 > --- a/src/acpica/source/include/acpredef.h > +++ b/src/acpica/source/include/acpredef.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acresrc.h b/src/acpica/source/include/acresrc.h > index d1366f0..b361120 100644 > --- a/src/acpica/source/include/acresrc.h > +++ b/src/acpica/source/include/acresrc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acrestyp.h b/src/acpica/source/include/acrestyp.h > index 9cf948b..06a4db5 100644 > --- a/src/acpica/source/include/acrestyp.h > +++ b/src/acpica/source/include/acrestyp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acstruct.h b/src/acpica/source/include/acstruct.h > index fd8eab0..5258f0e 100644 > --- a/src/acpica/source/include/acstruct.h > +++ b/src/acpica/source/include/acstruct.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actables.h b/src/acpica/source/include/actables.h > index bb2a4f3..4f82777 100644 > --- a/src/acpica/source/include/actables.h > +++ b/src/acpica/source/include/actables.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl.h b/src/acpica/source/include/actbl.h > index ea9fc58..68bbed4 100644 > --- a/src/acpica/source/include/actbl.h > +++ b/src/acpica/source/include/actbl.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl1.h b/src/acpica/source/include/actbl1.h > index 4c5ffee..2c8b0ed 100644 > --- a/src/acpica/source/include/actbl1.h > +++ b/src/acpica/source/include/actbl1.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl2.h b/src/acpica/source/include/actbl2.h > index 7d62862..0d39c0e 100644 > --- a/src/acpica/source/include/actbl2.h > +++ b/src/acpica/source/include/actbl2.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl3.h b/src/acpica/source/include/actbl3.h > index 4e3b77a..b4ce8af 100644 > --- a/src/acpica/source/include/actbl3.h > +++ b/src/acpica/source/include/actbl3.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actypes.h b/src/acpica/source/include/actypes.h > index 227589e..714edfe 100644 > --- a/src/acpica/source/include/actypes.h > +++ b/src/acpica/source/include/actypes.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -815,11 +815,15 @@ typedef UINT32 ACPI_EVENT_STATUS; > #define ACPI_GPE_ENABLE 0 > #define ACPI_GPE_DISABLE 1 > #define ACPI_GPE_CONDITIONAL_ENABLE 2 > +#define ACPI_GPE_SAVE_MASK 4 > + > +#define ACPI_GPE_ENABLE_SAVE (ACPI_GPE_ENABLE | ACPI_GPE_SAVE_MASK) > +#define ACPI_GPE_DISABLE_SAVE (ACPI_GPE_DISABLE | ACPI_GPE_SAVE_MASK) > > /* > * GPE info flags - Per GPE > * +-------+-+-+---+ > - * | 7:4 |3|2|1:0| > + * | 7:5 |4|3|2:0| > * +-------+-+-+---+ > * | | | | > * | | | +-- Type of dispatch:to method, handler, notify, or none > @@ -831,13 +835,15 @@ typedef UINT32 ACPI_EVENT_STATUS; > #define ACPI_GPE_DISPATCH_METHOD (UINT8) 0x01 > #define ACPI_GPE_DISPATCH_HANDLER (UINT8) 0x02 > #define ACPI_GPE_DISPATCH_NOTIFY (UINT8) 0x03 > -#define ACPI_GPE_DISPATCH_MASK (UINT8) 0x03 > +#define ACPI_GPE_DISPATCH_RAW_HANDLER (UINT8) 0x04 > +#define ACPI_GPE_DISPATCH_MASK (UINT8) 0x07 > +#define ACPI_GPE_DISPATCH_TYPE(flags) ((UINT8) ((flags) & ACPI_GPE_DISPATCH_MASK)) > > -#define ACPI_GPE_LEVEL_TRIGGERED (UINT8) 0x04 > +#define ACPI_GPE_LEVEL_TRIGGERED (UINT8) 0x08 > #define ACPI_GPE_EDGE_TRIGGERED (UINT8) 0x00 > -#define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x04 > +#define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x08 > > -#define ACPI_GPE_CAN_WAKE (UINT8) 0x08 > +#define ACPI_GPE_CAN_WAKE (UINT8) 0x10 > > /* > * Flags for GPE and Lock interfaces > diff --git a/src/acpica/source/include/acutils.h b/src/acpica/source/include/acutils.h > index 2aea248..f8a6783 100644 > --- a/src/acpica/source/include/acutils.h > +++ b/src/acpica/source/include/acutils.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/amlcode.h b/src/acpica/source/include/amlcode.h > index 5eaf30c..2a5dc97 100644 > --- a/src/acpica/source/include/amlcode.h > +++ b/src/acpica/source/include/amlcode.h > @@ -10,7 +10,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/amlresrc.h b/src/acpica/source/include/amlresrc.h > index e54f567..87f52c5 100644 > --- a/src/acpica/source/include/amlresrc.h > +++ b/src/acpica/source/include/amlresrc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acenv.h b/src/acpica/source/include/platform/acenv.h > index 80038c8..c1714ed 100644 > --- a/src/acpica/source/include/platform/acenv.h > +++ b/src/acpica/source/include/platform/acenv.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acenvex.h b/src/acpica/source/include/platform/acenvex.h > index 2c50162..6c59337 100644 > --- a/src/acpica/source/include/platform/acenvex.h > +++ b/src/acpica/source/include/platform/acenvex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acgcc.h b/src/acpica/source/include/platform/acgcc.h > index 9cb3cbe..fde18f4 100644 > --- a/src/acpica/source/include/platform/acgcc.h > +++ b/src/acpica/source/include/platform/acgcc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/aclinux.h b/src/acpica/source/include/platform/aclinux.h > index e7df0b7..668f237 100644 > --- a/src/acpica/source/include/platform/aclinux.h > +++ b/src/acpica/source/include/platform/aclinux.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/aclinuxex.h b/src/acpica/source/include/platform/aclinuxex.h > index d4111a1..52352ce 100644 > --- a/src/acpica/source/include/platform/aclinuxex.h > +++ b/src/acpica/source/include/platform/aclinuxex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/os_specific/service_layers/oslibcfs.c b/src/acpica/source/os_specific/service_layers/oslibcfs.c > index e1ca8be..dadc40d 100644 > --- a/src/acpica/source/os_specific/service_layers/oslibcfs.c > +++ b/src/acpica/source/os_specific/service_layers/oslibcfs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/os_specific/service_layers/osunixxf.c b/src/acpica/source/os_specific/service_layers/osunixxf.c > index ccf0015..c48f581 100644 > --- a/src/acpica/source/os_specific/service_layers/osunixxf.c > +++ b/src/acpica/source/os_specific/service_layers/osunixxf.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aecommon.h b/src/acpica/source/tools/acpiexec/aecommon.h > index 17b1cd0..c0662bf 100644 > --- a/src/acpica/source/tools/acpiexec/aecommon.h > +++ b/src/acpica/source/tools/acpiexec/aecommon.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aehandlers.c b/src/acpica/source/tools/acpiexec/aehandlers.c > index 3773bba..eb1e3ab 100644 > --- a/src/acpica/source/tools/acpiexec/aehandlers.c > +++ b/src/acpica/source/tools/acpiexec/aehandlers.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeinitfile.c b/src/acpica/source/tools/acpiexec/aeinitfile.c > index 64b8a79..0de7b96 100644 > --- a/src/acpica/source/tools/acpiexec/aeinitfile.c > +++ b/src/acpica/source/tools/acpiexec/aeinitfile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeregion.c b/src/acpica/source/tools/acpiexec/aeregion.c > index 084925b..a1b8ea2 100644 > --- a/src/acpica/source/tools/acpiexec/aeregion.c > +++ b/src/acpica/source/tools/acpiexec/aeregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. > * All rights reserved. > * > * 2. License > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/acpica/source/common/acgetline.c b/src/acpica/source/common/acgetline.c index 77ca341..2a2232a 100644 --- a/src/acpica/source/common/acgetline.c +++ b/src/acpica/source/common/acgetline.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/adfile.c b/src/acpica/source/common/adfile.c index 6a2625a..6248983 100644 --- a/src/acpica/source/common/adfile.c +++ b/src/acpica/source/common/adfile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/adisasm.c b/src/acpica/source/common/adisasm.c index 85ae3d0..f4baa62 100644 --- a/src/acpica/source/common/adisasm.c +++ b/src/acpica/source/common/adisasm.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -429,8 +429,12 @@ AdAmlDisassemble ( AcpiDmDumpDataTable (Table); fprintf (stderr, "Acpi Data Table [%4.4s] decoded\n", Table->Signature); - fprintf (stderr, "Formatted output: %s - %u bytes\n", - DisasmFilename, CmGetFileSize (File)); + + if (File) + { + fprintf (stderr, "Formatted output: %s - %u bytes\n", + DisasmFilename, CmGetFileSize (File)); + } } else { @@ -448,8 +452,11 @@ AdAmlDisassemble ( { AcpiOsPrintf ("/**** Before second load\n"); - NsSetupNamespaceListing (File); - NsDisplayNamespace (); + if (File) + { + NsSetupNamespaceListing (File); + NsDisplayNamespace (); + } AcpiOsPrintf ("*****/\n"); } @@ -529,8 +536,11 @@ AdAmlDisassemble ( if (AslCompilerdebug) { AcpiOsPrintf ("/**** After second load and resource conversion\n"); - NsSetupNamespaceListing (File); - NsDisplayNamespace (); + if (File) + { + NsSetupNamespaceListing (File); + NsDisplayNamespace (); + } AcpiOsPrintf ("*****/\n"); AcpiDmDumpTree (AcpiGbl_ParseOpRoot); @@ -559,8 +569,11 @@ AdAmlDisassemble ( AcpiDmDumpDataTable (Table); fprintf (stderr, "Disassembly completed\n"); - fprintf (stderr, "ASL Output: %s - %u bytes\n", - DisasmFilename, CmGetFileSize (File)); + if (File) + { + fprintf (stderr, "ASL Output: %s - %u bytes\n", + DisasmFilename, CmGetFileSize (File)); + } if (Gbl_MapfileFlag) { @@ -579,7 +592,7 @@ Cleanup: ACPI_FREE (Table); } - if (OutToFile && File) + if (File) { if (AslCompilerdebug) /* Display final namespace, with transforms */ { diff --git a/src/acpica/source/common/adwalk.c b/src/acpica/source/common/adwalk.c index aa50195..fe07c07 100644 --- a/src/acpica/source/common/adwalk.c +++ b/src/acpica/source/common/adwalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahids.c b/src/acpica/source/common/ahids.c index 8d008cf..1ff3c7c 100644 --- a/src/acpica/source/common/ahids.c +++ b/src/acpica/source/common/ahids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahpredef.c b/src/acpica/source/common/ahpredef.c index 7123b7f..57e7279 100644 --- a/src/acpica/source/common/ahpredef.c +++ b/src/acpica/source/common/ahpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahuuids.c b/src/acpica/source/common/ahuuids.c index e2da9c1..4e5d087 100644 --- a/src/acpica/source/common/ahuuids.c +++ b/src/acpica/source/common/ahuuids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/cmfsize.c b/src/acpica/source/common/cmfsize.c index 1511683..1e8de3c 100644 --- a/src/acpica/source/common/cmfsize.c +++ b/src/acpica/source/common/cmfsize.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmextern.c b/src/acpica/source/common/dmextern.c index 30196df..72397f0 100644 --- a/src/acpica/source/common/dmextern.c +++ b/src/acpica/source/common/dmextern.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmrestag.c b/src/acpica/source/common/dmrestag.c index d21b111..15c2d84 100644 --- a/src/acpica/source/common/dmrestag.c +++ b/src/acpica/source/common/dmrestag.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtable.c b/src/acpica/source/common/dmtable.c index 8ed2236..b495ad2 100644 --- a/src/acpica/source/common/dmtable.c +++ b/src/acpica/source/common/dmtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtbdump.c b/src/acpica/source/common/dmtbdump.c index 235c650..2f2abe6 100644 --- a/src/acpica/source/common/dmtbdump.c +++ b/src/acpica/source/common/dmtbdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtbinfo.c b/src/acpica/source/common/dmtbinfo.c index 777928d..309585a 100644 --- a/src/acpica/source/common/dmtbinfo.c +++ b/src/acpica/source/common/dmtbinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslanalyze.c b/src/acpica/source/compiler/aslanalyze.c index 8562ecd..1fae183 100644 --- a/src/acpica/source/compiler/aslanalyze.c +++ b/src/acpica/source/compiler/aslanalyze.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslascii.c b/src/acpica/source/compiler/aslascii.c index 09ab9e9..9a4e127 100644 --- a/src/acpica/source/compiler/aslascii.c +++ b/src/acpica/source/compiler/aslascii.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslbtypes.c b/src/acpica/source/compiler/aslbtypes.c index b7c5fbf..817ecb6 100644 --- a/src/acpica/source/compiler/aslbtypes.c +++ b/src/acpica/source/compiler/aslbtypes.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcodegen.c b/src/acpica/source/compiler/aslcodegen.c index 7c37abd..7136ff1 100644 --- a/src/acpica/source/compiler/aslcodegen.c +++ b/src/acpica/source/compiler/aslcodegen.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcompile.c b/src/acpica/source/compiler/aslcompile.c index 4dc0195..6bf0604 100644 --- a/src/acpica/source/compiler/aslcompile.c +++ b/src/acpica/source/compiler/aslcompile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -190,10 +190,9 @@ CmDoCompile ( AslCompilerparse(); UtEndEvent (Event); - /* Check for parse errors */ + /* Check for parser-detected syntax errors */ - Status = AslCheckForErrorExit (); - if (ACPI_FAILURE (Status)) + if (Gbl_SyntaxError) { fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n"); LsDumpParseTree (); diff --git a/src/acpica/source/compiler/aslcompiler.h b/src/acpica/source/compiler/aslcompiler.h index beb22d0..36c9b9e 100644 --- a/src/acpica/source/compiler/aslcompiler.h +++ b/src/acpica/source/compiler/aslcompiler.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcompiler.l b/src/acpica/source/compiler/aslcompiler.l index cd07ef7..53332d8 100644 --- a/src/acpica/source/compiler/aslcompiler.l +++ b/src/acpica/source/compiler/aslcompiler.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcompiler.y b/src/acpica/source/compiler/aslcompiler.y index 6472e1d..032d062 100644 --- a/src/acpica/source/compiler/aslcompiler.y +++ b/src/acpica/source/compiler/aslcompiler.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asldefine.h b/src/acpica/source/compiler/asldefine.h index ae64af2..00ad5a5 100644 --- a/src/acpica/source/compiler/asldefine.h +++ b/src/acpica/source/compiler/asldefine.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslerror.c b/src/acpica/source/compiler/aslerror.c index dc8578c..d033fdb 100644 --- a/src/acpica/source/compiler/aslerror.c +++ b/src/acpica/source/compiler/aslerror.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -990,6 +990,8 @@ AslCompilererror ( const char *CompilerMessage) { + Gbl_SyntaxError++; + AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, Gbl_CurrentLineOffset, Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, diff --git a/src/acpica/source/compiler/aslfileio.c b/src/acpica/source/compiler/aslfileio.c index a8c24cc..4d3d963 100644 --- a/src/acpica/source/compiler/aslfileio.c +++ b/src/acpica/source/compiler/aslfileio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -140,8 +140,8 @@ FlFileError ( UINT8 ErrorId) { - sprintf (MsgBuffer, "\"%s\" (%s)", Gbl_Files[FileId].Filename, - strerror (errno)); + sprintf (MsgBuffer, "\"%s\" (%s) - %s", Gbl_Files[FileId].Filename, + Gbl_Files[FileId].Description, strerror (errno)); AslCommonError (ASL_ERROR, ErrorId, 0, 0, 0, 0, NULL, MsgBuffer); } @@ -170,6 +170,9 @@ FlOpenFile ( FILE *File; + Gbl_Files[FileId].Filename = Filename; + Gbl_Files[FileId].Handle = NULL; + File = fopen (Filename, Mode); if (!File) { @@ -177,8 +180,7 @@ FlOpenFile ( AslAbort (); } - Gbl_Files[FileId].Filename = Filename; - Gbl_Files[FileId].Handle = File; + Gbl_Files[FileId].Handle = File; } diff --git a/src/acpica/source/compiler/aslfiles.c b/src/acpica/source/compiler/aslfiles.c index 4557861..39f6319 100644 --- a/src/acpica/source/compiler/aslfiles.c +++ b/src/acpica/source/compiler/aslfiles.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -557,6 +557,8 @@ FlOpenAmlOutputFile ( 0, 0, 0, 0, NULL, NULL); return (AE_ERROR); } + + Gbl_Files[ASL_FILE_AML_OUTPUT].Filename = Filename; } /* Open the output AML file in binary mode */ @@ -635,9 +637,14 @@ FlOpenMiscOutputFiles ( if (!Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle) { - AslCommonError (ASL_ERROR, ASL_MSG_DEBUG_FILENAME, - 0, 0, 0, 0, NULL, NULL); - return (AE_ERROR); + /* + * A problem with freopen is that on error, + * we no longer have stderr. + */ + Gbl_DebugFlag = FALSE; + memcpy (stderr, stdout, sizeof (FILE)); + FlFileError (ASL_FILE_DEBUG_OUTPUT, ASL_MSG_DEBUG_FILENAME); + AslAbort (); } AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); @@ -830,6 +837,26 @@ FlOpenMiscOutputFiles ( AslCompilerFileHeader (ASL_FILE_NAMESPACE_OUTPUT); } + /* Create/Open a map file if requested */ + + if (Gbl_MapfileFlag) + { + Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_MAP); + if (!Filename) + { + AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, + 0, 0, 0, 0, NULL, NULL); + return (AE_ERROR); + } + + /* Open the hex file, text mode (closed at compiler exit) */ + + FlOpenFile (ASL_FILE_MAP_OUTPUT, Filename, "w+t"); + + AslCompilerSignon (ASL_FILE_MAP_OUTPUT); + AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT); + } + return (AE_OK); } diff --git a/src/acpica/source/compiler/aslfold.c b/src/acpica/source/compiler/aslfold.c index 51c355a..82d6c8f 100644 --- a/src/acpica/source/compiler/aslfold.c +++ b/src/acpica/source/compiler/aslfold.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslglobal.h b/src/acpica/source/compiler/aslglobal.h index 7c42e69..a26d752 100644 --- a/src/acpica/source/compiler/aslglobal.h +++ b/src/acpica/source/compiler/aslglobal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -199,6 +199,7 @@ ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_PreviousLineNumber, 0); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineNumber, 1); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_LogicalLineNumber, 1); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLineOffset, 0); +ASL_EXTERN UINT8 ASL_INIT_GLOBAL (Gbl_SyntaxError, 0); /* Exception reporting */ diff --git a/src/acpica/source/compiler/aslhex.c b/src/acpica/source/compiler/aslhex.c index 1d8056b..39825c8 100644 --- a/src/acpica/source/compiler/aslhex.c +++ b/src/acpica/source/compiler/aslhex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllength.c b/src/acpica/source/compiler/asllength.c index 0c19896..3fbf896 100644 --- a/src/acpica/source/compiler/asllength.c +++ b/src/acpica/source/compiler/asllength.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllisting.c b/src/acpica/source/compiler/asllisting.c index 2c6b53b..b5a4559 100644 --- a/src/acpica/source/compiler/asllisting.c +++ b/src/acpica/source/compiler/asllisting.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllistsup.c b/src/acpica/source/compiler/asllistsup.c index 5162524..c71ace0 100644 --- a/src/acpica/source/compiler/asllistsup.c +++ b/src/acpica/source/compiler/asllistsup.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslload.c b/src/acpica/source/compiler/aslload.c index 303fc4c..e6c1f85 100644 --- a/src/acpica/source/compiler/aslload.c +++ b/src/acpica/source/compiler/aslload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllookup.c b/src/acpica/source/compiler/asllookup.c index 435dec9..4a7539a 100644 --- a/src/acpica/source/compiler/asllookup.c +++ b/src/acpica/source/compiler/asllookup.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmain.c b/src/acpica/source/compiler/aslmain.c index 6097721..9e27551 100644 --- a/src/acpica/source/compiler/aslmain.c +++ b/src/acpica/source/compiler/aslmain.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmap.c b/src/acpica/source/compiler/aslmap.c index eebaeb3..5aed2b0 100644 --- a/src/acpica/source/compiler/aslmap.c +++ b/src/acpica/source/compiler/aslmap.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmapoutput.c b/src/acpica/source/compiler/aslmapoutput.c index 046ebb7..9537cac 100644 --- a/src/acpica/source/compiler/aslmapoutput.c +++ b/src/acpica/source/compiler/aslmapoutput.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -188,7 +188,7 @@ const char *PolarityDecode[] = * RETURN: None * * DESCRIPTION: External interface. - * Create and open the mapfile and emit all of the collected + * Map file has already been opened. Emit all of the collected * hardware mapping information. Includes: GPIO information, * Serial information, and a dump of the entire ACPI device tree. * @@ -198,8 +198,6 @@ void MpEmitMappingInfo ( void) { - char *NewFilename; - /* Mapfile option enabled? */ @@ -208,22 +206,6 @@ MpEmitMappingInfo ( return; } - /* Create/Open a map file */ - - NewFilename = FlGenerateFilename (Gbl_OutputFilenamePrefix, - FILE_SUFFIX_MAP); - if (!NewFilename) - { - AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME, - 0, 0, 0, 0, NULL, NULL); - } - - /* Open the hex file, text mode (closed at compiler exit) */ - - FlOpenFile (ASL_FILE_MAP_OUTPUT, NewFilename, "w+t"); - AslCompilerSignon (ASL_FILE_MAP_OUTPUT); - AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT); - if (!Gbl_GpioList) { FlPrintFile (ASL_FILE_MAP_OUTPUT, @@ -702,9 +684,6 @@ MpNamespaceXrefBegin ( if (Op->Asl.Node == Info->TargetNode) { - DevicePathname = AcpiNsGetExternalPathname ( - Info->TargetNode); - while (ParentOp && (!ParentOp->Asl.Node)) { ParentOp = ParentOp->Asl.Parent; @@ -726,6 +705,8 @@ MpNamespaceXrefBegin ( DevicePathname, HidString); Info->References++; + + ACPI_FREE (DevicePathname); } } diff --git a/src/acpica/source/compiler/aslmaputils.c b/src/acpica/source/compiler/aslmaputils.c index 271a9a8..9b9a03e 100644 --- a/src/acpica/source/compiler/aslmaputils.c +++ b/src/acpica/source/compiler/aslmaputils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmessages.c b/src/acpica/source/compiler/aslmessages.c index 879e3ab..4ea71de 100644 --- a/src/acpica/source/compiler/aslmessages.c +++ b/src/acpica/source/compiler/aslmessages.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmessages.h b/src/acpica/source/compiler/aslmessages.h index bf99a72..12fe9d9 100644 --- a/src/acpica/source/compiler/aslmessages.h +++ b/src/acpica/source/compiler/aslmessages.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmethod.c b/src/acpica/source/compiler/aslmethod.c index 5dc30d7..b8ca5e9 100644 --- a/src/acpica/source/compiler/aslmethod.c +++ b/src/acpica/source/compiler/aslmethod.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslnamesp.c b/src/acpica/source/compiler/aslnamesp.c index 0321dc1..e6d2898 100644 --- a/src/acpica/source/compiler/aslnamesp.c +++ b/src/acpica/source/compiler/aslnamesp.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asloffset.c b/src/acpica/source/compiler/asloffset.c index 7b7cf09..1dc432c 100644 --- a/src/acpica/source/compiler/asloffset.c +++ b/src/acpica/source/compiler/asloffset.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslopcodes.c b/src/acpica/source/compiler/aslopcodes.c index b476b06..36044b0 100644 --- a/src/acpica/source/compiler/aslopcodes.c +++ b/src/acpica/source/compiler/aslopcodes.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asloperands.c b/src/acpica/source/compiler/asloperands.c index 5533971..ab06d14 100644 --- a/src/acpica/source/compiler/asloperands.c +++ b/src/acpica/source/compiler/asloperands.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslopt.c b/src/acpica/source/compiler/aslopt.c index 3cdaeb0..65fce99 100644 --- a/src/acpica/source/compiler/aslopt.c +++ b/src/acpica/source/compiler/aslopt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslparser.y b/src/acpica/source/compiler/aslparser.y index f850672..588e239 100644 --- a/src/acpica/source/compiler/aslparser.y +++ b/src/acpica/source/compiler/aslparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslpredef.c b/src/acpica/source/compiler/aslpredef.c index 9305ac7..c39483b 100644 --- a/src/acpica/source/compiler/aslpredef.c +++ b/src/acpica/source/compiler/aslpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslprepkg.c b/src/acpica/source/compiler/aslprepkg.c index 8184a3d..6b27e91 100644 --- a/src/acpica/source/compiler/aslprepkg.c +++ b/src/acpica/source/compiler/aslprepkg.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslprintf.c b/src/acpica/source/compiler/aslprintf.c index 811bc92..1ace80f 100644 --- a/src/acpica/source/compiler/aslprintf.c +++ b/src/acpica/source/compiler/aslprintf.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslprune.c b/src/acpica/source/compiler/aslprune.c index 163183b..44221bb 100644 --- a/src/acpica/source/compiler/aslprune.c +++ b/src/acpica/source/compiler/aslprune.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslresource.c b/src/acpica/source/compiler/aslresource.c index 09acd24..2abc7dd 100644 --- a/src/acpica/source/compiler/aslresource.c +++ b/src/acpica/source/compiler/aslresource.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype1.c b/src/acpica/source/compiler/aslrestype1.c index 9991de7..945f1bf 100644 --- a/src/acpica/source/compiler/aslrestype1.c +++ b/src/acpica/source/compiler/aslrestype1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype1i.c b/src/acpica/source/compiler/aslrestype1i.c index 319b547..1394580 100644 --- a/src/acpica/source/compiler/aslrestype1i.c +++ b/src/acpica/source/compiler/aslrestype1i.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2.c b/src/acpica/source/compiler/aslrestype2.c index b639d04..1cbca10 100644 --- a/src/acpica/source/compiler/aslrestype2.c +++ b/src/acpica/source/compiler/aslrestype2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2d.c b/src/acpica/source/compiler/aslrestype2d.c index f55917c..083751f 100644 --- a/src/acpica/source/compiler/aslrestype2d.c +++ b/src/acpica/source/compiler/aslrestype2d.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2e.c b/src/acpica/source/compiler/aslrestype2e.c index 1eb682b..2a24589 100644 --- a/src/acpica/source/compiler/aslrestype2e.c +++ b/src/acpica/source/compiler/aslrestype2e.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2q.c b/src/acpica/source/compiler/aslrestype2q.c index 8b5020f..cfb0405 100644 --- a/src/acpica/source/compiler/aslrestype2q.c +++ b/src/acpica/source/compiler/aslrestype2q.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2s.c b/src/acpica/source/compiler/aslrestype2s.c index 839aa03..779edd0 100644 --- a/src/acpica/source/compiler/aslrestype2s.c +++ b/src/acpica/source/compiler/aslrestype2s.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2w.c b/src/acpica/source/compiler/aslrestype2w.c index 358b5f3..d00a979 100644 --- a/src/acpica/source/compiler/aslrestype2w.c +++ b/src/acpica/source/compiler/aslrestype2w.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrules.y b/src/acpica/source/compiler/aslrules.y index 3e794ab..ed5515c 100644 --- a/src/acpica/source/compiler/aslrules.y +++ b/src/acpica/source/compiler/aslrules.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslstartup.c b/src/acpica/source/compiler/aslstartup.c index 46839ff..0894d45 100644 --- a/src/acpica/source/compiler/aslstartup.c +++ b/src/acpica/source/compiler/aslstartup.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -160,6 +160,7 @@ AslInitializeGlobals ( /* Init compiler globals */ + Gbl_SyntaxError = 0; Gbl_CurrentColumn = 0; Gbl_CurrentLineNumber = 1; Gbl_LogicalLineNumber = 1; diff --git a/src/acpica/source/compiler/aslstubs.c b/src/acpica/source/compiler/aslstubs.c index a57c4f4..533f7de 100644 --- a/src/acpica/source/compiler/aslstubs.c +++ b/src/acpica/source/compiler/aslstubs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslsupport.l b/src/acpica/source/compiler/aslsupport.l index 2fc591c..c7f1f93 100644 --- a/src/acpica/source/compiler/aslsupport.l +++ b/src/acpica/source/compiler/aslsupport.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -141,6 +141,14 @@ typedef struct asl_file_node ASL_FILE_NODE *Gbl_IncludeFileStack = NULL; +/******************************************************************************* + * + * FUNCTION: AslParserCleanup + * + * Used to delete the current buffer + * + ******************************************************************************/ + void AslParserCleanup ( void) @@ -260,7 +268,8 @@ AslPopInputFileStack ( Fnode = Gbl_IncludeFileStack; - DbgPrint (ASL_PARSE_OUTPUT, "\nPop InputFile Stack, Fnode %p\n\n", Fnode); + DbgPrint (ASL_PARSE_OUTPUT, + "\nPop InputFile Stack, Fnode %p\n\n", Fnode); if (!Fnode) { @@ -320,11 +329,11 @@ AslPushInputFileStack ( Fnode = UtLocalCalloc (sizeof (ASL_FILE_NODE)); - Fnode->File = yyin; - Fnode->Next = Gbl_IncludeFileStack; - Fnode->State = YY_CURRENT_BUFFER; - Fnode->CurrentLineNumber = Gbl_CurrentLineNumber; - Fnode->Filename = Gbl_Files[ASL_FILE_INPUT].Filename; + Fnode->File = yyin; + Fnode->Next = Gbl_IncludeFileStack; + Fnode->State = YY_CURRENT_BUFFER; + Fnode->Filename = Gbl_Files[ASL_FILE_INPUT].Filename; + Fnode->CurrentLineNumber = Gbl_CurrentLineNumber; /* Push it on the stack */ @@ -335,7 +344,8 @@ AslPushInputFileStack ( State = yy_create_buffer (InputFile, YY_BUF_SIZE); yy_switch_to_buffer (State); - DbgPrint (ASL_PARSE_OUTPUT, "\nPush InputFile Stack, returning %p\n\n", InputFile); + DbgPrint (ASL_PARSE_OUTPUT, + "\nPush InputFile Stack, returning %p\n\n", InputFile); /* Reset the global line count and filename */ @@ -385,7 +395,7 @@ AslResetCurrentLineBuffer ( * * FUNCTION: AslInsertLineBuffer * - * PARAMETERS: SourceChar - One char from the input ASL source file + * PARAMETERS: SourceChar - One char from the input ASL source file * * RETURN: None * @@ -426,7 +436,8 @@ AslInsertLineBuffer ( *Gbl_LineBufPtr = (UINT8) SourceChar; Gbl_LineBufPtr++; - if (Gbl_LineBufPtr > (Gbl_CurrentLineBuffer + (Gbl_LineBufferSize - 1))) + if (Gbl_LineBufPtr > + (Gbl_CurrentLineBuffer + (Gbl_LineBufferSize - 1))) { #if 0 /* @@ -435,9 +446,9 @@ AslInsertLineBuffer ( */ sprintf (MsgBuffer, "Max %u", Gbl_LineBufferSize); AslCommonError (ASL_WARNING, ASL_MSG_LONG_LINE, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, MsgBuffer); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, MsgBuffer); #endif AslResetCurrentLineBuffer (); @@ -456,12 +467,12 @@ AslInsertLineBuffer ( * * FUNCTION: count * - * PARAMETERS: yytext - Contains the matched keyword. - * Type - Keyword/Character type: - * 0 = anything except a keyword - * 1 = pseudo-keywords - * 2 = non-executable ASL keywords - * 3 = executable ASL keywords + * PARAMETERS: yytext - Contains the matched keyword. + * Type - Keyword/Character type: + * 0 = anything except a keyword + * 1 = pseudo-keywords + * 2 = non-executable ASL keywords + * 3 = executable ASL keywords * * RETURN: None * @@ -530,7 +541,7 @@ loop: /* Eat chars until end-of-comment */ - while ((c = input()) != '*' && c != EOF) + while (((c = input ()) != '*') && (c != EOF)) { AslInsertLineBuffer (c); c1 = c; @@ -548,16 +559,16 @@ loop: if ((c1 == '/') && (c == '*')) { AslCommonError (ASL_WARNING, ASL_MSG_NESTED_COMMENT, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_InputByteCount, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_InputByteCount, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); } /* Comment is closed only if the NEXT character is a slash */ AslInsertLineBuffer (c); - if ((c1 = input()) != '/' && c1 != EOF) + if (((c1 = input ()) != '/') && (c1 != EOF)) { unput(c1); goto loop; @@ -577,9 +588,9 @@ EarlyEOF: * Premature End-Of-File */ AslCommonError (ASL_ERROR, ASL_MSG_EARLY_EOF, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); return (FALSE); } @@ -606,7 +617,7 @@ AslDoCommentType2 ( AslInsertLineBuffer ('/'); AslInsertLineBuffer ('/'); - while ((c = input()) != '\n' && c != EOF) + while (((c = input ()) != '\n') && (c != EOF)) { AslInsertLineBuffer (c); } @@ -754,9 +765,9 @@ DoCharacter: /* Unknown escape sequence issue warning, but use the character */ AslCommonError (ASL_WARNING, ASL_MSG_INVALID_ESCAPE, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); break; } break; @@ -781,9 +792,9 @@ DoCharacter: if ((Digit == 0) || (Digit > ACPI_ASCII_MAX)) { AslCommonError (ASL_WARNING, ASL_MSG_INVALID_STRING, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); } else { @@ -825,9 +836,9 @@ DoCharacter: if ((Digit == 0) || (Digit > ACPI_ASCII_MAX)) { AslCommonError (ASL_WARNING, ASL_MSG_INVALID_STRING, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); } else { @@ -869,9 +880,9 @@ DoCharacter: * Premature End-Of-File */ AslCommonError (ASL_ERROR, ASL_MSG_EARLY_EOF, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); return (FALSE); @@ -885,9 +896,9 @@ CompletedString: if (!CleanString) { AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, NULL); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, NULL); return (FALSE); } @@ -901,8 +912,8 @@ BufferOverflow: /* Literal was too long */ AslCommonError (ASL_ERROR, ASL_MSG_STRING_LENGTH, - Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, - Gbl_CurrentLineOffset, Gbl_CurrentColumn, - Gbl_Files[ASL_FILE_INPUT].Filename, "Max length 4096"); + Gbl_CurrentLineNumber, Gbl_LogicalLineNumber, + Gbl_CurrentLineOffset, Gbl_CurrentColumn, + Gbl_Files[ASL_FILE_INPUT].Filename, "Max length 4096"); return (FALSE); } diff --git a/src/acpica/source/compiler/aslsupport.y b/src/acpica/source/compiler/aslsupport.y index f5168d3..6f3cfec 100644 --- a/src/acpica/source/compiler/aslsupport.y +++ b/src/acpica/source/compiler/aslsupport.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltokens.y b/src/acpica/source/compiler/asltokens.y index d58c7e1..0e99c24 100644 --- a/src/acpica/source/compiler/asltokens.y +++ b/src/acpica/source/compiler/asltokens.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltransform.c b/src/acpica/source/compiler/asltransform.c index 5ce8624..df5d994 100644 --- a/src/acpica/source/compiler/asltransform.c +++ b/src/acpica/source/compiler/asltransform.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltree.c b/src/acpica/source/compiler/asltree.c index 2e0daef..a13707e 100644 --- a/src/acpica/source/compiler/asltree.c +++ b/src/acpica/source/compiler/asltree.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltypes.h b/src/acpica/source/compiler/asltypes.h index 931a25e..21c64ed 100644 --- a/src/acpica/source/compiler/asltypes.h +++ b/src/acpica/source/compiler/asltypes.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltypes.y b/src/acpica/source/compiler/asltypes.y index a3699d6..b1821f6 100644 --- a/src/acpica/source/compiler/asltypes.y +++ b/src/acpica/source/compiler/asltypes.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslutils.c b/src/acpica/source/compiler/aslutils.c index a2ddd05..eb8a883 100644 --- a/src/acpica/source/compiler/aslutils.c +++ b/src/acpica/source/compiler/aslutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -643,20 +643,36 @@ UtStringCacheCalloc ( { char *Buffer; ASL_CACHE_INFO *Cache; + UINT32 CacheSize = ASL_STRING_CACHE_SIZE; - if (Length > ASL_STRING_CACHE_SIZE) + if (Length > CacheSize) { - Buffer = UtLocalCalloc (Length); - return (Buffer); + CacheSize = Length; + + if (Gbl_StringCacheList) + { + Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); + + /* Link new cache buffer just following head of list */ + + Cache->Next = Gbl_StringCacheList->Next; + Gbl_StringCacheList->Next = Cache; + + /* Leave cache management pointers alone as they pertain to head */ + + Gbl_StringCount++; + Gbl_StringSize += Length; + + return (Cache->Buffer); + } } if ((Gbl_StringCacheNext + Length) >= Gbl_StringCacheLast) { /* Allocate a new buffer */ - Cache = UtLocalCalloc (sizeof (Cache->Next) + - ASL_STRING_CACHE_SIZE); + Cache = UtLocalCalloc (sizeof (Cache->Next) + CacheSize); /* Link new cache buffer to head of list */ @@ -666,7 +682,7 @@ UtStringCacheCalloc ( /* Setup cache management pointers */ Gbl_StringCacheNext = Cache->Buffer; - Gbl_StringCacheLast = Gbl_StringCacheNext + ASL_STRING_CACHE_SIZE; + Gbl_StringCacheLast = Gbl_StringCacheNext + CacheSize; } Gbl_StringCount++; diff --git a/src/acpica/source/compiler/asluuid.c b/src/acpica/source/compiler/asluuid.c index 98a63a3..db2dd34 100644 --- a/src/acpica/source/compiler/asluuid.c +++ b/src/acpica/source/compiler/asluuid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslwalks.c b/src/acpica/source/compiler/aslwalks.c index be7ef48..679feb0 100644 --- a/src/acpica/source/compiler/aslwalks.c +++ b/src/acpica/source/compiler/aslwalks.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslxref.c b/src/acpica/source/compiler/aslxref.c index 5387cbe..ab68b88 100644 --- a/src/acpica/source/compiler/aslxref.c +++ b/src/acpica/source/compiler/aslxref.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtcompile.c b/src/acpica/source/compiler/dtcompile.c index 10f963c..d5b3347 100644 --- a/src/acpica/source/compiler/dtcompile.c +++ b/src/acpica/source/compiler/dtcompile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtcompiler.h b/src/acpica/source/compiler/dtcompiler.h index 2eda236..b070c58 100644 --- a/src/acpica/source/compiler/dtcompiler.h +++ b/src/acpica/source/compiler/dtcompiler.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtexpress.c b/src/acpica/source/compiler/dtexpress.c index a46c2eb..2fdd4d2 100644 --- a/src/acpica/source/compiler/dtexpress.c +++ b/src/acpica/source/compiler/dtexpress.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtfield.c b/src/acpica/source/compiler/dtfield.c index e3908ba..f3810c2 100644 --- a/src/acpica/source/compiler/dtfield.c +++ b/src/acpica/source/compiler/dtfield.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtio.c b/src/acpica/source/compiler/dtio.c index 77bbc5d..baec96a 100644 --- a/src/acpica/source/compiler/dtio.c +++ b/src/acpica/source/compiler/dtio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtparser.l b/src/acpica/source/compiler/dtparser.l index 7c26759..b3cdf22 100644 --- a/src/acpica/source/compiler/dtparser.l +++ b/src/acpica/source/compiler/dtparser.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtparser.y b/src/acpica/source/compiler/dtparser.y index 40e8066..96e6c14 100644 --- a/src/acpica/source/compiler/dtparser.y +++ b/src/acpica/source/compiler/dtparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtsubtable.c b/src/acpica/source/compiler/dtsubtable.c index 13c2a05..a35792d 100644 --- a/src/acpica/source/compiler/dtsubtable.c +++ b/src/acpica/source/compiler/dtsubtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dttable.c b/src/acpica/source/compiler/dttable.c index b80f870..56bfad7 100644 --- a/src/acpica/source/compiler/dttable.c +++ b/src/acpica/source/compiler/dttable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dttemplate.c b/src/acpica/source/compiler/dttemplate.c index f677f83..b3f32b8 100644 --- a/src/acpica/source/compiler/dttemplate.c +++ b/src/acpica/source/compiler/dttemplate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dttemplate.h b/src/acpica/source/compiler/dttemplate.h index 1dfd5cb..9971f71 100644 --- a/src/acpica/source/compiler/dttemplate.h +++ b/src/acpica/source/compiler/dttemplate.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtutils.c b/src/acpica/source/compiler/dtutils.c index 941fe76..5beadd1 100644 --- a/src/acpica/source/compiler/dtutils.c +++ b/src/acpica/source/compiler/dtutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/preprocess.h b/src/acpica/source/compiler/preprocess.h index b5a57f5..998a25a 100644 --- a/src/acpica/source/compiler/preprocess.h +++ b/src/acpica/source/compiler/preprocess.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prexpress.c b/src/acpica/source/compiler/prexpress.c index f787009..513a443 100644 --- a/src/acpica/source/compiler/prexpress.c +++ b/src/acpica/source/compiler/prexpress.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prmacros.c b/src/acpica/source/compiler/prmacros.c index 6bd6727..798e29b 100644 --- a/src/acpica/source/compiler/prmacros.c +++ b/src/acpica/source/compiler/prmacros.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prparser.l b/src/acpica/source/compiler/prparser.l index fe73c90..e104107 100644 --- a/src/acpica/source/compiler/prparser.l +++ b/src/acpica/source/compiler/prparser.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prparser.y b/src/acpica/source/compiler/prparser.y index 71b33c8..990b79b 100644 --- a/src/acpica/source/compiler/prparser.y +++ b/src/acpica/source/compiler/prparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prscan.c b/src/acpica/source/compiler/prscan.c index 943b721..d52a45e 100644 --- a/src/acpica/source/compiler/prscan.c +++ b/src/acpica/source/compiler/prscan.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prutils.c b/src/acpica/source/compiler/prutils.c index a2b5906..10d65a5 100644 --- a/src/acpica/source/compiler/prutils.c +++ b/src/acpica/source/compiler/prutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbcmds.c b/src/acpica/source/components/debugger/dbcmds.c index 0d39139..8c723b3 100644 --- a/src/acpica/source/components/debugger/dbcmds.c +++ b/src/acpica/source/components/debugger/dbcmds.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbconvert.c b/src/acpica/source/components/debugger/dbconvert.c index 61d5418..14caa2b 100644 --- a/src/acpica/source/components/debugger/dbconvert.c +++ b/src/acpica/source/components/debugger/dbconvert.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbdisply.c b/src/acpica/source/components/debugger/dbdisply.c index 7991f0a..04a7591 100644 --- a/src/acpica/source/components/debugger/dbdisply.c +++ b/src/acpica/source/components/debugger/dbdisply.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -972,7 +972,7 @@ AcpiDbDisplayGpes ( GpeIndex = (i * ACPI_GPE_REGISTER_WIDTH) + j; GpeEventInfo = &GpeBlock->EventInfo[GpeIndex]; - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NONE) { /* This GPE is not used (no method or handler), ignore it */ @@ -1005,7 +1005,7 @@ AcpiDbDisplayGpes ( AcpiOsPrintf ("RunOnly, "); } - switch (GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) { case ACPI_GPE_DISPATCH_NONE: @@ -1016,6 +1016,7 @@ AcpiDbDisplayGpes ( AcpiOsPrintf ("Method"); break; + case ACPI_GPE_DISPATCH_HANDLER: AcpiOsPrintf ("Handler"); @@ -1033,10 +1034,15 @@ AcpiDbDisplayGpes ( AcpiOsPrintf ("Implicit Notify on %u devices", Count); break; + case ACPI_GPE_DISPATCH_RAW_HANDLER: + + AcpiOsPrintf ("RawHandler"); + break; + default: AcpiOsPrintf ("UNKNOWN: %X", - GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK); + ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)); break; } diff --git a/src/acpica/source/components/debugger/dbexec.c b/src/acpica/source/components/debugger/dbexec.c index 253b25a..c865c47 100644 --- a/src/acpica/source/components/debugger/dbexec.c +++ b/src/acpica/source/components/debugger/dbexec.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbfileio.c b/src/acpica/source/components/debugger/dbfileio.c index 4521ee6..768d87c 100644 --- a/src/acpica/source/components/debugger/dbfileio.c +++ b/src/acpica/source/components/debugger/dbfileio.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbhistry.c b/src/acpica/source/components/debugger/dbhistry.c index 18de938..ad11d4f 100644 --- a/src/acpica/source/components/debugger/dbhistry.c +++ b/src/acpica/source/components/debugger/dbhistry.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbinput.c b/src/acpica/source/components/debugger/dbinput.c index a85f5ff..fe34a90 100644 --- a/src/acpica/source/components/debugger/dbinput.c +++ b/src/acpica/source/components/debugger/dbinput.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbmethod.c b/src/acpica/source/components/debugger/dbmethod.c index 67aa9c8..72076a7 100644 --- a/src/acpica/source/components/debugger/dbmethod.c +++ b/src/acpica/source/components/debugger/dbmethod.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbnames.c b/src/acpica/source/components/debugger/dbnames.c index 6cbe840..ccaa672 100644 --- a/src/acpica/source/components/debugger/dbnames.c +++ b/src/acpica/source/components/debugger/dbnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbstats.c b/src/acpica/source/components/debugger/dbstats.c index 70224fa..61095e1 100644 --- a/src/acpica/source/components/debugger/dbstats.c +++ b/src/acpica/source/components/debugger/dbstats.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbtest.c b/src/acpica/source/components/debugger/dbtest.c index fd7201a..26bfc1c 100644 --- a/src/acpica/source/components/debugger/dbtest.c +++ b/src/acpica/source/components/debugger/dbtest.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbutils.c b/src/acpica/source/components/debugger/dbutils.c index fa47bd8..fd3445c 100644 --- a/src/acpica/source/components/debugger/dbutils.c +++ b/src/acpica/source/components/debugger/dbutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbxface.c b/src/acpica/source/components/debugger/dbxface.c index d4cc9e0..ac03ccc 100644 --- a/src/acpica/source/components/debugger/dbxface.c +++ b/src/acpica/source/components/debugger/dbxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmbuffer.c b/src/acpica/source/components/disassembler/dmbuffer.c index 7275eca..8ad879c 100644 --- a/src/acpica/source/components/disassembler/dmbuffer.c +++ b/src/acpica/source/components/disassembler/dmbuffer.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmcstyle.c b/src/acpica/source/components/disassembler/dmcstyle.c index 73d7de2..951af09 100644 --- a/src/acpica/source/components/disassembler/dmcstyle.c +++ b/src/acpica/source/components/disassembler/dmcstyle.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmdeferred.c b/src/acpica/source/components/disassembler/dmdeferred.c index c3fb456..7e654f2 100644 --- a/src/acpica/source/components/disassembler/dmdeferred.c +++ b/src/acpica/source/components/disassembler/dmdeferred.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmnames.c b/src/acpica/source/components/disassembler/dmnames.c index cb4c63b..45df12a 100644 --- a/src/acpica/source/components/disassembler/dmnames.c +++ b/src/acpica/source/components/disassembler/dmnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmobject.c b/src/acpica/source/components/disassembler/dmobject.c index 0a01264..c4680ef 100644 --- a/src/acpica/source/components/disassembler/dmobject.c +++ b/src/acpica/source/components/disassembler/dmobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmopcode.c b/src/acpica/source/components/disassembler/dmopcode.c index f4f2cf6..99d3ead 100644 --- a/src/acpica/source/components/disassembler/dmopcode.c +++ b/src/acpica/source/components/disassembler/dmopcode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrc.c b/src/acpica/source/components/disassembler/dmresrc.c index 649fe4a..654d20b 100644 --- a/src/acpica/source/components/disassembler/dmresrc.c +++ b/src/acpica/source/components/disassembler/dmresrc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrcl.c b/src/acpica/source/components/disassembler/dmresrcl.c index ea2c732..b19dffd 100644 --- a/src/acpica/source/components/disassembler/dmresrcl.c +++ b/src/acpica/source/components/disassembler/dmresrcl.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrcl2.c b/src/acpica/source/components/disassembler/dmresrcl2.c index 5c60cd4..a9eb885 100644 --- a/src/acpica/source/components/disassembler/dmresrcl2.c +++ b/src/acpica/source/components/disassembler/dmresrcl2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrcs.c b/src/acpica/source/components/disassembler/dmresrcs.c index bc28828..cb2084f 100644 --- a/src/acpica/source/components/disassembler/dmresrcs.c +++ b/src/acpica/source/components/disassembler/dmresrcs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmutils.c b/src/acpica/source/components/disassembler/dmutils.c index d48eed7..382ec79 100644 --- a/src/acpica/source/components/disassembler/dmutils.c +++ b/src/acpica/source/components/disassembler/dmutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmwalk.c b/src/acpica/source/components/disassembler/dmwalk.c index b89faf9..79a1872 100644 --- a/src/acpica/source/components/disassembler/dmwalk.c +++ b/src/acpica/source/components/disassembler/dmwalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsargs.c b/src/acpica/source/components/dispatcher/dsargs.c index d70b6a9..8acb5dc 100644 --- a/src/acpica/source/components/dispatcher/dsargs.c +++ b/src/acpica/source/components/dispatcher/dsargs.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dscontrol.c b/src/acpica/source/components/dispatcher/dscontrol.c index 85df0e3..218cbe9 100644 --- a/src/acpica/source/components/dispatcher/dscontrol.c +++ b/src/acpica/source/components/dispatcher/dscontrol.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsfield.c b/src/acpica/source/components/dispatcher/dsfield.c index d14434b..37d4cc1 100644 --- a/src/acpica/source/components/dispatcher/dsfield.c +++ b/src/acpica/source/components/dispatcher/dsfield.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsinit.c b/src/acpica/source/components/dispatcher/dsinit.c index f68c66e..585e127 100644 --- a/src/acpica/source/components/dispatcher/dsinit.c +++ b/src/acpica/source/components/dispatcher/dsinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsmethod.c b/src/acpica/source/components/dispatcher/dsmethod.c index d8d8230..43ee55d 100644 --- a/src/acpica/source/components/dispatcher/dsmethod.c +++ b/src/acpica/source/components/dispatcher/dsmethod.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsmthdat.c b/src/acpica/source/components/dispatcher/dsmthdat.c index 7f94325..2b7fce2 100644 --- a/src/acpica/source/components/dispatcher/dsmthdat.c +++ b/src/acpica/source/components/dispatcher/dsmthdat.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsobject.c b/src/acpica/source/components/dispatcher/dsobject.c index 59d4656..b5cad38 100644 --- a/src/acpica/source/components/dispatcher/dsobject.c +++ b/src/acpica/source/components/dispatcher/dsobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsopcode.c b/src/acpica/source/components/dispatcher/dsopcode.c index c1f265d..6a761f5 100644 --- a/src/acpica/source/components/dispatcher/dsopcode.c +++ b/src/acpica/source/components/dispatcher/dsopcode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsutils.c b/src/acpica/source/components/dispatcher/dsutils.c index 81d73cb..b98fc9a 100644 --- a/src/acpica/source/components/dispatcher/dsutils.c +++ b/src/acpica/source/components/dispatcher/dsutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswexec.c b/src/acpica/source/components/dispatcher/dswexec.c index 877d30f..f650ced 100644 --- a/src/acpica/source/components/dispatcher/dswexec.c +++ b/src/acpica/source/components/dispatcher/dswexec.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswload.c b/src/acpica/source/components/dispatcher/dswload.c index de70dee..be090fc 100644 --- a/src/acpica/source/components/dispatcher/dswload.c +++ b/src/acpica/source/components/dispatcher/dswload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswload2.c b/src/acpica/source/components/dispatcher/dswload2.c index 4fc1485..312b2cd 100644 --- a/src/acpica/source/components/dispatcher/dswload2.c +++ b/src/acpica/source/components/dispatcher/dswload2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswscope.c b/src/acpica/source/components/dispatcher/dswscope.c index 7caa301..9865dcd 100644 --- a/src/acpica/source/components/dispatcher/dswscope.c +++ b/src/acpica/source/components/dispatcher/dswscope.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswstate.c b/src/acpica/source/components/dispatcher/dswstate.c index 4d24d2c..e5ea508 100644 --- a/src/acpica/source/components/dispatcher/dswstate.c +++ b/src/acpica/source/components/dispatcher/dswstate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evevent.c b/src/acpica/source/components/events/evevent.c index f43eeff..e447356 100644 --- a/src/acpica/source/components/events/evevent.c +++ b/src/acpica/source/components/events/evevent.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evglock.c b/src/acpica/source/components/events/evglock.c index fa1954a..e1ebf19 100644 --- a/src/acpica/source/components/events/evglock.c +++ b/src/acpica/source/components/events/evglock.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evgpe.c b/src/acpica/source/components/events/evgpe.c index ea1a3a6..16428d6 100644 --- a/src/acpica/source/components/events/evgpe.c +++ b/src/acpica/source/components/events/evgpe.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -203,18 +203,6 @@ AcpiEvEnableGpe ( ACPI_FUNCTION_TRACE (EvEnableGpe); - /* - * We will only allow a GPE to be enabled if it has either an associated - * method (_Lxx/_Exx) or a handler, or is using the implicit notify - * feature. Otherwise, the GPE will be immediately disabled by - * AcpiEvGpeDispatch the first time it fires. - */ - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == - ACPI_GPE_DISPATCH_NONE) - { - return_ACPI_STATUS (AE_NO_HANDLER); - } - /* Clear the GPE (of stale events) */ Status = AcpiHwClearGpe (GpeEventInfo); @@ -225,7 +213,7 @@ AcpiEvEnableGpe ( /* Enable the requested GPE */ - Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE_SAVE); return_ACPI_STATUS (Status); } @@ -315,7 +303,7 @@ AcpiEvRemoveGpeReference ( Status = AcpiEvUpdateGpeEnableMask (GpeEventInfo); if (ACPI_SUCCESS (Status)) { - Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE); + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE_SAVE); } if (ACPI_FAILURE (Status)) @@ -455,7 +443,11 @@ AcpiEvGpeDetect ( { ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; + ACPI_NAMESPACE_NODE *GpeDevice; ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; + ACPI_GPE_EVENT_INFO *GpeEventInfo; + UINT32 GpeNumber; + ACPI_GPE_HANDLER_INFO *GpeHandlerInfo; UINT32 IntStatus = ACPI_INTERRUPT_NOT_HANDLED; UINT8 EnabledStatusByte; UINT32 StatusReg; @@ -486,6 +478,8 @@ AcpiEvGpeDetect ( GpeBlock = GpeXruptList->GpeBlockListHead; while (GpeBlock) { + GpeDevice = GpeBlock->Node; + /* * Read all of the 8-bit GPE status and enable registers in this GPE * block, saving all of them. Find all currently active GP events. @@ -554,16 +548,55 @@ AcpiEvGpeDetect ( { /* Examine one GPE bit */ + GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * + ACPI_GPE_REGISTER_WIDTH) + j]; + GpeNumber = j + GpeRegisterInfo->BaseGpeNumber; + if (EnabledStatusByte & (1 << j)) { - /* - * Found an active GPE. Dispatch the event to a handler - * or method. - */ - IntStatus |= AcpiEvGpeDispatch (GpeBlock->Node, - &GpeBlock->EventInfo[((ACPI_SIZE) i * - ACPI_GPE_REGISTER_WIDTH) + j], - j + GpeRegisterInfo->BaseGpeNumber); + /* Invoke global event handler if present */ + + AcpiGpeCount++; + if (AcpiGbl_GlobalEventHandler) + { + AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, + GpeDevice, GpeNumber, + AcpiGbl_GlobalEventHandlerContext); + } + + /* Found an active GPE */ + + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_RAW_HANDLER) + { + /* Dispatch the event to a raw handler */ + + GpeHandlerInfo = GpeEventInfo->Dispatch.Handler; + + /* + * There is no protection around the namespace node + * and the GPE handler to ensure a safe destruction + * because: + * 1. The namespace node is expected to always + * exist after loading a table. + * 2. The GPE handler is expected to be flushed by + * AcpiOsWaitEventsComplete() before the + * destruction. + */ + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + IntStatus |= GpeHandlerInfo->Address ( + GpeDevice, GpeNumber, GpeHandlerInfo->Context); + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + } + else + { + /* + * Dispatch the event to a standard handler or + * method. + */ + IntStatus |= AcpiEvGpeDispatch (GpeDevice, + GpeEventInfo, GpeNumber); + } } } } @@ -599,8 +632,7 @@ AcpiEvAsynchExecuteGpeMethod ( void *Context) { ACPI_GPE_EVENT_INFO *GpeEventInfo = Context; - ACPI_STATUS Status; - ACPI_GPE_EVENT_INFO *LocalGpeEventInfo; + ACPI_STATUS Status = AE_OK; ACPI_EVALUATE_INFO *Info; ACPI_GPE_NOTIFY_INFO *Notify; @@ -608,49 +640,9 @@ AcpiEvAsynchExecuteGpeMethod ( ACPI_FUNCTION_TRACE (EvAsynchExecuteGpeMethod); - /* Allocate a local GPE block */ - - LocalGpeEventInfo = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_EVENT_INFO)); - if (!LocalGpeEventInfo) - { - ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, - "while handling a GPE")); - return_VOID; - } - - Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); - if (ACPI_FAILURE (Status)) - { - ACPI_FREE (LocalGpeEventInfo); - return_VOID; - } - - /* Must revalidate the GpeNumber/GpeBlock */ - - if (!AcpiEvValidGpeEvent (GpeEventInfo)) - { - Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS); - ACPI_FREE (LocalGpeEventInfo); - return_VOID; - } - - /* - * Take a snapshot of the GPE info for this level - we copy the info to - * prevent a race condition with RemoveHandler/RemoveBlock. - */ - ACPI_MEMCPY (LocalGpeEventInfo, GpeEventInfo, - sizeof (ACPI_GPE_EVENT_INFO)); - - Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS); - if (ACPI_FAILURE (Status)) - { - ACPI_FREE (LocalGpeEventInfo); - return_VOID; - } - /* Do the correct dispatch - normal method or implicit notify */ - switch (LocalGpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) { case ACPI_GPE_DISPATCH_NOTIFY: /* @@ -664,7 +656,7 @@ AcpiEvAsynchExecuteGpeMethod ( * June 2012: Expand implicit notify mechanism to support * notifies on multiple device objects. */ - Notify = LocalGpeEventInfo->Dispatch.NotifyList; + Notify = GpeEventInfo->Dispatch.NotifyList; while (ACPI_SUCCESS (Status) && Notify) { Status = AcpiEvQueueNotifyRequest (Notify->DeviceNode, @@ -689,7 +681,7 @@ AcpiEvAsynchExecuteGpeMethod ( * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the * _Lxx/_Exx control method that corresponds to this GPE */ - Info->PrefixNode = LocalGpeEventInfo->Dispatch.MethodNode; + Info->PrefixNode = GpeEventInfo->Dispatch.MethodNode; Info->Flags = ACPI_IGNORE_RETURN_VALUE; Status = AcpiNsEvaluate (Info); @@ -700,23 +692,26 @@ AcpiEvAsynchExecuteGpeMethod ( { ACPI_EXCEPTION ((AE_INFO, Status, "while evaluating GPE method [%4.4s]", - AcpiUtGetNodeName (LocalGpeEventInfo->Dispatch.MethodNode))); + AcpiUtGetNodeName (GpeEventInfo->Dispatch.MethodNode))); } break; default: - return_VOID; /* Should never happen */ + goto ErrorExit; /* Should never happen */ } /* Defer enabling of GPE until all notify handlers are done */ Status = AcpiOsExecute (OSL_NOTIFY_HANDLER, - AcpiEvAsynchEnableGpe, LocalGpeEventInfo); - if (ACPI_FAILURE (Status)) + AcpiEvAsynchEnableGpe, GpeEventInfo); + if (ACPI_SUCCESS (Status)) { - ACPI_FREE (LocalGpeEventInfo); + return_VOID; } + +ErrorExit: + AcpiEvAsynchEnableGpe (GpeEventInfo); return_VOID; } @@ -740,11 +735,13 @@ AcpiEvAsynchEnableGpe ( void *Context) { ACPI_GPE_EVENT_INFO *GpeEventInfo = Context; + ACPI_CPU_FLAGS Flags; + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); (void) AcpiEvFinishGpe (GpeEventInfo); + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); - ACPI_FREE (GpeEventInfo); return; } @@ -785,7 +782,7 @@ AcpiEvFinishGpe ( /* * Enable this GPE, conditionally. This means that the GPE will - * only be physically enabled if the EnableForRun bit is set + * only be physically enabled if the EnableMask bit is set * in the EventInfo. */ (void) AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_CONDITIONAL_ENABLE); @@ -823,15 +820,6 @@ AcpiEvGpeDispatch ( ACPI_FUNCTION_TRACE (EvGpeDispatch); - /* Invoke global event handler if present */ - - AcpiGpeCount++; - if (AcpiGbl_GlobalEventHandler) - { - AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, GpeDevice, - GpeNumber, AcpiGbl_GlobalEventHandlerContext); - } - /* * Always disable the GPE so that it does not keep firing before * any asynchronous activity completes (either from the execution @@ -874,7 +862,7 @@ AcpiEvGpeDispatch ( * If there is neither a handler nor a method, leave the GPE * disabled. */ - switch (GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) + switch (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags)) { case ACPI_GPE_DISPATCH_HANDLER: diff --git a/src/acpica/source/components/events/evgpeblk.c b/src/acpica/source/components/events/evgpeblk.c index 4de91c1..e067457 100644 --- a/src/acpica/source/components/events/evgpeblk.c +++ b/src/acpica/source/components/events/evgpeblk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -590,8 +590,9 @@ AcpiEvInitializeGpeBlock ( * Ignore GPEs that have no corresponding _Lxx/_Exx method * and GPEs that are used to wake the system */ - if (((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == ACPI_GPE_DISPATCH_NONE) || - ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == ACPI_GPE_DISPATCH_HANDLER) || + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NONE) || + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_HANDLER) || + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_RAW_HANDLER) || (GpeEventInfo->Flags & ACPI_GPE_CAN_WAKE)) { continue; diff --git a/src/acpica/source/components/events/evgpeinit.c b/src/acpica/source/components/events/evgpeinit.c index 237a96c..5848b75 100644 --- a/src/acpica/source/components/events/evgpeinit.c +++ b/src/acpica/source/components/events/evgpeinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -491,15 +491,17 @@ AcpiEvMatchGpeMethod ( return_ACPI_STATUS (AE_OK); } - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == - ACPI_GPE_DISPATCH_HANDLER) + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_HANDLER) || + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_RAW_HANDLER)) { /* If there is already a handler, ignore this GPE method */ return_ACPI_STATUS (AE_OK); } - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_METHOD) { /* diff --git a/src/acpica/source/components/events/evgpeutil.c b/src/acpica/source/components/events/evgpeutil.c index 0410bae..f204bba 100644 --- a/src/acpica/source/components/events/evgpeutil.c +++ b/src/acpica/source/components/events/evgpeutil.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -187,60 +187,6 @@ UnlockAndExit: /******************************************************************************* * - * FUNCTION: AcpiEvValidGpeEvent - * - * PARAMETERS: GpeEventInfo - Info for this GPE - * - * RETURN: TRUE if the GpeEvent is valid - * - * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL. - * Should be called only when the GPE lists are semaphore locked - * and not subject to change. - * - ******************************************************************************/ - -BOOLEAN -AcpiEvValidGpeEvent ( - ACPI_GPE_EVENT_INFO *GpeEventInfo) -{ - ACPI_GPE_XRUPT_INFO *GpeXruptBlock; - ACPI_GPE_BLOCK_INFO *GpeBlock; - - - ACPI_FUNCTION_ENTRY (); - - - /* No need for spin lock since we are not changing any list elements */ - - /* Walk the GPE interrupt levels */ - - GpeXruptBlock = AcpiGbl_GpeXruptListHead; - while (GpeXruptBlock) - { - GpeBlock = GpeXruptBlock->GpeBlockListHead; - - /* Walk the GPE blocks on this interrupt level */ - - while (GpeBlock) - { - if ((&GpeBlock->EventInfo[0] <= GpeEventInfo) && - (&GpeBlock->EventInfo[GpeBlock->GpeCount] > GpeEventInfo)) - { - return (TRUE); - } - - GpeBlock = GpeBlock->Next; - } - - GpeXruptBlock = GpeXruptBlock->Next; - } - - return (FALSE); -} - - -/******************************************************************************* - * * FUNCTION: AcpiEvGetGpeDevice * * PARAMETERS: GPE_WALK_CALLBACK @@ -488,8 +434,10 @@ AcpiEvDeleteGpeHandlers ( GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * ACPI_GPE_REGISTER_WIDTH) + j]; - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == - ACPI_GPE_DISPATCH_HANDLER) + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_HANDLER) || + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_RAW_HANDLER)) { /* Delete an installed handler block */ @@ -497,7 +445,7 @@ AcpiEvDeleteGpeHandlers ( GpeEventInfo->Dispatch.Handler = NULL; GpeEventInfo->Flags &= ~ACPI_GPE_DISPATCH_MASK; } - else if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == + else if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NOTIFY) { /* Delete the implicit notification device list */ diff --git a/src/acpica/source/components/events/evhandler.c b/src/acpica/source/components/events/evhandler.c index b67ba3e..d02ea53 100644 --- a/src/acpica/source/components/events/evhandler.c +++ b/src/acpica/source/components/events/evhandler.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evmisc.c b/src/acpica/source/components/events/evmisc.c index 8b2c3ff..1735038 100644 --- a/src/acpica/source/components/events/evmisc.c +++ b/src/acpica/source/components/events/evmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evregion.c b/src/acpica/source/components/events/evregion.c index ec681da..bd0fd7b 100644 --- a/src/acpica/source/components/events/evregion.c +++ b/src/acpica/source/components/events/evregion.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evrgnini.c b/src/acpica/source/components/events/evrgnini.c index d439c31..405af22 100644 --- a/src/acpica/source/components/events/evrgnini.c +++ b/src/acpica/source/components/events/evrgnini.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evsci.c b/src/acpica/source/components/events/evsci.c index ec6c1c1..987b03c 100644 --- a/src/acpica/source/components/events/evsci.c +++ b/src/acpica/source/components/events/evsci.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evxface.c b/src/acpica/source/components/events/evxface.c index 9b8a1ce..5e3391d 100644 --- a/src/acpica/source/components/events/evxface.c +++ b/src/acpica/source/components/events/evxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -124,6 +124,21 @@ #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evxface") +#if (!ACPI_REDUCED_HARDWARE) + +/* Local prototypes */ + +static ACPI_STATUS +AcpiEvInstallGpeHandler ( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber, + UINT32 Type, + BOOLEAN IsRawHandler, + ACPI_GPE_HANDLER Address, + void *Context); + +#endif + /******************************************************************************* * @@ -894,27 +909,31 @@ ACPI_EXPORT_SYMBOL (AcpiRemoveFixedEventHandler) /******************************************************************************* * - * FUNCTION: AcpiInstallGpeHandler + * FUNCTION: AcpiEvInstallGpeHandler * * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT * defined GPEs) * GpeNumber - The GPE number within the GPE block * Type - Whether this GPE should be treated as an * edge- or level-triggered interrupt. + * IsRawHandler - Whether this GPE should be handled using + * the special GPE handler mode. * Address - Address of the handler * Context - Value passed to the handler on each GPE * * RETURN: Status * - * DESCRIPTION: Install a handler for a General Purpose Event. + * DESCRIPTION: Internal function to install a handler for a General Purpose + * Event. * ******************************************************************************/ -ACPI_STATUS -AcpiInstallGpeHandler ( +static ACPI_STATUS +AcpiEvInstallGpeHandler ( ACPI_HANDLE GpeDevice, UINT32 GpeNumber, UINT32 Type, + BOOLEAN IsRawHandler, ACPI_GPE_HANDLER Address, void *Context) { @@ -924,7 +943,7 @@ AcpiInstallGpeHandler ( ACPI_CPU_FLAGS Flags; - ACPI_FUNCTION_TRACE (AcpiInstallGpeHandler); + ACPI_FUNCTION_TRACE (EvInstallGpeHandler); /* Parameter validation */ @@ -962,8 +981,10 @@ AcpiInstallGpeHandler ( /* Make sure that there isn't a handler there already */ - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == - ACPI_GPE_DISPATCH_HANDLER) + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_HANDLER) || + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_RAW_HANDLER)) { Status = AE_ALREADY_EXISTS; goto FreeAndExit; @@ -980,8 +1001,10 @@ AcpiInstallGpeHandler ( * automatically during initialization, in which case it has to be * disabled now to avoid spurious execution of the handler. */ - if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) || - (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) && + if (((ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == + ACPI_GPE_DISPATCH_METHOD) || + (ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == + ACPI_GPE_DISPATCH_NOTIFY)) && GpeEventInfo->RuntimeCount) { Handler->OriginallyEnabled = TRUE; @@ -1002,7 +1025,8 @@ AcpiInstallGpeHandler ( /* Setup up dispatch flags to indicate handler (vs. method/notify) */ GpeEventInfo->Flags &= ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK); - GpeEventInfo->Flags |= (UINT8) (Type | ACPI_GPE_DISPATCH_HANDLER); + GpeEventInfo->Flags |= (UINT8) (Type | (IsRawHandler ? + ACPI_GPE_DISPATCH_RAW_HANDLER : ACPI_GPE_DISPATCH_HANDLER)); AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); @@ -1017,11 +1041,91 @@ FreeAndExit: goto UnlockAndExit; } + +/******************************************************************************* + * + * FUNCTION: AcpiInstallGpeHandler + * + * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT + * defined GPEs) + * GpeNumber - The GPE number within the GPE block + * Type - Whether this GPE should be treated as an + * edge- or level-triggered interrupt. + * Address - Address of the handler + * Context - Value passed to the handler on each GPE + * + * RETURN: Status + * + * DESCRIPTION: Install a handler for a General Purpose Event. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiInstallGpeHandler ( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber, + UINT32 Type, + ACPI_GPE_HANDLER Address, + void *Context) +{ + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (AcpiInstallGpeHandler); + + + Status = AcpiEvInstallGpeHandler (GpeDevice, GpeNumber, Type, FALSE, + Address, Context); + + return_ACPI_STATUS (Status); +} + ACPI_EXPORT_SYMBOL (AcpiInstallGpeHandler) /******************************************************************************* * + * FUNCTION: AcpiInstallGpeRawHandler + * + * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT + * defined GPEs) + * GpeNumber - The GPE number within the GPE block + * Type - Whether this GPE should be treated as an + * edge- or level-triggered interrupt. + * Address - Address of the handler + * Context - Value passed to the handler on each GPE + * + * RETURN: Status + * + * DESCRIPTION: Install a handler for a General Purpose Event. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiInstallGpeRawHandler ( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber, + UINT32 Type, + ACPI_GPE_HANDLER Address, + void *Context) +{ + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (AcpiInstallGpeRawHandler); + + + Status = AcpiEvInstallGpeHandler (GpeDevice, GpeNumber, Type, TRUE, + Address, Context); + + return_ACPI_STATUS (Status); +} + +ACPI_EXPORT_SYMBOL (AcpiInstallGpeRawHandler) + + +/******************************************************************************* + * * FUNCTION: AcpiRemoveGpeHandler * * PARAMETERS: GpeDevice - Namespace node for the GPE (NULL for FADT @@ -1076,8 +1180,10 @@ AcpiRemoveGpeHandler ( /* Make sure that a handler is indeed installed */ - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != - ACPI_GPE_DISPATCH_HANDLER) + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != + ACPI_GPE_DISPATCH_HANDLER) && + (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != + ACPI_GPE_DISPATCH_RAW_HANDLER)) { Status = AE_NOT_EXIST; goto UnlockAndExit; @@ -1094,6 +1200,7 @@ AcpiRemoveGpeHandler ( /* Remove the handler */ Handler = GpeEventInfo->Dispatch.Handler; + GpeEventInfo->Dispatch.Handler = NULL; /* Restore Method node (if any), set dispatch flags */ @@ -1107,8 +1214,10 @@ AcpiRemoveGpeHandler ( * enabled, it should be enabled at this point to restore the * post-initialization configuration. */ - if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) || - (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) && + if (((ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == + ACPI_GPE_DISPATCH_METHOD) || + (ACPI_GPE_DISPATCH_TYPE (Handler->OriginalFlags) == + ACPI_GPE_DISPATCH_NOTIFY)) && Handler->OriginallyEnabled) { (void) AcpiEvAddGpeReference (GpeEventInfo); diff --git a/src/acpica/source/components/events/evxfevnt.c b/src/acpica/source/components/events/evxfevnt.c index caa3810..426a0be 100644 --- a/src/acpica/source/components/events/evxfevnt.c +++ b/src/acpica/source/components/events/evxfevnt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evxfgpe.c b/src/acpica/source/components/events/evxfgpe.c index 5da1775..f4f0da1 100644 --- a/src/acpica/source/components/events/evxfgpe.c +++ b/src/acpica/source/components/events/evxfgpe.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -219,7 +219,7 @@ AcpiEnableGpe ( GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber); if (GpeEventInfo) { - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != ACPI_GPE_DISPATCH_NONE) { Status = AcpiEvAddGpeReference (GpeEventInfo); @@ -293,12 +293,21 @@ ACPI_EXPORT_SYMBOL (AcpiDisableGpe) * RETURN: Status * * DESCRIPTION: Enable or disable an individual GPE. This function bypasses - * the reference count mechanism used in the AcpiEnableGpe and - * AcpiDisableGpe interfaces -- and should be used with care. - * - * Note: Typically used to disable a runtime GPE for short period of time, - * then re-enable it, without disturbing the existing reference counts. This - * is useful, for example, in the Embedded Controller (EC) driver. + * the reference count mechanism used in the AcpiEnableGpe(), + * AcpiDisableGpe() interfaces. + * This API is typically used by the GPE raw handler mode driver + * to switch between the polling mode and the interrupt mode after + * the driver has enabled the GPE. + * The APIs should be invoked in this order: + * AcpiEnableGpe() <- Ensure the reference count > 0 + * AcpiSetGpe(ACPI_GPE_DISABLE) <- Enter polling mode + * AcpiSetGpe(ACPI_GPE_ENABLE) <- Leave polling mode + * AcpiDisableGpe() <- Decrease the reference count + * + * Note: If a GPE is shared by 2 silicon components, then both the drivers + * should support GPE polling mode or disabling the GPE for long period + * for one driver may break the other. So use it with care since all + * firmware _Lxx/_Exx handlers currently rely on the GPE interrupt mode. * ******************************************************************************/ @@ -333,7 +342,7 @@ AcpiSetGpe ( { case ACPI_GPE_ENABLE: - Status = AcpiEvEnableGpe (GpeEventInfo); + Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); break; case ACPI_GPE_DISABLE: @@ -502,7 +511,7 @@ AcpiSetupGpeForWake ( * known as an "implicit notify". Note: The GPE is assumed to be * level-triggered (for windows compatibility). */ - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NONE) { /* @@ -517,7 +526,7 @@ AcpiSetupGpeForWake ( * If we already have an implicit notify on this GPE, add * this device to the notify list. */ - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) == + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NOTIFY) { /* Ensure that the device is not already in the list */ @@ -874,6 +883,44 @@ AcpiEnableAllRuntimeGpes ( ACPI_EXPORT_SYMBOL (AcpiEnableAllRuntimeGpes) +/****************************************************************************** + * + * FUNCTION: AcpiEnableAllWakeupGpes + * + * PARAMETERS: None + * + * RETURN: Status + * + * DESCRIPTION: Enable all "wakeup" GPEs and disable all of the other GPEs, in + * all GPE blocks. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiEnableAllWakeupGpes ( + void) +{ + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (AcpiEnableAllWakeupGpes); + + + Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + + Status = AcpiHwEnableAllWakeupGpes (); + (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS); + + return_ACPI_STATUS (Status); +} + +ACPI_EXPORT_SYMBOL (AcpiEnableAllWakeupGpes) + + /******************************************************************************* * * FUNCTION: AcpiInstallGpeBlock diff --git a/src/acpica/source/components/events/evxfregn.c b/src/acpica/source/components/events/evxfregn.c index a305e3f..e220676 100644 --- a/src/acpica/source/components/events/evxfregn.c +++ b/src/acpica/source/components/events/evxfregn.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exconfig.c b/src/acpica/source/components/executer/exconfig.c index 2fd6e36..c311a69 100644 --- a/src/acpica/source/components/executer/exconfig.c +++ b/src/acpica/source/components/executer/exconfig.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exconvrt.c b/src/acpica/source/components/executer/exconvrt.c index 00f0310..1cf54e2 100644 --- a/src/acpica/source/components/executer/exconvrt.c +++ b/src/acpica/source/components/executer/exconvrt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/excreate.c b/src/acpica/source/components/executer/excreate.c index 90a389a..90a3632 100644 --- a/src/acpica/source/components/executer/excreate.c +++ b/src/acpica/source/components/executer/excreate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exdebug.c b/src/acpica/source/components/executer/exdebug.c index eb1daad..64fef55 100644 --- a/src/acpica/source/components/executer/exdebug.c +++ b/src/acpica/source/components/executer/exdebug.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exdump.c b/src/acpica/source/components/executer/exdump.c index 4d6a186..8d318a0 100644 --- a/src/acpica/source/components/executer/exdump.c +++ b/src/acpica/source/components/executer/exdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exfield.c b/src/acpica/source/components/executer/exfield.c index e33f82c..3083985 100644 --- a/src/acpica/source/components/executer/exfield.c +++ b/src/acpica/source/components/executer/exfield.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exfldio.c b/src/acpica/source/components/executer/exfldio.c index e29ae66..3e6b18f 100644 --- a/src/acpica/source/components/executer/exfldio.c +++ b/src/acpica/source/components/executer/exfldio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exmisc.c b/src/acpica/source/components/executer/exmisc.c index 94053d5..d92b271 100644 --- a/src/acpica/source/components/executer/exmisc.c +++ b/src/acpica/source/components/executer/exmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exmutex.c b/src/acpica/source/components/executer/exmutex.c index 962b9c1..c688a50 100644 --- a/src/acpica/source/components/executer/exmutex.c +++ b/src/acpica/source/components/executer/exmutex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exnames.c b/src/acpica/source/components/executer/exnames.c index 67f7930..b402d3b 100644 --- a/src/acpica/source/components/executer/exnames.c +++ b/src/acpica/source/components/executer/exnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg1.c b/src/acpica/source/components/executer/exoparg1.c index 8ce7610..c7addbd 100644 --- a/src/acpica/source/components/executer/exoparg1.c +++ b/src/acpica/source/components/executer/exoparg1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg2.c b/src/acpica/source/components/executer/exoparg2.c index 2519dca..399b259 100644 --- a/src/acpica/source/components/executer/exoparg2.c +++ b/src/acpica/source/components/executer/exoparg2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg3.c b/src/acpica/source/components/executer/exoparg3.c index 4e6842b..507720f 100644 --- a/src/acpica/source/components/executer/exoparg3.c +++ b/src/acpica/source/components/executer/exoparg3.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg6.c b/src/acpica/source/components/executer/exoparg6.c index 9cd26e0..a7d76d6 100644 --- a/src/acpica/source/components/executer/exoparg6.c +++ b/src/acpica/source/components/executer/exoparg6.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exprep.c b/src/acpica/source/components/executer/exprep.c index dc764bb..d84ccc3 100644 --- a/src/acpica/source/components/executer/exprep.c +++ b/src/acpica/source/components/executer/exprep.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exregion.c b/src/acpica/source/components/executer/exregion.c index 544412e..5b66ffa 100644 --- a/src/acpica/source/components/executer/exregion.c +++ b/src/acpica/source/components/executer/exregion.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exresnte.c b/src/acpica/source/components/executer/exresnte.c index 7640a01..d72ec55 100644 --- a/src/acpica/source/components/executer/exresnte.c +++ b/src/acpica/source/components/executer/exresnte.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exresolv.c b/src/acpica/source/components/executer/exresolv.c index 35bb6bb..e874342 100644 --- a/src/acpica/source/components/executer/exresolv.c +++ b/src/acpica/source/components/executer/exresolv.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exresop.c b/src/acpica/source/components/executer/exresop.c index 6dc28aa..fab4993 100644 --- a/src/acpica/source/components/executer/exresop.c +++ b/src/acpica/source/components/executer/exresop.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exstore.c b/src/acpica/source/components/executer/exstore.c index cf47621..47c212d 100644 --- a/src/acpica/source/components/executer/exstore.c +++ b/src/acpica/source/components/executer/exstore.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exstoren.c b/src/acpica/source/components/executer/exstoren.c index 82944c5..c1879b4 100644 --- a/src/acpica/source/components/executer/exstoren.c +++ b/src/acpica/source/components/executer/exstoren.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exstorob.c b/src/acpica/source/components/executer/exstorob.c index f36e9fc..48c3440 100644 --- a/src/acpica/source/components/executer/exstorob.c +++ b/src/acpica/source/components/executer/exstorob.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exsystem.c b/src/acpica/source/components/executer/exsystem.c index 0bce72a..49ec2e9 100644 --- a/src/acpica/source/components/executer/exsystem.c +++ b/src/acpica/source/components/executer/exsystem.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exutils.c b/src/acpica/source/components/executer/exutils.c index 63bfb84..b432cba 100644 --- a/src/acpica/source/components/executer/exutils.c +++ b/src/acpica/source/components/executer/exutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwacpi.c b/src/acpica/source/components/hardware/hwacpi.c index 0dff876..0530383 100644 --- a/src/acpica/source/components/hardware/hwacpi.c +++ b/src/acpica/source/components/hardware/hwacpi.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwesleep.c b/src/acpica/source/components/hardware/hwesleep.c index 0dab77a..ba8acdc 100644 --- a/src/acpica/source/components/hardware/hwesleep.c +++ b/src/acpica/source/components/hardware/hwesleep.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwgpe.c b/src/acpica/source/components/hardware/hwgpe.c index 0125685..d39b7ac 100644 --- a/src/acpica/source/components/hardware/hwgpe.c +++ b/src/acpica/source/components/hardware/hwgpe.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -130,6 +130,11 @@ AcpiHwEnableWakeupGpeBlock ( ACPI_GPE_BLOCK_INFO *GpeBlock, void *Context); +static ACPI_STATUS +AcpiHwGpeEnableWrite ( + UINT8 EnableMask, + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo); + /****************************************************************************** * @@ -200,13 +205,13 @@ AcpiHwLowSetGpe ( /* Set or clear just the bit that corresponds to this GPE */ RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); - switch (Action) + switch (Action & ~ACPI_GPE_SAVE_MASK) { case ACPI_GPE_CONDITIONAL_ENABLE: - /* Only enable if the EnableForRun bit is set */ + /* Only enable if the corresponding EnableMask bit is set */ - if (!(RegisterBit & GpeRegisterInfo->EnableForRun)) + if (!(RegisterBit & GpeRegisterInfo->EnableMask)) { return (AE_BAD_PARAMETER); } @@ -232,6 +237,10 @@ AcpiHwLowSetGpe ( /* Write the updated enable mask */ Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress); + if (ACPI_SUCCESS (Status) && (Action & ACPI_GPE_SAVE_MASK)) + { + GpeRegisterInfo->EnableMask = (UINT8) EnableMask; + } return (Status); } @@ -315,7 +324,7 @@ AcpiHwGetGpeStatus ( /* GPE currently handled? */ - if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) != + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != ACPI_GPE_DISPATCH_NONE) { LocalEventStatus |= ACPI_EVENT_FLAG_HAS_HANDLER; @@ -365,6 +374,37 @@ AcpiHwGetGpeStatus ( /****************************************************************************** * + * FUNCTION: AcpiHwGpeEnableWrite + * + * PARAMETERS: EnableMask - Bit mask to write to the GPE register + * GpeRegisterInfo - Gpe Register info + * + * RETURN: Status + * + * DESCRIPTION: Write the enable mask byte to the given GPE register. + * + ******************************************************************************/ + +static ACPI_STATUS +AcpiHwGpeEnableWrite ( + UINT8 EnableMask, + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo) +{ + ACPI_STATUS Status; + + + Status = AcpiHwWrite (EnableMask, &GpeRegisterInfo->EnableAddress); + if (ACPI_SUCCESS (Status)) + { + GpeRegisterInfo->EnableMask = EnableMask; + } + + return (Status); +} + + +/****************************************************************************** + * * FUNCTION: AcpiHwDisableGpeBlock * * PARAMETERS: GpeXruptInfo - GPE Interrupt info @@ -392,7 +432,7 @@ AcpiHwDisableGpeBlock ( { /* Disable all GPEs in this register */ - Status = AcpiHwWrite (0x00, &GpeBlock->RegisterInfo[i].EnableAddress); + Status = AcpiHwGpeEnableWrite (0x00, &GpeBlock->RegisterInfo[i]); if (ACPI_FAILURE (Status)) { return (Status); @@ -465,6 +505,7 @@ AcpiHwEnableRuntimeGpeBlock ( { UINT32 i; ACPI_STATUS Status; + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; /* NOTE: assumes that all GPEs are currently disabled */ @@ -473,15 +514,16 @@ AcpiHwEnableRuntimeGpeBlock ( for (i = 0; i < GpeBlock->RegisterCount; i++) { - if (!GpeBlock->RegisterInfo[i].EnableForRun) + GpeRegisterInfo = &GpeBlock->RegisterInfo[i]; + if (!GpeRegisterInfo->EnableForRun) { continue; } /* Enable all "runtime" GPEs in this register */ - Status = AcpiHwWrite (GpeBlock->RegisterInfo[i].EnableForRun, - &GpeBlock->RegisterInfo[i].EnableAddress); + Status = AcpiHwGpeEnableWrite (GpeRegisterInfo->EnableForRun, + GpeRegisterInfo); if (ACPI_FAILURE (Status)) { return (Status); @@ -514,21 +556,21 @@ AcpiHwEnableWakeupGpeBlock ( { UINT32 i; ACPI_STATUS Status; + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; /* Examine each GPE Register within the block */ for (i = 0; i < GpeBlock->RegisterCount; i++) { - if (!GpeBlock->RegisterInfo[i].EnableForWake) - { - continue; - } - - /* Enable all "wake" GPEs in this register */ - - Status = AcpiHwWrite (GpeBlock->RegisterInfo[i].EnableForWake, - &GpeBlock->RegisterInfo[i].EnableAddress); + GpeRegisterInfo = &GpeBlock->RegisterInfo[i]; + + /* + * Enable all "wake" GPEs in this register and disable the + * remaining ones. + */ + Status = AcpiHwGpeEnableWrite (GpeRegisterInfo->EnableForWake, + GpeRegisterInfo); if (ACPI_FAILURE (Status)) { return (Status); diff --git a/src/acpica/source/components/hardware/hwpci.c b/src/acpica/source/components/hardware/hwpci.c index 4470b5c..da7674c 100644 --- a/src/acpica/source/components/hardware/hwpci.c +++ b/src/acpica/source/components/hardware/hwpci.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwregs.c b/src/acpica/source/components/hardware/hwregs.c index 7df29fd..492833e 100644 --- a/src/acpica/source/components/hardware/hwregs.c +++ b/src/acpica/source/components/hardware/hwregs.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwsleep.c b/src/acpica/source/components/hardware/hwsleep.c index 4501598..6438ea7 100644 --- a/src/acpica/source/components/hardware/hwsleep.c +++ b/src/acpica/source/components/hardware/hwsleep.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwvalid.c b/src/acpica/source/components/hardware/hwvalid.c index dbbb3bb..410c42c 100644 --- a/src/acpica/source/components/hardware/hwvalid.c +++ b/src/acpica/source/components/hardware/hwvalid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwxface.c b/src/acpica/source/components/hardware/hwxface.c index 4687ae1..12c4ffb 100644 --- a/src/acpica/source/components/hardware/hwxface.c +++ b/src/acpica/source/components/hardware/hwxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwxfsleep.c b/src/acpica/source/components/hardware/hwxfsleep.c index db64da6..2c7066b 100644 --- a/src/acpica/source/components/hardware/hwxfsleep.c +++ b/src/acpica/source/components/hardware/hwxfsleep.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsaccess.c b/src/acpica/source/components/namespace/nsaccess.c index 37f6913..58d56e5 100644 --- a/src/acpica/source/components/namespace/nsaccess.c +++ b/src/acpica/source/components/namespace/nsaccess.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsalloc.c b/src/acpica/source/components/namespace/nsalloc.c index c4a08cd..293bf26 100644 --- a/src/acpica/source/components/namespace/nsalloc.c +++ b/src/acpica/source/components/namespace/nsalloc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsarguments.c b/src/acpica/source/components/namespace/nsarguments.c index 792cd59..08e0716 100644 --- a/src/acpica/source/components/namespace/nsarguments.c +++ b/src/acpica/source/components/namespace/nsarguments.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsconvert.c b/src/acpica/source/components/namespace/nsconvert.c index 7226917..be20f43 100644 --- a/src/acpica/source/components/namespace/nsconvert.c +++ b/src/acpica/source/components/namespace/nsconvert.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsdump.c b/src/acpica/source/components/namespace/nsdump.c index 5631cab..3d0e596 100644 --- a/src/acpica/source/components/namespace/nsdump.c +++ b/src/acpica/source/components/namespace/nsdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsdumpdv.c b/src/acpica/source/components/namespace/nsdumpdv.c index 8510eb2..8e570d1 100644 --- a/src/acpica/source/components/namespace/nsdumpdv.c +++ b/src/acpica/source/components/namespace/nsdumpdv.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nseval.c b/src/acpica/source/components/namespace/nseval.c index 2f32e5e..b6d662b 100644 --- a/src/acpica/source/components/namespace/nseval.c +++ b/src/acpica/source/components/namespace/nseval.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsinit.c b/src/acpica/source/components/namespace/nsinit.c index 2c4db99..279b409 100644 --- a/src/acpica/source/components/namespace/nsinit.c +++ b/src/acpica/source/components/namespace/nsinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsload.c b/src/acpica/source/components/namespace/nsload.c index e15e6a4..590be03 100644 --- a/src/acpica/source/components/namespace/nsload.c +++ b/src/acpica/source/components/namespace/nsload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsnames.c b/src/acpica/source/components/namespace/nsnames.c index 2dc5d7b..2c7d9b9 100644 --- a/src/acpica/source/components/namespace/nsnames.c +++ b/src/acpica/source/components/namespace/nsnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsobject.c b/src/acpica/source/components/namespace/nsobject.c index 7a0d8ef..50b1d65 100644 --- a/src/acpica/source/components/namespace/nsobject.c +++ b/src/acpica/source/components/namespace/nsobject.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsparse.c b/src/acpica/source/components/namespace/nsparse.c index f880207..da137e8 100644 --- a/src/acpica/source/components/namespace/nsparse.c +++ b/src/acpica/source/components/namespace/nsparse.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nspredef.c b/src/acpica/source/components/namespace/nspredef.c index 820710d..8a522d2 100644 --- a/src/acpica/source/components/namespace/nspredef.c +++ b/src/acpica/source/components/namespace/nspredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsprepkg.c b/src/acpica/source/components/namespace/nsprepkg.c index b44d12b..085ccd2 100644 --- a/src/acpica/source/components/namespace/nsprepkg.c +++ b/src/acpica/source/components/namespace/nsprepkg.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsrepair.c b/src/acpica/source/components/namespace/nsrepair.c index cf3c411..736933a 100644 --- a/src/acpica/source/components/namespace/nsrepair.c +++ b/src/acpica/source/components/namespace/nsrepair.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsrepair2.c b/src/acpica/source/components/namespace/nsrepair2.c index ffba457..3300819 100644 --- a/src/acpica/source/components/namespace/nsrepair2.c +++ b/src/acpica/source/components/namespace/nsrepair2.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nssearch.c b/src/acpica/source/components/namespace/nssearch.c index 9169866..81cac95 100644 --- a/src/acpica/source/components/namespace/nssearch.c +++ b/src/acpica/source/components/namespace/nssearch.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsutils.c b/src/acpica/source/components/namespace/nsutils.c index b237390..220c447 100644 --- a/src/acpica/source/components/namespace/nsutils.c +++ b/src/acpica/source/components/namespace/nsutils.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nswalk.c b/src/acpica/source/components/namespace/nswalk.c index bcbed65..aa23760 100644 --- a/src/acpica/source/components/namespace/nswalk.c +++ b/src/acpica/source/components/namespace/nswalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsxfeval.c b/src/acpica/source/components/namespace/nsxfeval.c index 5425a54..7e23365 100644 --- a/src/acpica/source/components/namespace/nsxfeval.c +++ b/src/acpica/source/components/namespace/nsxfeval.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsxfname.c b/src/acpica/source/components/namespace/nsxfname.c index f45a2bd..4c71e37 100644 --- a/src/acpica/source/components/namespace/nsxfname.c +++ b/src/acpica/source/components/namespace/nsxfname.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsxfobj.c b/src/acpica/source/components/namespace/nsxfobj.c index 763e044..2ca409f 100644 --- a/src/acpica/source/components/namespace/nsxfobj.c +++ b/src/acpica/source/components/namespace/nsxfobj.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psargs.c b/src/acpica/source/components/parser/psargs.c index ad86a1f..2453ab1 100644 --- a/src/acpica/source/components/parser/psargs.c +++ b/src/acpica/source/components/parser/psargs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psloop.c b/src/acpica/source/components/parser/psloop.c index cf52d5f..d75ac83 100644 --- a/src/acpica/source/components/parser/psloop.c +++ b/src/acpica/source/components/parser/psloop.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psobject.c b/src/acpica/source/components/parser/psobject.c index 705aa6c..a236ff5 100644 --- a/src/acpica/source/components/parser/psobject.c +++ b/src/acpica/source/components/parser/psobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psopcode.c b/src/acpica/source/components/parser/psopcode.c index 40243a5..1f94916 100644 --- a/src/acpica/source/components/parser/psopcode.c +++ b/src/acpica/source/components/parser/psopcode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psopinfo.c b/src/acpica/source/components/parser/psopinfo.c index 198d9a3..a059b74 100644 --- a/src/acpica/source/components/parser/psopinfo.c +++ b/src/acpica/source/components/parser/psopinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psparse.c b/src/acpica/source/components/parser/psparse.c index afbcc62..71c3fa0 100644 --- a/src/acpica/source/components/parser/psparse.c +++ b/src/acpica/source/components/parser/psparse.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psscope.c b/src/acpica/source/components/parser/psscope.c index 3c0fb90..f44ea48 100644 --- a/src/acpica/source/components/parser/psscope.c +++ b/src/acpica/source/components/parser/psscope.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/pstree.c b/src/acpica/source/components/parser/pstree.c index fc2477b..392204e 100644 --- a/src/acpica/source/components/parser/pstree.c +++ b/src/acpica/source/components/parser/pstree.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psutils.c b/src/acpica/source/components/parser/psutils.c index bce4010..328ff5b 100644 --- a/src/acpica/source/components/parser/psutils.c +++ b/src/acpica/source/components/parser/psutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/pswalk.c b/src/acpica/source/components/parser/pswalk.c index 1605428..a447970 100644 --- a/src/acpica/source/components/parser/pswalk.c +++ b/src/acpica/source/components/parser/pswalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psxface.c b/src/acpica/source/components/parser/psxface.c index 8930af0..09833b6 100644 --- a/src/acpica/source/components/parser/psxface.c +++ b/src/acpica/source/components/parser/psxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsaddr.c b/src/acpica/source/components/resources/rsaddr.c index 9c7f2aa..583f3ef 100644 --- a/src/acpica/source/components/resources/rsaddr.c +++ b/src/acpica/source/components/resources/rsaddr.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rscalc.c b/src/acpica/source/components/resources/rscalc.c index 2b6a4f9..33a438e 100644 --- a/src/acpica/source/components/resources/rscalc.c +++ b/src/acpica/source/components/resources/rscalc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rscreate.c b/src/acpica/source/components/resources/rscreate.c index deaaba5..dd430ef 100644 --- a/src/acpica/source/components/resources/rscreate.c +++ b/src/acpica/source/components/resources/rscreate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsdump.c b/src/acpica/source/components/resources/rsdump.c index 34b4abf..0d3d2b7 100644 --- a/src/acpica/source/components/resources/rsdump.c +++ b/src/acpica/source/components/resources/rsdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsdumpinfo.c b/src/acpica/source/components/resources/rsdumpinfo.c index bb41c71..c57f2ca 100644 --- a/src/acpica/source/components/resources/rsdumpinfo.c +++ b/src/acpica/source/components/resources/rsdumpinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsinfo.c b/src/acpica/source/components/resources/rsinfo.c index da2cb5d..bf19c39 100644 --- a/src/acpica/source/components/resources/rsinfo.c +++ b/src/acpica/source/components/resources/rsinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsio.c b/src/acpica/source/components/resources/rsio.c index a641c0c..8f39d14 100644 --- a/src/acpica/source/components/resources/rsio.c +++ b/src/acpica/source/components/resources/rsio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsirq.c b/src/acpica/source/components/resources/rsirq.c index 33f400f..0ce5dfd 100644 --- a/src/acpica/source/components/resources/rsirq.c +++ b/src/acpica/source/components/resources/rsirq.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rslist.c b/src/acpica/source/components/resources/rslist.c index ea2d1d5..4fda294 100644 --- a/src/acpica/source/components/resources/rslist.c +++ b/src/acpica/source/components/resources/rslist.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsmemory.c b/src/acpica/source/components/resources/rsmemory.c index ae94a1f..07d7225 100644 --- a/src/acpica/source/components/resources/rsmemory.c +++ b/src/acpica/source/components/resources/rsmemory.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsmisc.c b/src/acpica/source/components/resources/rsmisc.c index 8de7ca5..7871715 100644 --- a/src/acpica/source/components/resources/rsmisc.c +++ b/src/acpica/source/components/resources/rsmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsserial.c b/src/acpica/source/components/resources/rsserial.c index b71dcad..acec6fb 100644 --- a/src/acpica/source/components/resources/rsserial.c +++ b/src/acpica/source/components/resources/rsserial.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsutils.c b/src/acpica/source/components/resources/rsutils.c index 42ff2a3..55445b0 100644 --- a/src/acpica/source/components/resources/rsutils.c +++ b/src/acpica/source/components/resources/rsutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsxface.c b/src/acpica/source/components/resources/rsxface.c index 9e9af3a..86b35a6 100644 --- a/src/acpica/source/components/resources/rsxface.c +++ b/src/acpica/source/components/resources/rsxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbdata.c b/src/acpica/source/components/tables/tbdata.c index 10924ab..ee352c8 100644 --- a/src/acpica/source/components/tables/tbdata.c +++ b/src/acpica/source/components/tables/tbdata.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbfadt.c b/src/acpica/source/components/tables/tbfadt.c index f3f27cd..93d76da 100644 --- a/src/acpica/source/components/tables/tbfadt.c +++ b/src/acpica/source/components/tables/tbfadt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbfind.c b/src/acpica/source/components/tables/tbfind.c index 56b4e8a..c7acd1c 100644 --- a/src/acpica/source/components/tables/tbfind.c +++ b/src/acpica/source/components/tables/tbfind.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbinstal.c b/src/acpica/source/components/tables/tbinstal.c index 38de06c..88e10ba 100644 --- a/src/acpica/source/components/tables/tbinstal.c +++ b/src/acpica/source/components/tables/tbinstal.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbprint.c b/src/acpica/source/components/tables/tbprint.c index d4bba45..90a1a52 100644 --- a/src/acpica/source/components/tables/tbprint.c +++ b/src/acpica/source/components/tables/tbprint.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbutils.c b/src/acpica/source/components/tables/tbutils.c index ec1843c..b2fdb91 100644 --- a/src/acpica/source/components/tables/tbutils.c +++ b/src/acpica/source/components/tables/tbutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbxface.c b/src/acpica/source/components/tables/tbxface.c index df4e402..d2351d3 100644 --- a/src/acpica/source/components/tables/tbxface.c +++ b/src/acpica/source/components/tables/tbxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbxfload.c b/src/acpica/source/components/tables/tbxfload.c index 88834db..83f6420 100644 --- a/src/acpica/source/components/tables/tbxfload.c +++ b/src/acpica/source/components/tables/tbxfload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbxfroot.c b/src/acpica/source/components/tables/tbxfroot.c index 8354e94..8c6be13 100644 --- a/src/acpica/source/components/tables/tbxfroot.c +++ b/src/acpica/source/components/tables/tbxfroot.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utaddress.c b/src/acpica/source/components/utilities/utaddress.c index 864c0c3..ddfe826 100644 --- a/src/acpica/source/components/utilities/utaddress.c +++ b/src/acpica/source/components/utilities/utaddress.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utalloc.c b/src/acpica/source/components/utilities/utalloc.c index dd7c8d6..0c8c928 100644 --- a/src/acpica/source/components/utilities/utalloc.c +++ b/src/acpica/source/components/utilities/utalloc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utbuffer.c b/src/acpica/source/components/utilities/utbuffer.c index cc2d769..d4a65b4 100644 --- a/src/acpica/source/components/utilities/utbuffer.c +++ b/src/acpica/source/components/utilities/utbuffer.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utcache.c b/src/acpica/source/components/utilities/utcache.c index cb8116e..25c8e0e 100644 --- a/src/acpica/source/components/utilities/utcache.c +++ b/src/acpica/source/components/utilities/utcache.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utcopy.c b/src/acpica/source/components/utilities/utcopy.c index ea70d13..7dfc104 100644 --- a/src/acpica/source/components/utilities/utcopy.c +++ b/src/acpica/source/components/utilities/utcopy.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utdebug.c b/src/acpica/source/components/utilities/utdebug.c index 5c86223..60c6067 100644 --- a/src/acpica/source/components/utilities/utdebug.c +++ b/src/acpica/source/components/utilities/utdebug.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utdecode.c b/src/acpica/source/components/utilities/utdecode.c index fcd6393..eb0dc9f 100644 --- a/src/acpica/source/components/utilities/utdecode.c +++ b/src/acpica/source/components/utilities/utdecode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utdelete.c b/src/acpica/source/components/utilities/utdelete.c index e6825ca..80b8f98 100644 --- a/src/acpica/source/components/utilities/utdelete.c +++ b/src/acpica/source/components/utilities/utdelete.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uterror.c b/src/acpica/source/components/utilities/uterror.c index 5d7dfca..52b9ae0 100644 --- a/src/acpica/source/components/utilities/uterror.c +++ b/src/acpica/source/components/utilities/uterror.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uteval.c b/src/acpica/source/components/utilities/uteval.c index 00f1483..dd754c0 100644 --- a/src/acpica/source/components/utilities/uteval.c +++ b/src/acpica/source/components/utilities/uteval.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utexcep.c b/src/acpica/source/components/utilities/utexcep.c index 2c046c4..dd63a12 100644 --- a/src/acpica/source/components/utilities/utexcep.c +++ b/src/acpica/source/components/utilities/utexcep.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utfileio.c b/src/acpica/source/components/utilities/utfileio.c index 956f300..e24e81f 100644 --- a/src/acpica/source/components/utilities/utfileio.c +++ b/src/acpica/source/components/utilities/utfileio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utglobal.c b/src/acpica/source/components/utilities/utglobal.c index 34438c8..3f09d56 100644 --- a/src/acpica/source/components/utilities/utglobal.c +++ b/src/acpica/source/components/utilities/utglobal.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uthex.c b/src/acpica/source/components/utilities/uthex.c index 80ad2ba..500ab40 100644 --- a/src/acpica/source/components/utilities/uthex.c +++ b/src/acpica/source/components/utilities/uthex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utids.c b/src/acpica/source/components/utilities/utids.c index 5f15f62..f611997 100644 --- a/src/acpica/source/components/utilities/utids.c +++ b/src/acpica/source/components/utilities/utids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utinit.c b/src/acpica/source/components/utilities/utinit.c index 7c0b67b..6f701ad 100644 --- a/src/acpica/source/components/utilities/utinit.c +++ b/src/acpica/source/components/utilities/utinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utlock.c b/src/acpica/source/components/utilities/utlock.c index 1d7dadc..7ce13ef 100644 --- a/src/acpica/source/components/utilities/utlock.c +++ b/src/acpica/source/components/utilities/utlock.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utmath.c b/src/acpica/source/components/utilities/utmath.c index 95a9d72..dafba6d 100644 --- a/src/acpica/source/components/utilities/utmath.c +++ b/src/acpica/source/components/utilities/utmath.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utmisc.c b/src/acpica/source/components/utilities/utmisc.c index 5e86e0a..30d23d8 100644 --- a/src/acpica/source/components/utilities/utmisc.c +++ b/src/acpica/source/components/utilities/utmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utmutex.c b/src/acpica/source/components/utilities/utmutex.c index 1537422..f5b864f 100644 --- a/src/acpica/source/components/utilities/utmutex.c +++ b/src/acpica/source/components/utilities/utmutex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utobject.c b/src/acpica/source/components/utilities/utobject.c index 4c64061..fb4efaf 100644 --- a/src/acpica/source/components/utilities/utobject.c +++ b/src/acpica/source/components/utilities/utobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utosi.c b/src/acpica/source/components/utilities/utosi.c index 3b49ded..e578d2f 100644 --- a/src/acpica/source/components/utilities/utosi.c +++ b/src/acpica/source/components/utilities/utosi.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utownerid.c b/src/acpica/source/components/utilities/utownerid.c index 1ae1398..bf391e1 100644 --- a/src/acpica/source/components/utilities/utownerid.c +++ b/src/acpica/source/components/utilities/utownerid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utpredef.c b/src/acpica/source/components/utilities/utpredef.c index ab275ee..19561be 100644 --- a/src/acpica/source/components/utilities/utpredef.c +++ b/src/acpica/source/components/utilities/utpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utprint.c b/src/acpica/source/components/utilities/utprint.c index 543bad8..50082f3 100644 --- a/src/acpica/source/components/utilities/utprint.c +++ b/src/acpica/source/components/utilities/utprint.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utresrc.c b/src/acpica/source/components/utilities/utresrc.c index 3569fcf..44a4c66 100644 --- a/src/acpica/source/components/utilities/utresrc.c +++ b/src/acpica/source/components/utilities/utresrc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utstate.c b/src/acpica/source/components/utilities/utstate.c index cf96d8e..53aabbb 100644 --- a/src/acpica/source/components/utilities/utstate.c +++ b/src/acpica/source/components/utilities/utstate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utstring.c b/src/acpica/source/components/utilities/utstring.c index 2d218c3..953f304 100644 --- a/src/acpica/source/components/utilities/utstring.c +++ b/src/acpica/source/components/utilities/utstring.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uttrack.c b/src/acpica/source/components/utilities/uttrack.c index 43a993a..284bee0 100644 --- a/src/acpica/source/components/utilities/uttrack.c +++ b/src/acpica/source/components/utilities/uttrack.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utuuid.c b/src/acpica/source/components/utilities/utuuid.c index 65338cc..f0d740d 100644 --- a/src/acpica/source/components/utilities/utuuid.c +++ b/src/acpica/source/components/utilities/utuuid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utxface.c b/src/acpica/source/components/utilities/utxface.c index 7f2752c..e01c4d5 100644 --- a/src/acpica/source/components/utilities/utxface.c +++ b/src/acpica/source/components/utilities/utxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utxferror.c b/src/acpica/source/components/utilities/utxferror.c index 7b11f4c..bdbab99 100644 --- a/src/acpica/source/components/utilities/utxferror.c +++ b/src/acpica/source/components/utilities/utxferror.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utxfinit.c b/src/acpica/source/components/utilities/utxfinit.c index a50cc55..91feda7 100644 --- a/src/acpica/source/components/utilities/utxfinit.c +++ b/src/acpica/source/components/utilities/utxfinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acapps.h b/src/acpica/source/include/acapps.h index 6536048..21e71f4 100644 --- a/src/acpica/source/include/acapps.h +++ b/src/acpica/source/include/acapps.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -124,7 +124,7 @@ /* Common info for tool signons */ #define ACPICA_NAME "Intel ACPI Component Architecture" -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2014 Intel Corporation" +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2015 Intel Corporation" #if ACPI_MACHINE_WIDTH == 64 #define ACPI_WIDTH "-64" diff --git a/src/acpica/source/include/acbuffer.h b/src/acpica/source/include/acbuffer.h index 9ccb3ea..bbcff57 100644 --- a/src/acpica/source/include/acbuffer.h +++ b/src/acpica/source/include/acbuffer.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/accommon.h b/src/acpica/source/include/accommon.h index 57735c5..76dc38a 100644 --- a/src/acpica/source/include/accommon.h +++ b/src/acpica/source/include/accommon.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acconfig.h b/src/acpica/source/include/acconfig.h index 3c7a3bd..41fa33d 100644 --- a/src/acpica/source/include/acconfig.h +++ b/src/acpica/source/include/acconfig.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acdebug.h b/src/acpica/source/include/acdebug.h index b6105c2..5c32d46 100644 --- a/src/acpica/source/include/acdebug.h +++ b/src/acpica/source/include/acdebug.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acdisasm.h b/src/acpica/source/include/acdisasm.h index f0cadef..0394728 100644 --- a/src/acpica/source/include/acdisasm.h +++ b/src/acpica/source/include/acdisasm.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acdispat.h b/src/acpica/source/include/acdispat.h index 2a47c52..238cdde 100644 --- a/src/acpica/source/include/acdispat.h +++ b/src/acpica/source/include/acdispat.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acevents.h b/src/acpica/source/include/acevents.h index 8ca726c..467e14f 100644 --- a/src/acpica/source/include/acevents.h +++ b/src/acpica/source/include/acevents.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -269,10 +269,6 @@ AcpiEvWalkGpeList ( ACPI_GPE_CALLBACK GpeWalkCallback, void *Context); -BOOLEAN -AcpiEvValidGpeEvent ( - ACPI_GPE_EVENT_INFO *GpeEventInfo); - ACPI_STATUS AcpiEvGetGpeDevice ( ACPI_GPE_XRUPT_INFO *GpeXruptInfo, diff --git a/src/acpica/source/include/acexcep.h b/src/acpica/source/include/acexcep.h index 89d9852..90511b2 100644 --- a/src/acpica/source/include/acexcep.h +++ b/src/acpica/source/include/acexcep.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acglobal.h b/src/acpica/source/include/acglobal.h index 91712b4..fe3ac39 100644 --- a/src/acpica/source/include/acglobal.h +++ b/src/acpica/source/include/acglobal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/achware.h b/src/acpica/source/include/achware.h index ed39a36..6134bda 100644 --- a/src/acpica/source/include/achware.h +++ b/src/acpica/source/include/achware.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acinterp.h b/src/acpica/source/include/acinterp.h index 739a0de..f0edcb1 100644 --- a/src/acpica/source/include/acinterp.h +++ b/src/acpica/source/include/acinterp.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/aclocal.h b/src/acpica/source/include/aclocal.h index f55c00a..96f292b 100644 --- a/src/acpica/source/include/aclocal.h +++ b/src/acpica/source/include/aclocal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -592,6 +592,7 @@ typedef struct acpi_gpe_register_info UINT16 BaseGpeNumber; /* Base GPE number for this register */ UINT8 EnableForWake; /* GPEs to keep enabled when sleeping */ UINT8 EnableForRun; /* GPEs to keep enabled when running */ + UINT8 EnableMask; /* Current mask of enabled GPEs */ } ACPI_GPE_REGISTER_INFO; diff --git a/src/acpica/source/include/acmacros.h b/src/acpica/source/include/acmacros.h index aa8bd56..ba3d526 100644 --- a/src/acpica/source/include/acmacros.h +++ b/src/acpica/source/include/acmacros.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acnames.h b/src/acpica/source/include/acnames.h index b4fed5e..e87f927 100644 --- a/src/acpica/source/include/acnames.h +++ b/src/acpica/source/include/acnames.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acnamesp.h b/src/acpica/source/include/acnamesp.h index 883e9c4..b66d3e4 100644 --- a/src/acpica/source/include/acnamesp.h +++ b/src/acpica/source/include/acnamesp.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acobject.h b/src/acpica/source/include/acobject.h index 6e3d0de..0712e75 100644 --- a/src/acpica/source/include/acobject.h +++ b/src/acpica/source/include/acobject.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acopcode.h b/src/acpica/source/include/acopcode.h index 4ee0497..45423f3 100644 --- a/src/acpica/source/include/acopcode.h +++ b/src/acpica/source/include/acopcode.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acoutput.h b/src/acpica/source/include/acoutput.h index 2311c44..f0cd27a 100644 --- a/src/acpica/source/include/acoutput.h +++ b/src/acpica/source/include/acoutput.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acparser.h b/src/acpica/source/include/acparser.h index 0899969..abbde50 100644 --- a/src/acpica/source/include/acparser.h +++ b/src/acpica/source/include/acparser.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acpi.h b/src/acpica/source/include/acpi.h index 3f39932..1d694a5 100644 --- a/src/acpica/source/include/acpi.h +++ b/src/acpica/source/include/acpi.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acpiosxf.h b/src/acpica/source/include/acpiosxf.h index 21e6ed9..68d79c7 100644 --- a/src/acpica/source/include/acpiosxf.h +++ b/src/acpica/source/include/acpiosxf.h @@ -10,7 +10,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acpixf.h b/src/acpica/source/include/acpixf.h index 23f965f..fa8f9ab 100644 --- a/src/acpica/source/include/acpixf.h +++ b/src/acpica/source/include/acpixf.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -118,7 +118,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20141107 +#define ACPI_CA_VERSION 0x20150204 #include "acconfig.h" #include "actypes.h" @@ -776,6 +776,15 @@ AcpiInstallGpeHandler ( ACPI_HW_DEPENDENT_RETURN_STATUS ( ACPI_STATUS +AcpiInstallGpeRawHandler ( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber, + UINT32 Type, + ACPI_GPE_HANDLER Address, + void *Context)) + +ACPI_HW_DEPENDENT_RETURN_STATUS ( +ACPI_STATUS AcpiRemoveGpeHandler ( ACPI_HANDLE GpeDevice, UINT32 GpeNumber, @@ -960,6 +969,11 @@ AcpiEnableAllRuntimeGpes ( ACPI_HW_DEPENDENT_RETURN_STATUS ( ACPI_STATUS +AcpiEnableAllWakeupGpes ( + void)) + +ACPI_HW_DEPENDENT_RETURN_STATUS ( +ACPI_STATUS AcpiGetGpeDevice ( UINT32 GpeIndex, ACPI_HANDLE *GpeDevice)) diff --git a/src/acpica/source/include/acpredef.h b/src/acpica/source/include/acpredef.h index 1c1776a..b03f64b 100644 --- a/src/acpica/source/include/acpredef.h +++ b/src/acpica/source/include/acpredef.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acresrc.h b/src/acpica/source/include/acresrc.h index d1366f0..b361120 100644 --- a/src/acpica/source/include/acresrc.h +++ b/src/acpica/source/include/acresrc.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acrestyp.h b/src/acpica/source/include/acrestyp.h index 9cf948b..06a4db5 100644 --- a/src/acpica/source/include/acrestyp.h +++ b/src/acpica/source/include/acrestyp.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acstruct.h b/src/acpica/source/include/acstruct.h index fd8eab0..5258f0e 100644 --- a/src/acpica/source/include/acstruct.h +++ b/src/acpica/source/include/acstruct.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actables.h b/src/acpica/source/include/actables.h index bb2a4f3..4f82777 100644 --- a/src/acpica/source/include/actables.h +++ b/src/acpica/source/include/actables.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actbl.h b/src/acpica/source/include/actbl.h index ea9fc58..68bbed4 100644 --- a/src/acpica/source/include/actbl.h +++ b/src/acpica/source/include/actbl.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actbl1.h b/src/acpica/source/include/actbl1.h index 4c5ffee..2c8b0ed 100644 --- a/src/acpica/source/include/actbl1.h +++ b/src/acpica/source/include/actbl1.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actbl2.h b/src/acpica/source/include/actbl2.h index 7d62862..0d39c0e 100644 --- a/src/acpica/source/include/actbl2.h +++ b/src/acpica/source/include/actbl2.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actbl3.h b/src/acpica/source/include/actbl3.h index 4e3b77a..b4ce8af 100644 --- a/src/acpica/source/include/actbl3.h +++ b/src/acpica/source/include/actbl3.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actypes.h b/src/acpica/source/include/actypes.h index 227589e..714edfe 100644 --- a/src/acpica/source/include/actypes.h +++ b/src/acpica/source/include/actypes.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License @@ -815,11 +815,15 @@ typedef UINT32 ACPI_EVENT_STATUS; #define ACPI_GPE_ENABLE 0 #define ACPI_GPE_DISABLE 1 #define ACPI_GPE_CONDITIONAL_ENABLE 2 +#define ACPI_GPE_SAVE_MASK 4 + +#define ACPI_GPE_ENABLE_SAVE (ACPI_GPE_ENABLE | ACPI_GPE_SAVE_MASK) +#define ACPI_GPE_DISABLE_SAVE (ACPI_GPE_DISABLE | ACPI_GPE_SAVE_MASK) /* * GPE info flags - Per GPE * +-------+-+-+---+ - * | 7:4 |3|2|1:0| + * | 7:5 |4|3|2:0| * +-------+-+-+---+ * | | | | * | | | +-- Type of dispatch:to method, handler, notify, or none @@ -831,13 +835,15 @@ typedef UINT32 ACPI_EVENT_STATUS; #define ACPI_GPE_DISPATCH_METHOD (UINT8) 0x01 #define ACPI_GPE_DISPATCH_HANDLER (UINT8) 0x02 #define ACPI_GPE_DISPATCH_NOTIFY (UINT8) 0x03 -#define ACPI_GPE_DISPATCH_MASK (UINT8) 0x03 +#define ACPI_GPE_DISPATCH_RAW_HANDLER (UINT8) 0x04 +#define ACPI_GPE_DISPATCH_MASK (UINT8) 0x07 +#define ACPI_GPE_DISPATCH_TYPE(flags) ((UINT8) ((flags) & ACPI_GPE_DISPATCH_MASK)) -#define ACPI_GPE_LEVEL_TRIGGERED (UINT8) 0x04 +#define ACPI_GPE_LEVEL_TRIGGERED (UINT8) 0x08 #define ACPI_GPE_EDGE_TRIGGERED (UINT8) 0x00 -#define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x04 +#define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x08 -#define ACPI_GPE_CAN_WAKE (UINT8) 0x08 +#define ACPI_GPE_CAN_WAKE (UINT8) 0x10 /* * Flags for GPE and Lock interfaces diff --git a/src/acpica/source/include/acutils.h b/src/acpica/source/include/acutils.h index 2aea248..f8a6783 100644 --- a/src/acpica/source/include/acutils.h +++ b/src/acpica/source/include/acutils.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/amlcode.h b/src/acpica/source/include/amlcode.h index 5eaf30c..2a5dc97 100644 --- a/src/acpica/source/include/amlcode.h +++ b/src/acpica/source/include/amlcode.h @@ -10,7 +10,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/amlresrc.h b/src/acpica/source/include/amlresrc.h index e54f567..87f52c5 100644 --- a/src/acpica/source/include/amlresrc.h +++ b/src/acpica/source/include/amlresrc.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acenv.h b/src/acpica/source/include/platform/acenv.h index 80038c8..c1714ed 100644 --- a/src/acpica/source/include/platform/acenv.h +++ b/src/acpica/source/include/platform/acenv.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acenvex.h b/src/acpica/source/include/platform/acenvex.h index 2c50162..6c59337 100644 --- a/src/acpica/source/include/platform/acenvex.h +++ b/src/acpica/source/include/platform/acenvex.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acgcc.h b/src/acpica/source/include/platform/acgcc.h index 9cb3cbe..fde18f4 100644 --- a/src/acpica/source/include/platform/acgcc.h +++ b/src/acpica/source/include/platform/acgcc.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/aclinux.h b/src/acpica/source/include/platform/aclinux.h index e7df0b7..668f237 100644 --- a/src/acpica/source/include/platform/aclinux.h +++ b/src/acpica/source/include/platform/aclinux.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/aclinuxex.h b/src/acpica/source/include/platform/aclinuxex.h index d4111a1..52352ce 100644 --- a/src/acpica/source/include/platform/aclinuxex.h +++ b/src/acpica/source/include/platform/aclinuxex.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/os_specific/service_layers/oslibcfs.c b/src/acpica/source/os_specific/service_layers/oslibcfs.c index e1ca8be..dadc40d 100644 --- a/src/acpica/source/os_specific/service_layers/oslibcfs.c +++ b/src/acpica/source/os_specific/service_layers/oslibcfs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/os_specific/service_layers/osunixxf.c b/src/acpica/source/os_specific/service_layers/osunixxf.c index ccf0015..c48f581 100644 --- a/src/acpica/source/os_specific/service_layers/osunixxf.c +++ b/src/acpica/source/os_specific/service_layers/osunixxf.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aecommon.h b/src/acpica/source/tools/acpiexec/aecommon.h index 17b1cd0..c0662bf 100644 --- a/src/acpica/source/tools/acpiexec/aecommon.h +++ b/src/acpica/source/tools/acpiexec/aecommon.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aehandlers.c b/src/acpica/source/tools/acpiexec/aehandlers.c index 3773bba..eb1e3ab 100644 --- a/src/acpica/source/tools/acpiexec/aehandlers.c +++ b/src/acpica/source/tools/acpiexec/aehandlers.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aeinitfile.c b/src/acpica/source/tools/acpiexec/aeinitfile.c index 64b8a79..0de7b96 100644 --- a/src/acpica/source/tools/acpiexec/aeinitfile.c +++ b/src/acpica/source/tools/acpiexec/aeinitfile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aeregion.c b/src/acpica/source/tools/acpiexec/aeregion.c index 084925b..a1b8ea2 100644 --- a/src/acpica/source/tools/acpiexec/aeregion.c +++ b/src/acpica/source/tools/acpiexec/aeregion.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2015, Intel Corp. * All rights reserved. * * 2. License