Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi/acpica/Subsystem Merge ACPI-CA 20050408
details: https://anonhg.NetBSD.org/src/rev/936bbc32b30a
branches: trunk
changeset: 580649:936bbc32b30a
user: kochi <kochi%NetBSD.org@localhost>
date: Mon May 02 14:52:09 2005 +0000
description:
Merge ACPI-CA 20050408
diffstat:
sys/dev/acpi/acpica/Subsystem/acconfig.h | 38 +-
sys/dev/acpi/acpica/Subsystem/acdebug.h | 156 +-----
sys/dev/acpi/acpica/Subsystem/acdisasm.h | 143 ++---
sys/dev/acpi/acpica/Subsystem/acdispat.h | 178 ++----
sys/dev/acpi/acpica/Subsystem/acenv.h | 45 +-
sys/dev/acpi/acpica/Subsystem/acevents.h | 122 +++--
sys/dev/acpi/acpica/Subsystem/acexcep.h | 17 +-
sys/dev/acpi/acpica/Subsystem/acgcc.h | 4 +-
sys/dev/acpi/acpica/Subsystem/acglobal.h | 97 +++-
sys/dev/acpi/acpica/Subsystem/achware.h | 73 +-
sys/dev/acpi/acpica/Subsystem/acinterp.h | 288 ++++-------
sys/dev/acpi/acpica/Subsystem/aclocal.h | 71 +-
sys/dev/acpi/acpica/Subsystem/acmacros.h | 58 +-
sys/dev/acpi/acpica/Subsystem/acnames.h | 2 +-
sys/dev/acpi/acpica/Subsystem/acnamesp.h | 171 +-----
sys/dev/acpi/acpica/Subsystem/acnetbsd.h | 12 +-
sys/dev/acpi/acpica/Subsystem/acobject.h | 34 +-
sys/dev/acpi/acpica/Subsystem/acopcode.h | 2 +-
sys/dev/acpi/acpica/Subsystem/acoutput.h | 6 +-
sys/dev/acpi/acpica/Subsystem/acparser.h | 134 ++---
sys/dev/acpi/acpica/Subsystem/acpi.h | 5 +-
sys/dev/acpi/acpica/Subsystem/acpiosxf.h | 42 +-
sys/dev/acpi/acpica/Subsystem/acpixf.h | 32 +-
sys/dev/acpi/acpica/Subsystem/acresrc.h | 63 +--
sys/dev/acpi/acpica/Subsystem/acstruct.h | 30 +-
sys/dev/acpi/acpica/Subsystem/actables.h | 76 +--
sys/dev/acpi/acpica/Subsystem/actbl.h | 41 +-
sys/dev/acpi/acpica/Subsystem/actbl1.h | 4 +-
sys/dev/acpi/acpica/Subsystem/actbl2.h | 180 +++++--
sys/dev/acpi/acpica/Subsystem/actypes.h | 184 +++++--
sys/dev/acpi/acpica/Subsystem/acutils.h | 305 ++++--------
sys/dev/acpi/acpica/Subsystem/amlcode.h | 82 ++-
sys/dev/acpi/acpica/Subsystem/amlresrc.h | 35 +-
sys/dev/acpi/acpica/Subsystem/dbcmds.c | 246 ++++++++-
sys/dev/acpi/acpica/Subsystem/dbdisply.c | 251 ++++++++-
sys/dev/acpi/acpica/Subsystem/dbexec.c | 107 ++-
sys/dev/acpi/acpica/Subsystem/dbfileio.c | 74 ++-
sys/dev/acpi/acpica/Subsystem/dbhistry.c | 15 +-
sys/dev/acpi/acpica/Subsystem/dbinput.c | 152 ++++--
sys/dev/acpi/acpica/Subsystem/dbstats.c | 104 ++-
sys/dev/acpi/acpica/Subsystem/dbutils.c | 162 +++---
sys/dev/acpi/acpica/Subsystem/dbxface.c | 114 ++-
sys/dev/acpi/acpica/Subsystem/dmbuffer.c | 18 +-
sys/dev/acpi/acpica/Subsystem/dmnames.c | 126 ++--
sys/dev/acpi/acpica/Subsystem/dmobject.c | 61 +-
sys/dev/acpi/acpica/Subsystem/dmopcode.c | 24 +-
sys/dev/acpi/acpica/Subsystem/dmresrc.c | 32 +-
sys/dev/acpi/acpica/Subsystem/dmresrcl.c | 391 ++++++++++++++--
sys/dev/acpi/acpica/Subsystem/dmresrcs.c | 6 +-
sys/dev/acpi/acpica/Subsystem/dmutils.c | 128 ++++-
sys/dev/acpi/acpica/Subsystem/dmwalk.c | 103 +++-
sys/dev/acpi/acpica/Subsystem/dsfield.c | 64 +-
sys/dev/acpi/acpica/Subsystem/dsinit.c | 34 +-
sys/dev/acpi/acpica/Subsystem/dsmethod.c | 194 +++++--
sys/dev/acpi/acpica/Subsystem/dsmthdat.c | 235 ++++++---
sys/dev/acpi/acpica/Subsystem/dsobject.c | 87 ++-
sys/dev/acpi/acpica/Subsystem/dsopcode.c | 132 +++-
sys/dev/acpi/acpica/Subsystem/dsutils.c | 236 +++++++--
sys/dev/acpi/acpica/Subsystem/dswexec.c | 191 +++++--
sys/dev/acpi/acpica/Subsystem/dswload.c | 150 ++++--
sys/dev/acpi/acpica/Subsystem/dswscope.c | 39 +-
sys/dev/acpi/acpica/Subsystem/dswstate.c | 494 +++++++++++---------
sys/dev/acpi/acpica/Subsystem/evevent.c | 53 +-
sys/dev/acpi/acpica/Subsystem/evgpe.c | 484 +++++++++++++++++--
sys/dev/acpi/acpica/Subsystem/evgpeblk.c | 409 ++++++++++++++--
sys/dev/acpi/acpica/Subsystem/evmisc.c | 155 ++++--
sys/dev/acpi/acpica/Subsystem/evregion.c | 444 ++++++++++++++++-
sys/dev/acpi/acpica/Subsystem/evrgnini.c | 30 +-
sys/dev/acpi/acpica/Subsystem/evsci.c | 18 +-
sys/dev/acpi/acpica/Subsystem/evxface.c | 258 +++++++---
sys/dev/acpi/acpica/Subsystem/evxfevnt.c | 211 +++++---
sys/dev/acpi/acpica/Subsystem/evxfregn.c | 223 +---------
sys/dev/acpi/acpica/Subsystem/exconfig.c | 90 ++-
sys/dev/acpi/acpica/Subsystem/exconvrt.c | 459 +++++++++---------
sys/dev/acpi/acpica/Subsystem/excreate.c | 93 ++-
sys/dev/acpi/acpica/Subsystem/exdump.c | 356 ++++++++------
sys/dev/acpi/acpica/Subsystem/exfield.c | 31 +-
sys/dev/acpi/acpica/Subsystem/exfldio.c | 732 +++++++++---------------------
sys/dev/acpi/acpica/Subsystem/exmisc.c | 531 ++++++++++++++++------
sys/dev/acpi/acpica/Subsystem/exmutex.c | 115 ++-
sys/dev/acpi/acpica/Subsystem/exnames.c | 78 ++-
sys/dev/acpi/acpica/Subsystem/exoparg1.c | 336 ++++++++++---
sys/dev/acpi/acpica/Subsystem/exoparg2.c | 257 +++++-----
sys/dev/acpi/acpica/Subsystem/exoparg3.c | 35 +-
sys/dev/acpi/acpica/Subsystem/exoparg6.c | 175 ++++--
sys/dev/acpi/acpica/Subsystem/exprep.c | 135 +++--
sys/dev/acpi/acpica/Subsystem/exregion.c | 42 +-
sys/dev/acpi/acpica/Subsystem/exresnte.c | 35 +-
sys/dev/acpi/acpica/Subsystem/exresolv.c | 139 ++++-
sys/dev/acpi/acpica/Subsystem/exresop.c | 144 ++++-
sys/dev/acpi/acpica/Subsystem/exstore.c | 356 ++++++++++----
sys/dev/acpi/acpica/Subsystem/exstoren.c | 40 +-
sys/dev/acpi/acpica/Subsystem/exstorob.c | 68 +-
sys/dev/acpi/acpica/Subsystem/exsystem.c | 59 +-
sys/dev/acpi/acpica/Subsystem/exutils.c | 61 +-
sys/dev/acpi/acpica/Subsystem/hwacpi.c | 25 +-
sys/dev/acpi/acpica/Subsystem/hwgpe.c | 398 +++++-----------
sys/dev/acpi/acpica/Subsystem/hwregs.c | 240 +++++----
sys/dev/acpi/acpica/Subsystem/hwsleep.c | 224 +++++---
sys/dev/acpi/acpica/Subsystem/hwtimer.c | 51 +-
sys/dev/acpi/acpica/Subsystem/nsaccess.c | 67 ++-
sys/dev/acpi/acpica/Subsystem/nsalloc.c | 150 +++---
sys/dev/acpi/acpica/Subsystem/nsdump.c | 170 ++++--
sys/dev/acpi/acpica/Subsystem/nsdumpdv.c | 37 +-
sys/dev/acpi/acpica/Subsystem/nseval.c | 250 +++++-----
sys/dev/acpi/acpica/Subsystem/nsinit.c | 104 ++-
sys/dev/acpi/acpica/Subsystem/nsload.c | 47 +-
sys/dev/acpi/acpica/Subsystem/nsnames.c | 28 +-
sys/dev/acpi/acpica/Subsystem/nsobject.c | 20 +-
sys/dev/acpi/acpica/Subsystem/nsparse.c | 11 +-
sys/dev/acpi/acpica/Subsystem/nssearch.c | 89 ++-
sys/dev/acpi/acpica/Subsystem/nsutils.c | 263 ++++++-----
sys/dev/acpi/acpica/Subsystem/nswalk.c | 16 +-
sys/dev/acpi/acpica/Subsystem/nsxfeval.c | 96 ++-
sys/dev/acpi/acpica/Subsystem/nsxfname.c | 70 +-
sys/dev/acpi/acpica/Subsystem/nsxfobj.c | 8 +-
sys/dev/acpi/acpica/Subsystem/psargs.c | 61 +-
sys/dev/acpi/acpica/Subsystem/psopcode.c | 327 +------------
sys/dev/acpi/acpica/Subsystem/psparse.c | 490 ++++++++++++--------
sys/dev/acpi/acpica/Subsystem/psscope.c | 60 +-
sys/dev/acpi/acpica/Subsystem/pstree.c | 185 ++++---
sys/dev/acpi/acpica/Subsystem/psutils.c | 49 +-
sys/dev/acpi/acpica/Subsystem/pswalk.c | 284 +----------
sys/dev/acpi/acpica/Subsystem/psxface.c | 74 +-
sys/dev/acpi/acpica/Subsystem/rsaddr.c | 645 ++++++++++++--------------
sys/dev/acpi/acpica/Subsystem/rscalc.c | 274 +++++------
sys/dev/acpi/acpica/Subsystem/rscreate.c | 51 +-
sys/dev/acpi/acpica/Subsystem/rsdump.c | 426 +++++++++--------
sys/dev/acpi/acpica/Subsystem/rsio.c | 203 +++----
sys/dev/acpi/acpica/Subsystem/rsirq.c | 173 +++----
sys/dev/acpi/acpica/Subsystem/rslist.c | 77 +-
sys/dev/acpi/acpica/Subsystem/rsmemory.c | 242 ++++-----
sys/dev/acpi/acpica/Subsystem/rsmisc.c | 166 ++----
sys/dev/acpi/acpica/Subsystem/rsutils.c | 72 +-
sys/dev/acpi/acpica/Subsystem/rsxface.c | 67 +-
sys/dev/acpi/acpica/Subsystem/tbconvrt.c | 159 ++++--
sys/dev/acpi/acpica/Subsystem/tbget.c | 72 +-
sys/dev/acpi/acpica/Subsystem/tbgetall.c | 51 +-
sys/dev/acpi/acpica/Subsystem/tbinstal.c | 40 +-
sys/dev/acpi/acpica/Subsystem/tbrsdt.c | 24 +-
sys/dev/acpi/acpica/Subsystem/tbutils.c | 324 +++++++------
sys/dev/acpi/acpica/Subsystem/tbxface.c | 43 +-
sys/dev/acpi/acpica/Subsystem/tbxfroot.c | 378 +++++++++++----
sys/dev/acpi/acpica/Subsystem/utalloc.c | 157 ++++-
sys/dev/acpi/acpica/Subsystem/utcopy.c | 182 +++++--
sys/dev/acpi/acpica/Subsystem/utdebug.c | 110 ++--
sys/dev/acpi/acpica/Subsystem/utdelete.c | 98 +++-
sys/dev/acpi/acpica/Subsystem/uteval.c | 197 +++++++-
sys/dev/acpi/acpica/Subsystem/utglobal.c | 273 +++++++----
sys/dev/acpi/acpica/Subsystem/utinit.c | 42 +-
sys/dev/acpi/acpica/Subsystem/utmath.c | 51 +-
sys/dev/acpi/acpica/Subsystem/utmisc.c | 366 ++++++++-------
sys/dev/acpi/acpica/Subsystem/utobject.c | 132 ++++-
sys/dev/acpi/acpica/Subsystem/utxface.c | 106 ++-
154 files changed, 12885 insertions(+), 9562 deletions(-)
diffs (truncated from 45098 to 300 lines):
diff -r 8182ee49e23d -r 936bbc32b30a sys/dev/acpi/acpica/Subsystem/acconfig.h
--- a/sys/dev/acpi/acpica/Subsystem/acconfig.h Mon May 02 14:49:08 2005 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/acconfig.h Mon May 02 14:52:09 2005 +0000
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
- * xRevision: 148 $
+ * xRevision: 183 $
*
*****************************************************************************/
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -137,11 +137,21 @@
/* Version string */
-#define ACPI_CA_VERSION 0x20040211
+#define ACPI_CA_VERSION 0x20050408
+
+/*
+ * OS name, used for the _OS object. The _OS object is essentially obsolete,
+ * but there is a large base of ASL/AML code in existing machines that check
+ * for the string below. The use of this string usually guarantees that
+ * the ASL will execute down the most tested code path. Also, there is some
+ * code that will not execute the _OSI method unless _OS matches the string
+ * below. Therefore, change this string at your own risk.
+ */
+#define ACPI_OS_NAME "Microsoft Windows NT"
/* Maximum objects in the various object caches */
-#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */
+#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects */
#define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */
#define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */
#define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */
@@ -162,7 +172,7 @@
/* Version of ACPI supported */
-#define ACPI_CA_SUPPORT_LEVEL 2
+#define ACPI_CA_SUPPORT_LEVEL 3
/* String size constants */
@@ -193,9 +203,8 @@
#define ACPI_MAX_GPE_BLOCKS 2
#define ACPI_GPE_REGISTER_WIDTH 8
-/*
- * Method info (in WALK_STATE), containing local variables and argumetns
- */
+/* Method info (in WALK_STATE), containing local variables and argumetns */
+
#define ACPI_METHOD_NUM_LOCALS 8
#define ACPI_METHOD_MAX_LOCAL 7
@@ -225,10 +234,11 @@
/* Constants used in searching for the RSDP in low memory */
-#define ACPI_LO_RSDP_WINDOW_BASE 0 /* Physical Address */
-#define ACPI_HI_RSDP_WINDOW_BASE 0xE0000 /* Physical Address */
-#define ACPI_LO_RSDP_WINDOW_SIZE 0x400
-#define ACPI_HI_RSDP_WINDOW_SIZE 0x20000
+#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */
+#define ACPI_EBDA_PTR_LENGTH 2
+#define ACPI_EBDA_WINDOW_SIZE 1024
+#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */
+#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000
#define ACPI_RSDP_SCAN_STEP 16
/* Operation regions */
@@ -258,6 +268,10 @@
#define ACPI_SMBUS_BUFFER_SIZE 34
+/* Number of strings associated with the _OSI reserved method */
+
+#define ACPI_NUM_OSI_STRINGS 10
+
/******************************************************************************
*
diff -r 8182ee49e23d -r 936bbc32b30a sys/dev/acpi/acpica/Subsystem/acdebug.h
--- a/sys/dev/acpi/acpica/Subsystem/acdebug.h Mon May 02 14:49:08 2005 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/acdebug.h Mon May 02 14:52:09 2005 +0000
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acdebug.h - ACPI/AML debugger
- * xRevision: 73 $
+ * xRevision: 79 $
*
*****************************************************************************/
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -136,9 +136,7 @@
#define PARAM_LIST(pl) pl
-
#define DBTEST_OUTPUT_LEVEL(lvl) if (AcpiGbl_DbOpt_verbose)
-
#define VERBOSE_PRINT(fp) DBTEST_OUTPUT_LEVEL(lvl) {\
AcpiOsPrintf PARAM_LIST(fp);}
@@ -146,13 +144,9 @@
#define EX_SINGLE_STEP 2
-/* Prototypes */
-
-
/*
* dbxface - external debugger interfaces
*/
-
ACPI_STATUS
AcpiDbInitialize (
void);
@@ -167,19 +161,13 @@
ACPI_PARSE_OBJECT *Op,
UINT32 OpType);
-ACPI_STATUS
-AcpiDbStartCommand (
- ACPI_WALK_STATE *WalkState,
- ACPI_PARSE_OBJECT *Op);
-
-void
-AcpiDbMethodEnd (
- ACPI_WALK_STATE *WalkState);
-
/*
* dbcmds - debug commands and output routines
*/
+ACPI_STATUS
+AcpiDbDisassembleMethod (
+ char *Name);
void
AcpiDbDisplayTableInfo (
@@ -239,62 +227,39 @@
AcpiDbSetScope (
char *Name);
+ACPI_STATUS
+AcpiDbSleep (
+ char *ObjectArg);
+
void
AcpiDbFindReferences (
char *ObjectArg);
void
-AcpiDbDisplayLocks (void);
-
+AcpiDbDisplayLocks (
+ void);
void
AcpiDbDisplayResources (
char *ObjectArg);
void
-AcpiDbDisplayGpes (void);
+AcpiDbDisplayGpes (
+ void);
void
AcpiDbCheckIntegrity (
void);
-ACPI_STATUS
-AcpiDbIntegrityWalk (
- ACPI_HANDLE ObjHandle,
- UINT32 NestingLevel,
- void *Context,
- void **ReturnValue);
-
-ACPI_STATUS
-AcpiDbWalkAndMatchName (
- ACPI_HANDLE ObjHandle,
- UINT32 NestingLevel,
- void *Context,
- void **ReturnValue);
-
-ACPI_STATUS
-AcpiDbWalkForReferences (
- ACPI_HANDLE ObjHandle,
- UINT32 NestingLevel,
- void *Context,
- void **ReturnValue);
-
-ACPI_STATUS
-AcpiDbWalkForSpecificObjects (
- ACPI_HANDLE ObjHandle,
- UINT32 NestingLevel,
- void *Context,
- void **ReturnValue);
-
void
AcpiDbGenerateGpe (
char *GpeArg,
char *BlockArg);
+
/*
* dbdisply - debug display commands
*/
-
void
AcpiDbDisplayMethodInfo (
ACPI_PARSE_OBJECT *Op);
@@ -338,19 +303,10 @@
ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_WALK_STATE *WalkState);
-void
-AcpiDbDumpParserDescriptor (
- ACPI_PARSE_OBJECT *Op);
-
-void *
-AcpiDbGetPointer (
- void *Target);
-
/*
* dbexec - debugger control method execution
*/
-
void
AcpiDbExecute (
char *Name,
@@ -363,44 +319,15 @@
char *NumLoopsArg,
char *MethodNameArg);
-ACPI_STATUS
-AcpiDbExecuteMethod (
- ACPI_DB_METHOD_INFO *Info,
- ACPI_BUFFER *ReturnObj);
-
-void
-AcpiDbExecuteSetup (
- ACPI_DB_METHOD_INFO *Info);
-
-UINT32
-AcpiDbGetOutstandingAllocations (
- void);
-
-void ACPI_SYSTEM_XFACE
-AcpiDbMethodThread (
- void *Context);
-
-ACPI_STATUS
-AcpiDbExecutionWalk (
- ACPI_HANDLE ObjHandle,
- UINT32 NestingLevel,
- void *Context,
- void **ReturnValue);
-
/*
* dbfileio - Debugger file I/O commands
*/
-
ACPI_OBJECT_TYPE
AcpiDbMatchArgument (
char *UserArgument,
ARGUMENT_INFO *Arguments);
-ACPI_STATUS
-AeLocalLoadTable (
- ACPI_TABLE_HEADER *TablePtr);
-
void
AcpiDbCloseDebugFile (
void);
@@ -423,16 +350,17 @@
char *Filename,
Home |
Main Index |
Thread Index |
Old Index