diff options
author | jkim <jkim@FreeBSD.org> | 2011-02-12 01:03:15 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2011-02-12 01:03:15 +0000 |
commit | f74b693166215a41e29f1932c91ef7c921e662a7 (patch) | |
tree | 77080c497fdac042ac2702fc74a130a870de5215 /sys/contrib/dev/acpica/include | |
parent | 060dcf42aad3ccbc8df13ec962fd6a93e9f78070 (diff) | |
parent | 6636ac3533f4af02a42a7302b5cd1197817f4ed9 (diff) | |
download | FreeBSD-src-f74b693166215a41e29f1932c91ef7c921e662a7.zip FreeBSD-src-f74b693166215a41e29f1932c91ef7c921e662a7.tar.gz |
Merge ACPICA 20110211.
Diffstat (limited to 'sys/contrib/dev/acpica/include')
-rw-r--r-- | sys/contrib/dev/acpica/include/acdebug.h | 117 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/acdisasm.h | 2 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/acdispat.h | 50 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/acglobal.h | 4 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/aclocal.h | 19 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/acoutput.h | 12 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/acpixf.h | 2 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/actbl.h | 16 |
8 files changed, 128 insertions, 94 deletions
diff --git a/sys/contrib/dev/acpica/include/acdebug.h b/sys/contrib/dev/acpica/include/acdebug.h index 169459e..9b4822d 100644 --- a/sys/contrib/dev/acpica/include/acdebug.h +++ b/sys/contrib/dev/acpica/include/acdebug.h @@ -98,9 +98,9 @@ AcpiDbSingleStep ( /* * dbcmds - debug commands and output routines */ -ACPI_STATUS -AcpiDbDisassembleMethod ( - char *Name); +ACPI_NAMESPACE_NODE * +AcpiDbConvertToNode ( + char *InString); void AcpiDbDisplayTableInfo ( @@ -112,38 +112,53 @@ AcpiDbUnloadAcpiTable ( char *InstanceArg); void -AcpiDbSetMethodBreakpoint ( - char *Location, - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op); +AcpiDbSendNotify ( + char *Name, + UINT32 Value); void -AcpiDbSetMethodCallBreakpoint ( - ACPI_PARSE_OBJECT *Op); +AcpiDbDisplayInterfaces ( + char *ActionArg, + char *InterfaceNameArg); + +ACPI_STATUS +AcpiDbSleep ( + char *ObjectArg); void -AcpiDbGetBusInfo ( +AcpiDbDisplayLocks ( void); void -AcpiDbDisassembleAml ( - char *Statements, - ACPI_PARSE_OBJECT *Op); +AcpiDbDisplayResources ( + char *ObjectArg); void -AcpiDbDumpNamespace ( - char *StartArg, - char *DepthArg); +AcpiDbDisplayGpes ( + void); void -AcpiDbDumpNamespaceByOwner ( - char *OwnerArg, - char *DepthArg); +AcpiDbDisplayHandlers ( + void); void -AcpiDbSendNotify ( - char *Name, - UINT32 Value); +AcpiDbGenerateGpe ( + char *GpeArg, + char *BlockArg); + + +/* + * dbmethod - control method commands + */ +void +AcpiDbSetMethodBreakpoint ( + char *Location, + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op); + +void +AcpiDbSetMethodCallBreakpoint ( + ACPI_PARSE_OBJECT *Op); void AcpiDbSetMethodData ( @@ -152,59 +167,61 @@ AcpiDbSetMethodData ( char *ValueArg); ACPI_STATUS -AcpiDbDisplayObjects ( - char *ObjTypeArg, - char *DisplayCountArg); +AcpiDbDisassembleMethod ( + char *Name); void -AcpiDbDisplayInterfaces ( - char *ActionArg, - char *InterfaceNameArg); +AcpiDbDisassembleAml ( + char *Statements, + ACPI_PARSE_OBJECT *Op); -ACPI_STATUS -AcpiDbFindNameInNamespace ( - char *NameArg); +void +AcpiDbBatchExecute ( + char *CountArg); + +/* + * dbnames - namespace commands + */ void AcpiDbSetScope ( char *Name); -ACPI_STATUS -AcpiDbSleep ( - char *ObjectArg); - void -AcpiDbFindReferences ( - char *ObjectArg); +AcpiDbDumpNamespace ( + char *StartArg, + char *DepthArg); void -AcpiDbDisplayLocks ( - void); +AcpiDbDumpNamespaceByOwner ( + char *OwnerArg, + char *DepthArg); -void -AcpiDbDisplayResources ( - char *ObjectArg); +ACPI_STATUS +AcpiDbFindNameInNamespace ( + char *NameArg); void -AcpiDbDisplayGpes ( +AcpiDbCheckPredefinedNames ( void); +ACPI_STATUS +AcpiDbDisplayObjects ( + char *ObjTypeArg, + char *DisplayCountArg); + void AcpiDbCheckIntegrity ( void); void -AcpiDbGenerateGpe ( - char *GpeArg, - char *BlockArg); +AcpiDbFindReferences ( + char *ObjectArg); void -AcpiDbCheckPredefinedNames ( +AcpiDbGetBusInfo ( void); -void -AcpiDbBatchExecute ( - char *CountArg); /* * dbdisply - debug display commands diff --git a/sys/contrib/dev/acpica/include/acdisasm.h b/sys/contrib/dev/acpica/include/acdisasm.h index 2d7c4dc..73dddf4 100644 --- a/sys/contrib/dev/acpica/include/acdisasm.h +++ b/sys/contrib/dev/acpica/include/acdisasm.h @@ -127,6 +127,8 @@ typedef const struct acpi_dmtable_info #define ACPI_DMT_UNICODE 42 #define ACPI_DMT_UUID 43 #define ACPI_DMT_DEVICE_PATH 44 +#define ACPI_DMT_LABEL 45 +#define ACPI_DMT_BUF7 46 typedef diff --git a/sys/contrib/dev/acpica/include/acdispat.h b/sys/contrib/dev/acpica/include/acdispat.h index aae055c..ae8dd93 100644 --- a/sys/contrib/dev/acpica/include/acdispat.h +++ b/sys/contrib/dev/acpica/include/acdispat.h @@ -51,7 +51,7 @@ /* - * dsopcode - support for late evaluation + * dsargs - execution of dynamic arguments for static objects */ ACPI_STATUS AcpiDsGetBufferFieldArguments ( @@ -73,6 +73,24 @@ ACPI_STATUS AcpiDsGetPackageArguments ( ACPI_OPERAND_OBJECT *ObjDesc); + +/* + * dscontrol - support for execution control opcodes + */ +ACPI_STATUS +AcpiDsExecBeginControlOp ( + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op); + +ACPI_STATUS +AcpiDsExecEndControlOp ( + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op); + + +/* + * dsopcode - support for late operand evaluation + */ ACPI_STATUS AcpiDsEvalBufferFieldOperands ( ACPI_WALK_STATE *WalkState, @@ -105,20 +123,6 @@ AcpiDsInitializeRegion ( /* - * dsctrl - Parser/Interpreter interface, control stack routines - */ -ACPI_STATUS -AcpiDsExecBeginControlOp ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op); - -ACPI_STATUS -AcpiDsExecEndControlOp ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op); - - -/* * dsexec - Parser/Interpreter interface, method execution callbacks */ ACPI_STATUS @@ -169,9 +173,14 @@ AcpiDsInitFieldObjects ( /* - * dsload - Parser/Interpreter interface, namespace load callbacks + * dsload - Parser/Interpreter interface, pass 1 namespace load callbacks */ ACPI_STATUS +AcpiDsInitCallbacks ( + ACPI_WALK_STATE *WalkState, + UINT32 PassNumber); + +ACPI_STATUS AcpiDsLoad1BeginOp ( ACPI_WALK_STATE *WalkState, ACPI_PARSE_OBJECT **OutOp); @@ -180,6 +189,10 @@ ACPI_STATUS AcpiDsLoad1EndOp ( ACPI_WALK_STATE *WalkState); + +/* + * dsload - Parser/Interpreter interface, pass 2 namespace load callbacks + */ ACPI_STATUS AcpiDsLoad2BeginOp ( ACPI_WALK_STATE *WalkState, @@ -189,11 +202,6 @@ ACPI_STATUS AcpiDsLoad2EndOp ( ACPI_WALK_STATE *WalkState); -ACPI_STATUS -AcpiDsInitCallbacks ( - ACPI_WALK_STATE *WalkState, - UINT32 PassNumber); - /* * dsmthdat - method data (locals/args) diff --git a/sys/contrib/dev/acpica/include/acglobal.h b/sys/contrib/dev/acpica/include/acglobal.h index 1ae2624..65cf691 100644 --- a/sys/contrib/dev/acpica/include/acglobal.h +++ b/sys/contrib/dev/acpica/include/acglobal.h @@ -245,6 +245,10 @@ ACPI_EXTERN UINT32 AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MAS ACPI_EXTERN UINT8 AcpiGbl_LastOwnerIdIndex; ACPI_EXTERN UINT8 AcpiGbl_NextOwnerIdOffset; +/* Initialization sequencing */ + +ACPI_EXTERN BOOLEAN AcpiGbl_RegMethodsExecuted; + /* Misc */ ACPI_EXTERN UINT32 AcpiGbl_OriginalMode; diff --git a/sys/contrib/dev/acpica/include/aclocal.h b/sys/contrib/dev/acpica/include/aclocal.h index 1c6868a..bdefb76 100644 --- a/sys/contrib/dev/acpica/include/aclocal.h +++ b/sys/contrib/dev/acpica/include/aclocal.h @@ -93,25 +93,6 @@ union acpi_parse_object; #define ACPI_MAX_MUTEX 7 #define ACPI_NUM_MUTEX ACPI_MAX_MUTEX+1 -#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) -#ifdef DEFINE_ACPI_GLOBALS - -/* Debug names for the mutexes above */ - -static char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] = -{ - "ACPI_MTX_Interpreter", - "ACPI_MTX_Namespace", - "ACPI_MTX_Tables", - "ACPI_MTX_Events", - "ACPI_MTX_Caches", - "ACPI_MTX_Memory", - "ACPI_MTX_CommandComplete", - "ACPI_MTX_CommandReady" -}; - -#endif -#endif /* Lock structure for reader/writer interfaces */ diff --git a/sys/contrib/dev/acpica/include/acoutput.h b/sys/contrib/dev/acpica/include/acoutput.h index 4b68904..c8007e2 100644 --- a/sys/contrib/dev/acpica/include/acoutput.h +++ b/sys/contrib/dev/acpica/include/acoutput.h @@ -186,13 +186,19 @@ #if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES) /* - * Module name is included in both debug and non-debug versions primarily for - * error messages. The __FILE__ macro is not very useful for this, because it - * often includes the entire pathname to the module + * The module name is used primarily for error and debug messages. + * The __FILE__ macro is not very useful for this, because it + * usually includes the entire pathname to the module making the + * debug output difficult to read. */ #define ACPI_MODULE_NAME(Name) static const char ACPI_UNUSED_VAR _AcpiModuleName[] = Name; #else +/* + * For the no-debug and no-error-msg cases, we must at least define + * a null module name. + */ #define ACPI_MODULE_NAME(Name) +#define _AcpiModuleName "" #endif /* diff --git a/sys/contrib/dev/acpica/include/acpixf.h b/sys/contrib/dev/acpica/include/acpixf.h index b96203d..0aaa374 100644 --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@ -48,7 +48,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20110112 +#define ACPI_CA_VERSION 0x20110211 #include <contrib/dev/acpica/include/actypes.h> #include <contrib/dev/acpica/include/actbl.h> diff --git a/sys/contrib/dev/acpica/include/actbl.h b/sys/contrib/dev/acpica/include/actbl.h index 96e1755..81e0aa6 100644 --- a/sys/contrib/dev/acpica/include/actbl.h +++ b/sys/contrib/dev/acpica/include/actbl.h @@ -397,4 +397,20 @@ typedef struct acpi_table_desc #define ACPI_FADT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_FADT, f) +/* + * Sizes of the various flavors of FADT. We need to look closely + * at the FADT length because the version number essentially tells + * us nothing because of many BIOS bugs where the version does not + * match the expected length. In other words, the length of the + * FADT is the bottom line as to what the version really is. + * + * For reference, the values below are as follows: + * FADT V1 size: 0x74 + * FADT V2 size: 0x84 + * FADT V3+ size: 0xF4 + */ +#define ACPI_FADT_V1_SIZE (UINT32) (ACPI_FADT_OFFSET (Flags) + 4) +#define ACPI_FADT_V2_SIZE (UINT32) (ACPI_FADT_OFFSET (Reserved4[0]) + 3) +#define ACPI_FADT_V3_SIZE (UINT32) (sizeof (ACPI_TABLE_FADT)) + #endif /* __ACTBL_H__ */ |