mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-16 14:29:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed names of the major objects for clarity

Browse Source 
date	2000.08.30.20.11.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 19:28:34 +00:00
parent ab742a696d
commit 3fb9b0d2f6
11 changed files with 351 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/include/acdebug.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acdebug.h - ACPI/AML debugger
@ -156,7 +155,7 @@ extern UINT32 NumAliases;
extern UINT32 NumDevices;
extern UINT32 NumFieldDefs;
extern UINT32 NumThermalZones;
extern UINT32 NumNamedObjects;
extern UINT32 NumNodes;
extern UINT32 NumGrammarElements;
extern UINT32 NumMethodElements ;
extern UINT32 NumMutexes;
@ -218,7 +217,7 @@ AcpiDbInitialize (
ACPI_STATUS
AcpiDbSingleStep (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
UINT8 OpType);
@ -240,16 +239,16 @@ void
AcpiDbSetMethodBreakpoint (
NATIVE_CHAR *Location,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDbSetMethodCallBreakpoint (
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDbDisassembleAml (
NATIVE_CHAR *Statements,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDbDumpNamespace (
@ -296,7 +295,7 @@ AcpiDbFindReferences (
void
AcpiDbDisplayOp (
ACPI_GENERIC_OP *origin,
ACPI_PARSE_OBJECT *origin,
UINT32 NumOpcodes);
void
@ -305,11 +304,11 @@ AcpiDbDisplayNamestring (
void
AcpiDbDisplayPath (
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDbDisplayOpcode (
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
/*
@ -319,7 +318,7 @@ AcpiDbDisplayOpcode (
void
AcpiDbDisplayMethodInfo (
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDbDecodeAndDisplayObject (
@ -328,7 +327,7 @@ AcpiDbDecodeAndDisplayObject (
void
AcpiDbDisplayResultObject (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
@ -337,7 +336,7 @@ AcpiDbDisplayAllMethods (
void
AcpiDbDisplayInternalObject (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_WALK_STATE *WalkState);
void
@ -358,7 +357,7 @@ AcpiDbDisplayCallingTree (
void
AcpiDbDisplayArgumentObject (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_WALK_STATE *WalkState);
@ -426,7 +425,7 @@ ACPI_STATUS
AcpiDbCommandDispatch (
NATIVE_CHAR *InputBuffer,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDbExecuteThread (
@ -435,7 +434,7 @@ AcpiDbExecuteThread (
ACPI_STATUS
AcpiDbUserCommands (
NATIVE_CHAR Prompt,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
/*
@ -444,7 +443,7 @@ AcpiDbUserCommands (
void
AcpiDbGenerateStatistics (
ACPI_GENERIC_OP *Root,
ACPI_PARSE_OBJECT *Root,
BOOLEAN IsMethod);
@ -477,9 +476,9 @@ AcpiDbPrepNamestring (
ACPI_STATUS
AcpiDbSecondPassParse (
ACPI_GENERIC_OP *Root);
ACPI_PARSE_OBJECT *Root);
ACPI_NAMED_OBJECT*
ACPI_NAMESPACE_NODE *
AcpiDbLocalNsLookup (
NATIVE_CHAR *Name);

104
source/include/acdispat.h
View File

@ -1,6 +1,6 @@
/******************************************************************************
*
* Module Name: acdispat.h - dispatcher (parser to interpreter interface)
* Name: acdispat.h - dispatcher (parser to interpreter interface)
*
*****************************************************************************/
@ -147,7 +147,7 @@ AcpiDsObjStackGetValue (
ACPI_STATUS
AcpiDsObjStackPopObject (
ACPI_OBJECT_INTERNAL **Object,
ACPI_OPERAND_OBJECT **Object,
ACPI_WALK_STATE *WalkState);
@ -155,7 +155,7 @@ AcpiDsObjStackPopObject (
ACPI_STATUS
AcpiDsGetRegionArguments (
ACPI_OBJECT_INTERNAL *RgnDesc);
ACPI_OPERAND_OBJECT *RgnDesc);
/* dsctrl - Parser/Interpreter interface, control stack routines */
@ -164,12 +164,12 @@ AcpiDsGetRegionArguments (
ACPI_STATUS
AcpiDsExecBeginControlOp (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
ACPI_STATUS
AcpiDsExecEndControlOp (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
/* dsexec - Parser/Interpreter interface, method execution callbacks */
@ -177,14 +177,14 @@ AcpiDsExecEndControlOp (
ACPI_STATUS
AcpiDsExecBeginOp (
UINT16 Opcode,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP **OutOp);
ACPI_PARSE_OBJECT **OutOp);
ACPI_STATUS
AcpiDsExecEndOp (
ACPI_WALK_STATE *State,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
/* dsfield - Parser/Interpreter interface for AML fields */
@ -192,20 +192,20 @@ AcpiDsExecEndOp (
ACPI_STATUS
AcpiDsCreateField (
ACPI_GENERIC_OP *Op,
ACPI_HANDLE Region,
ACPI_PARSE_OBJECT *Op,
ACPI_NAMESPACE_NODE *RegionNode,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiDsCreateBankField (
ACPI_GENERIC_OP *Op,
ACPI_HANDLE Region,
ACPI_PARSE_OBJECT *Op,
ACPI_NAMESPACE_NODE *RegionNode,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiDsCreateIndexField (
ACPI_GENERIC_OP *Op,
ACPI_HANDLE Region,
ACPI_PARSE_OBJECT *Op,
ACPI_HANDLE RegionNode,
ACPI_WALK_STATE *WalkState);
@ -214,26 +214,26 @@ AcpiDsCreateIndexField (
ACPI_STATUS
AcpiDsLoad1BeginOp (
UINT16 Opcode,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP **OutOp);
ACPI_PARSE_OBJECT **OutOp);
ACPI_STATUS
AcpiDsLoad1EndOp (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
ACPI_STATUS
AcpiDsLoad2BeginOp (
UINT16 Opcode,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP **OutOp);
ACPI_PARSE_OBJECT **OutOp);
ACPI_STATUS
AcpiDsLoad2EndOp (
ACPI_WALK_STATE *State,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
/* dsmthdat - method data (locals/args) */
@ -244,7 +244,7 @@ AcpiDsMethodDataGetEntry (
UINT32 Type,
UINT32 Index,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL ***Entry);
ACPI_OPERAND_OBJECT ***Node);
ACPI_STATUS
AcpiDsMethodDataDeleteAll (
@ -252,7 +252,7 @@ AcpiDsMethodDataDeleteAll (
BOOLEAN
AcpiDsIsMethodValue (
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *ObjDesc);
OBJECT_TYPE_INTERNAL
AcpiDsMethodDataGetType (
@ -265,13 +265,13 @@ AcpiDsMethodDataGetValue (
UINT32 Type,
UINT32 Index,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **DestDesc);
ACPI_OPERAND_OBJECT **DestDesc);
ACPI_STATUS
AcpiDsMethodDataSetValue (
UINT32 Type,
UINT32 Index,
ACPI_OBJECT_INTERNAL *SrcDesc,
ACPI_OPERAND_OBJECT *SrcDesc,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
@ -282,11 +282,11 @@ AcpiDsMethodDataDeleteValue (
ACPI_STATUS
AcpiDsMethodDataInitArgs (
ACPI_OBJECT_INTERNAL **Params,
ACPI_OPERAND_OBJECT **Params,
UINT32 MaxParamCount,
ACPI_WALK_STATE *WalkState);
ACPI_NAMED_OBJECT*
ACPI_NAMESPACE_NODE *
AcpiDsMethodDataGetNte (
UINT32 Type,
UINT32 Index,
@ -300,7 +300,7 @@ ACPI_STATUS
AcpiDsMethodDataSetEntry (
UINT32 Type,
UINT32 Index,
ACPI_OBJECT_INTERNAL *Object,
ACPI_OPERAND_OBJECT *Object,
ACPI_WALK_STATE *WalkState);
@ -314,12 +314,12 @@ ACPI_STATUS
AcpiDsCallControlMethod (
ACPI_WALK_LIST *WalkList,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
ACPI_STATUS
AcpiDsRestartControlMethod (
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL *ReturnDesc);
ACPI_OPERAND_OBJECT *ReturnDesc);
ACPI_STATUS
AcpiDsTerminateControlMethod (
@ -327,8 +327,8 @@ AcpiDsTerminateControlMethod (
ACPI_STATUS
AcpiDsBeginMethodExecution (
ACPI_NAMED_OBJECT *MethodEntry,
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_NAMESPACE_NODE *MethodNode,
ACPI_OPERAND_OBJECT *ObjDesc);
/* dsobj - Parser/Interpreter interface - object initialization and conversion */
@ -343,32 +343,32 @@ AcpiDsInitOneObject (
ACPI_STATUS
AcpiDsInitializeObjects (
ACPI_TABLE_DESC *TableDesc,
ACPI_NAMED_OBJECT *StartEntry);
ACPI_NAMESPACE_NODE *StartNode);
ACPI_STATUS
AcpiDsBuildInternalPackageObj (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *op,
ACPI_OBJECT_INTERNAL **ObjDesc);
ACPI_PARSE_OBJECT *op,
ACPI_OPERAND_OBJECT **ObjDesc);
ACPI_STATUS
AcpiDsBuildInternalObject (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *op,
ACPI_OBJECT_INTERNAL **ObjDescPtr);
ACPI_PARSE_OBJECT *op,
ACPI_OPERAND_OBJECT **ObjDescPtr);
ACPI_STATUS
AcpiDsInitObjectFromOp (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
UINT16 Opcode,
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT **ObjDesc);
ACPI_STATUS
AcpiDsCreateNamedObject (
AcpiDsCreateNode (
ACPI_WALK_STATE *WalkState,
ACPI_NAMED_OBJECT *Entry,
ACPI_GENERIC_OP *Op);
ACPI_NAMESPACE_NODE *Node,
ACPI_PARSE_OBJECT *Op);
/* dsregn - Parser/Interpreter interface - Op Region parsing */
@ -376,7 +376,7 @@ AcpiDsCreateNamedObject (
ACPI_STATUS
AcpiDsEvalRegionOperands (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
ACPI_STATUS
AcpiDsInitializeRegion (
@ -387,23 +387,23 @@ AcpiDsInitializeRegion (
BOOLEAN
AcpiDsIsResultUsed (
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiDsDeleteResultIfNotUsed (
ACPI_GENERIC_OP *Op,
ACPI_OBJECT_INTERNAL *ResultObj,
ACPI_PARSE_OBJECT *Op,
ACPI_OPERAND_OBJECT *ResultObj,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiDsCreateOperand (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Arg);
ACPI_PARSE_OBJECT *Arg);
ACPI_STATUS
AcpiDsCreateOperands (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *FirstArg);
ACPI_PARSE_OBJECT *FirstArg);
ACPI_STATUS
AcpiDsResolveOperands (
@ -425,7 +425,7 @@ AcpiDsMapNamedOpcodeToDataType (
ACPI_STATUS
AcpiDsScopeStackPush (
ACPI_NAME_TABLE *NewScope,
ACPI_NAMESPACE_NODE *Node,
OBJECT_TYPE_INTERNAL Type,
ACPI_WALK_STATE *WalkState);
@ -444,8 +444,8 @@ AcpiDsScopeStackClear (
ACPI_WALK_STATE *
AcpiDsCreateWalkState (
ACPI_OWNER_ID OwnerId,
ACPI_GENERIC_OP *Origin,
ACPI_OBJECT_INTERNAL *MthDesc,
ACPI_PARSE_OBJECT *Origin,
ACPI_OPERAND_OBJECT *MthDesc,
ACPI_WALK_LIST *WalkList);
ACPI_STATUS
@ -467,7 +467,7 @@ AcpiDsPopWalkState (
ACPI_STATUS
AcpiDsResultStackPop (
ACPI_OBJECT_INTERNAL **Object,
ACPI_OPERAND_OBJECT **Object,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
@ -488,4 +488,4 @@ AcpiDsDeleteWalkStateCache (
void);
#endif /* _ACDISPAT_H_ */
#endif /* _ACDISPAT_H_ */

11
source/include/acevents.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acevents.h - Event subcomponent prototypes and defines
@ -193,7 +192,7 @@ AcpiEvInstallDefaultAddressSpaceHandlers (
ACPI_STATUS
AcpiEvAddressSpaceDispatch (
ACPI_OBJECT_INTERNAL *RegionObj,
ACPI_OPERAND_OBJECT *RegionObj,
UINT32 Function,
UINT32 Address,
UINT32 BitWidth,
@ -209,13 +208,13 @@ AcpiEvAddrHandlerHelper (
void
AcpiEvDisassociateRegionFromHandler(
ACPI_OBJECT_INTERNAL *RegionObj);
ACPI_OPERAND_OBJECT *RegionObj);
ACPI_STATUS
AcpiEvAssociateRegionAndHandler (
ACPI_OBJECT_INTERNAL *HandlerObj,
ACPI_OBJECT_INTERNAL *RegionObj,
ACPI_OPERAND_OBJECT *HandlerObj,
ACPI_OPERAND_OBJECT *RegionObj,
BOOLEAN AcpiNsIsLocked);
@ -253,7 +252,7 @@ AcpiEvDefaultRegionSetup (
ACPI_STATUS
AcpiEvInitializeRegion (
ACPI_OBJECT_INTERNAL *RegionObj,
ACPI_OPERAND_OBJECT *RegionObj,
BOOLEAN AcpiNsLocked);

6
source/include/acexcep.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acexcep.h - Exception codes returned by the ACPI subsystem
@ -162,7 +161,7 @@
#define AE_CODE_ENV_MAX 0x0014
/*
/*
* Programmer exceptions
*/
#define AE_BAD_PARAMETER (ACPI_STATUS) (0x0001 | AE_CODE_PROGRAMMER)
@ -223,7 +222,6 @@
#define AE_CODE_CTRL_MAX 0x0008
#ifdef DEFINE_ACPI_GLOBALS
/*
@ -305,8 +303,6 @@ static NATIVE_CHAR *AcpiGbl_ExceptionNames_Ctrl[] =
};
#endif /* DEFINE_ACPI_GLOBALS */

20
source/include/acglobal.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acglobal.h - Declarations for global variables
@ -204,9 +203,9 @@ ACPI_EXTERN UINT8 *AcpiGbl_Gpe0EnableRegisterSave;
ACPI_EXTERN UINT8 *AcpiGbl_Gpe1EnableRegisterSave;
ACPI_EXTERN ACPI_WALK_STATE *AcpiGbl_BreakpointWalk;
ACPI_EXTERN ACPI_GENERIC_STATE *AcpiGbl_GenericStateCache;
ACPI_EXTERN ACPI_GENERIC_OP *AcpiGbl_ParseCache;
ACPI_EXTERN ACPI_EXTENDED_OP *AcpiGbl_ExtParseCache;
ACPI_EXTERN ACPI_OBJECT_INTERNAL *AcpiGbl_ObjectCache;
ACPI_EXTERN ACPI_PARSE_OBJECT *AcpiGbl_ParseCache;
ACPI_EXTERN ACPI_PARSE2_OBJECT *AcpiGbl_ExtParseCache;
ACPI_EXTERN ACPI_OPERAND_OBJECT *AcpiGbl_ObjectCache;
ACPI_EXTERN ACPI_WALK_STATE *AcpiGbl_WalkStateCache;
ACPI_EXTERN ACPI_HANDLE AcpiGbl_GlobalLockSemaphore;
@ -267,8 +266,8 @@ extern UINT32 AcpiGbl_StartupFlags;
#define NUM_PREDEFINED_NAMES 9
ACPI_EXTERN ACPI_NAME_TABLE AcpiGbl_RootNameTable;
ACPI_EXTERN ACPI_NAMED_OBJECT *AcpiGbl_RootObject;
ACPI_EXTERN ACPI_NAMESPACE_NODE AcpiGbl_RootNodeStruct;
ACPI_EXTERN ACPI_NAMESPACE_NODE *AcpiGbl_RootNode;
extern UINT8 AcpiGbl_NsProperties[NUM_NS_TYPES];
extern PREDEFINED_NAMES AcpiGbl_PreDefinedNames [NUM_PREDEFINED_NAMES];
@ -304,7 +303,7 @@ ACPI_EXTERN UINT32 AcpiGbl_PCodeBlockLen;
ACPI_EXTERN UINT32 AcpiGbl_PCodeLen;
ACPI_EXTERN UINT32 AcpiGbl_BufSeq; /* Counts allocated Buffer descriptors */
ACPI_EXTERN UINT32 AcpiGbl_NamedObjectErr; /* Indicate if inc_error should be called */
ACPI_EXTERN UINT32 AcpiGbl_NodeErr; /* Indicate if inc_error should be called */
/*
* Handle to the last method found - used during pass1 of load
@ -329,9 +328,9 @@ ACPI_EXTERN UINT8 AcpiGbl_CmSingleStep;
*
****************************************************************************/
ACPI_EXTERN ACPI_GENERIC_OP *AcpiGbl_ParsedNamespaceRoot;
ACPI_EXTERN ACPI_PARSE_OBJECT *AcpiGbl_ParsedNamespaceRoot;
extern ACPI_OP_INFO AcpiGbl_AmlOpInfo[];
extern ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[];
extern UINT8 AcpiGbl_AmlOpInfoIndex[256];
@ -401,6 +400,9 @@ ACPI_EXTERN UINT32 AcpiGbl_MaxConcurrentObjectCount;
ACPI_EXTERN UINT32 AcpiGbl_MaxConcurrentObjectSize;
ACPI_EXTERN UINT32 AcpiGbl_RunningObjectCount;
ACPI_EXTERN UINT32 AcpiGbl_RunningObjectSize;
ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeCount;
ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeSize;
ACPI_EXTERN UINT32 AcpiGbl_MaxConcurrentNodeCount;
#endif

102
source/include/acinterp.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
@ -141,7 +140,7 @@
ACPI_STATUS
AcpiAmlResolveOperands (
UINT16 Opcode,
ACPI_OBJECT_INTERNAL **StackPtr,
ACPI_OPERAND_OBJECT **StackPtr,
ACPI_WALK_STATE *WalkState);
@ -155,10 +154,9 @@ AcpiAmlLoadTable (
ACPI_STATUS
AcpiAmlExecuteMethod (
ACPI_NAMED_OBJECT *MethodEntry,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **ReturnObjDesc);
ACPI_NAMESPACE_NODE *MethodNode,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObjDesc);
/*
@ -168,7 +166,7 @@ AcpiAmlExecuteMethod (
ACPI_STATUS
AcpiAmlReadField (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
void *Buffer,
UINT32 BufferLength,
UINT32 ByteLength,
@ -178,7 +176,7 @@ AcpiAmlReadField (
ACPI_STATUS
AcpiAmlWriteField (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
void *Buffer,
UINT32 BufferLength,
UINT32 ByteLength,
@ -188,13 +186,13 @@ AcpiAmlWriteField (
ACPI_STATUS
AcpiAmlSetupField (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OBJECT_INTERNAL *RgnDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
ACPI_OPERAND_OBJECT *RgnDesc,
UINT32 FieldBitWidth);
ACPI_STATUS
AcpiAmlReadFieldData (
ACPI_OBJECT_INTERNAL *ObjDesc,
ACPI_OPERAND_OBJECT *ObjDesc,
UINT32 FieldByteOffset,
UINT32 FieldBitWidth,
UINT32 *Value);
@ -227,12 +225,12 @@ AcpiAmlExecFatal (
ACPI_STATUS
AcpiAmlExecIndex (
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
ACPI_STATUS
AcpiAmlExecMatch (
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
ACPI_STATUS
AcpiAmlExecCreateMutex (
@ -240,12 +238,12 @@ AcpiAmlExecCreateMutex (
ACPI_STATUS
AcpiAmlExecCreateProcessor (
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_HANDLE ProcessorNTE);
ACPI_STATUS
AcpiAmlExecCreatePowerResource (
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_HANDLE ProcessorNTE);
ACPI_STATUS
@ -277,7 +275,7 @@ AcpiAmlExecCreateMethod (
ACPI_STATUS
AcpiAmlPrepDefFieldValue (
ACPI_NAMED_OBJECT *ThisEntry,
ACPI_NAMESPACE_NODE *Node,
ACPI_HANDLE Region,
UINT8 FieldFlags,
UINT8 FieldAttribute,
@ -286,7 +284,7 @@ AcpiAmlPrepDefFieldValue (
ACPI_STATUS
AcpiAmlPrepBankFieldValue (
ACPI_NAMED_OBJECT *ThisEntry,
ACPI_NAMESPACE_NODE *Node,
ACPI_HANDLE Region,
ACPI_HANDLE BankReg,
UINT32 BankVal,
@ -297,7 +295,7 @@ AcpiAmlPrepBankFieldValue (
ACPI_STATUS
AcpiAmlPrepIndexFieldValue (
ACPI_NAMED_OBJECT *ThisEntry,
ACPI_NAMESPACE_NODE *Node,
ACPI_HANDLE IndexReg,
ACPI_HANDLE DataReg,
UINT8 FieldFlags,
@ -316,8 +314,8 @@ AcpiAmlSystemThreadId (
ACPI_STATUS
AcpiAmlSystemDoNotifyOp (
ACPI_OBJECT_INTERNAL *Value,
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *Value,
ACPI_OPERAND_OBJECT *ObjDesc);
void
AcpiAmlSystemDoSuspend(
@ -329,25 +327,25 @@ AcpiAmlSystemDoStall (
ACPI_STATUS
AcpiAmlSystemAcquireMutex(
ACPI_OBJECT_INTERNAL *Time,
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *Time,
ACPI_OPERAND_OBJECT *ObjDesc);
ACPI_STATUS
AcpiAmlSystemReleaseMutex(
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *ObjDesc);
ACPI_STATUS
AcpiAmlSystemSignalEvent(
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *ObjDesc);
ACPI_STATUS
AcpiAmlSystemWaitEvent(
ACPI_OBJECT_INTERNAL *Time,
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *Time,
ACPI_OPERAND_OBJECT *ObjDesc);
ACPI_STATUS
AcpiAmlSystemResetEvent(
ACPI_OBJECT_INTERNAL *ObjDesc);
ACPI_OPERAND_OBJECT *ObjDesc);
ACPI_STATUS
AcpiAmlSystemWaitSemaphore (
@ -368,13 +366,13 @@ ACPI_STATUS
AcpiAmlExecMonadic2 (
UINT16 Opcode,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
ACPI_STATUS
AcpiAmlExecMonadic2R (
UINT16 Opcode,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
/*
@ -390,19 +388,19 @@ ACPI_STATUS
AcpiAmlExecDyadic2 (
UINT16 Opcode,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
ACPI_STATUS
AcpiAmlExecDyadic2R (
UINT16 Opcode,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
ACPI_STATUS
AcpiAmlExecDyadic2S (
UINT16 Opcode,
ACPI_WALK_STATE *WalkState,
ACPI_OBJECT_INTERNAL **ReturnDesc);
ACPI_OPERAND_OBJECT **ReturnDesc);
/*
@ -411,22 +409,22 @@ AcpiAmlExecDyadic2S (
ACPI_STATUS
AcpiAmlResolveToValue (
ACPI_OBJECT_INTERNAL **StackPtr,
ACPI_OPERAND_OBJECT **StackPtr,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiAmlResolveEntryToValue (
ACPI_NAMED_OBJECT **StackPtr);
AcpiAmlResolveNodeToValue (
ACPI_NAMESPACE_NODE **StackPtr);
ACPI_STATUS
AcpiAmlResolveObjectToValue (
ACPI_OBJECT_INTERNAL **StackPtr,
ACPI_OPERAND_OBJECT **StackPtr,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiAmlGetFieldUnitValue (
ACPI_OBJECT_INTERNAL *FieldDesc,
ACPI_OBJECT_INTERNAL *ResultDesc);
ACPI_OPERAND_OBJECT *FieldDesc,
ACPI_OPERAND_OBJECT *ResultDesc);
/*
@ -442,11 +440,11 @@ AcpiAmlShowHexValue (
ACPI_STATUS
AcpiAmlDumpOperand (
ACPI_OBJECT_INTERNAL *EntryDesc);
ACPI_OPERAND_OBJECT *EntryDesc);
void
AcpiAmlDumpOperands (
ACPI_OBJECT_INTERNAL **Operands,
ACPI_OPERAND_OBJECT **Operands,
OPERATING_MODE InterpreterMode,
NATIVE_CHAR *Ident,
UINT32 NumLevels,
@ -456,13 +454,13 @@ AcpiAmlDumpOperands (
void
AcpiAmlDumpObjectDescriptor (
ACPI_OBJECT_INTERNAL *Object,
ACPI_OPERAND_OBJECT *Object,
UINT32 Flags);
void
AcpiAmlDumpAcpiNamedObject (
ACPI_NAMED_OBJECT *Entry,
AcpiAmlDumpNode (
ACPI_NAMESPACE_NODE *Node,
UINT32 Flags);
@ -503,20 +501,20 @@ AcpiAmlDoName (
ACPI_STATUS
AcpiAmlExecStore (
ACPI_OBJECT_INTERNAL *ValDesc,
ACPI_OBJECT_INTERNAL *DestDesc,
ACPI_OPERAND_OBJECT *ValDesc,
ACPI_OPERAND_OBJECT *DestDesc,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiAmlStoreObjectToObject (
ACPI_OBJECT_INTERNAL *ValDesc,
ACPI_OBJECT_INTERNAL *DestDesc,
ACPI_OPERAND_OBJECT *ValDesc,
ACPI_OPERAND_OBJECT *DestDesc,
ACPI_WALK_STATE *WalkState);
ACPI_STATUS
AcpiAmlStoreObjectToNte (
ACPI_OBJECT_INTERNAL *ValDesc,
ACPI_NAMED_OBJECT *Entry,
AcpiAmlStoreObjectToNode (
ACPI_OPERAND_OBJECT *ValDesc,
ACPI_NAMESPACE_NODE *Node,
ACPI_WALK_STATE *WalkState);
@ -560,8 +558,8 @@ AcpiAmlEisaIdToString (
ACPI_STATUS
AcpiAmlBuildCopyInternalPackageObject (
ACPI_OBJECT_INTERNAL *SourceObj,
ACPI_OBJECT_INTERNAL *DestObj,
ACPI_OPERAND_OBJECT *SourceObj,
ACPI_OPERAND_OBJECT *DestObj,
ACPI_WALK_STATE *WalkState);

125
source/include/aclocal.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
@ -228,58 +227,45 @@ typedef UINT16 ACPI_OWNER_ID;
typedef enum
{
IMODE_LOAD_PASS1 = 0x01,
IMODE_LOAD_PASS2 = 0x02,
IMODE_EXECUTE = 0x0E
IMODE_LOAD_PASS1 = 0x01,
IMODE_LOAD_PASS2 = 0x02,
IMODE_EXECUTE = 0x0E
} OPERATING_MODE;
/*
* The AcpiNamedObject describes a named object that appears in the AML
* An AcpiNameTable is used to store AcpiNamedObjects.
* The Node describes a named object that appears in the AML
* An AcpiNode is used to store Nodes.
*
* DataType is used to differentiate between internal descriptors, and MUST
* be the first byte in this structure.
*/
typedef struct AcpiNamedObject
typedef struct acpi_node
{
UINT8 DataType;
UINT8 Type; /* Type associated with this name */
UINT8 ThisIndex; /* Entry number */
UINT8 Flags;
UINT32 Name; /* ACPI Name, always 4 chars per ACPI spec */
UINT16 OwnerId;
void *Object; /* Pointer to attached ACPI object (optional) */
struct AcpiNameTable *ChildTable; /* Scope owned by this name (optional) */
ACPI_OWNER_ID OwnerId; /* ID of owner - either an ACPI table or a method */
struct acpi_node *Child; /* first child */
struct acpi_node *Peer; /* Next peer*/
UINT16 ReferenceCount; /* Current count of references and children */
UINT8 Flags;
#ifdef _IA64
UINT32 Fill1; /* 64-bit alignment */
#endif
} ACPI_NAMED_OBJECT;
} ACPI_NAMESPACE_NODE;
typedef struct AcpiNameTable
{
struct AcpiNameTable *NextTable;
struct AcpiNameTable *ParentTable;
ACPI_NAMED_OBJECT *ParentEntry;
ACPI_NAMED_OBJECT Entries[1];
} ACPI_NAME_TABLE;
#define ENTRY_NOT_FOUND NULL
#define ENTRY_NOT_FOUND NULL
/* Node flags */
/* NTE flags */
#define NTE_AML_ATTACHMENT 0x1
#define ANOBJ_AML_ATTACHMENT 0x1
#define ANOBJ_END_OF_PEER_LIST 0x2
/*
@ -315,10 +301,7 @@ typedef struct
typedef struct
{
ACPI_NAME_TABLE *NameTable;
UINT32 Position;
BOOLEAN TableFull;
ACPI_NAMESPACE_NODE *Node;
} NS_SEARCH_DATA;
@ -425,7 +408,6 @@ typedef struct
} ACPI_FIELD_INFO;
/*****************************************************************************
*
* Generic "state" object for stacks
@ -442,7 +424,7 @@ typedef struct
/* Forward declaration */
struct acpi_walk_state;
struct acpi_generic_op;
struct acpi_parse_obj ;
#define ACPI_STATE_COMMON /* Two 32-bit fields and a pointer */\
@ -476,7 +458,7 @@ typedef struct acpi_update_state
typedef struct acpi_control_state
{
ACPI_STATE_COMMON
struct acpi_generic_op *PredicateOp;
struct acpi_parse_obj *PredicateOp;
UINT8 *AmlPredicateStart; /* Start of if/while predicate */
} ACPI_CONTROL_STATE;
@ -489,16 +471,15 @@ typedef struct acpi_control_state
typedef struct acpi_scope_state
{
ACPI_STATE_COMMON
ACPI_NAME_TABLE *NameTable;
ACPI_NAMESPACE_NODE *Node;
} ACPI_SCOPE_STATE;
typedef struct acpi_pscope_state
{
ACPI_STATE_COMMON
struct acpi_generic_op *Op; /* current op being parsed */
struct acpi_parse_obj *Op; /* current op being parsed */
UINT8 *ArgEnd; /* current argument end */
UINT8 *PkgEnd; /* current package end */
UINT32 ArgList; /* next argument to parse */
@ -518,20 +499,17 @@ typedef union acpi_gen_state
} ACPI_GENERIC_STATE;
typedef
ACPI_STATUS (*ACPI_PARSE_DOWNWARDS) (
UINT16 Opcode,
struct acpi_generic_op *Op,
struct acpi_parse_obj *Op,
struct acpi_walk_state *WalkState,
struct acpi_generic_op **OutOp);
struct acpi_parse_obj **OutOp);
typedef
ACPI_STATUS (*ACPI_PARSE_UPWARDS) (
struct acpi_walk_state *WalkState,
struct acpi_generic_op *Op);
struct acpi_parse_obj *Op);
/*****************************************************************************
@ -555,11 +533,10 @@ ACPI_STATUS (*ACPI_PARSE_UPWARDS) (
#define ACPI_GET_OP_TYPE(a) ((a)->Flags & ACPI_OP_TYPE_MASK)
/*
* AML opcode, name, and argument layout
*/
typedef struct acpi_op_info
typedef struct acpi_opcode_info
{
UINT8 Flags; /* Opcode type, HasArgs flag */
UINT32 ParseArgs; /* Grammar/Parse time arguments */
@ -568,58 +545,56 @@ typedef struct acpi_op_info
DEBUG_ONLY_MEMBERS (
NATIVE_CHAR *Name) /* op name (debug only) */
} ACPI_OP_INFO;
} ACPI_OPCODE_INFO;
typedef union acpi_op_value
typedef union acpi_parse_val
{
UINT32 Integer; /* integer constant */
UINT32 Size; /* bytelist or field size */
NATIVE_CHAR *String; /* NULL terminated string */
UINT8 *Buffer; /* buffer or string */
NATIVE_CHAR *Name; /* NULL terminated string */
struct acpi_generic_op *Arg; /* arguments and contained ops */
ACPI_NAMED_OBJECT *Entry; /* entry in interpreter namespace tbl */
struct acpi_parse_obj *Arg; /* arguments and contained ops */
} ACPI_OP_VALUE;
} ACPI_PARSE_VALUE;
#define ACPI_COMMON_OP \
#define ACPI_PARSE_COMMON \
UINT8 DataType; /* To differentiate various internal objs */\
UINT8 Flags; /* Type of Op */\
UINT16 Opcode; /* AML opcode */\
UINT32 AmlOffset; /* offset of declaration in AML */\
struct acpi_generic_op *Parent; /* parent op */\
struct acpi_generic_op *Next; /* next op */\
struct acpi_parse_obj *Parent; /* parent op */\
struct acpi_parse_obj *Next; /* next op */\
DEBUG_ONLY_MEMBERS (\
NATIVE_CHAR OpName[16]) /* op name (debug only) */\
/* NON-DEBUG members below: */\
ACPI_NAMED_OBJECT *AcpiNamedObject;/* for use by interpreter */\
ACPI_OP_VALUE Value; /* Value or args associated with the opcode */\
ACPI_NAMESPACE_NODE *Node;/* for use by interpreter */\
ACPI_PARSE_VALUE Value; /* Value or args associated with the opcode */\
/*
* generic operation (eg. If, While, Store)
*/
typedef struct acpi_generic_op
typedef struct acpi_parse_obj
{
ACPI_COMMON_OP
} ACPI_GENERIC_OP;
ACPI_PARSE_COMMON
} ACPI_PARSE_OBJECT;
/*
* Extended Op for named ops (Scope, Method, etc.), deferred ops (Methods and OpRegions),
* and bytelists.
* and bytelists.
*/
typedef struct acpi_extended_op
typedef struct acpi_parse2_obj
{
ACPI_COMMON_OP
ACPI_PARSE_COMMON
UINT8 *Data; /* AML body or bytelist data */
UINT32 Length; /* AML length */
UINT32 Name; /* 4-byte name or zero if no name */
} ACPI_EXTENDED_OP;
} ACPI_PARSE2_OBJECT;
/*
@ -634,15 +609,14 @@ typedef struct acpi_parse_state
UINT8 *AmlEnd; /* (last + 1) AML byte */
UINT8 *PkgStart; /* current package begin */
UINT8 *PkgEnd; /* current package end */
ACPI_GENERIC_OP *StartOp; /* root of parse tree */
struct AcpiNamedObject *StartEntry;
ACPI_PARSE_OBJECT *StartOp; /* root of parse tree */
struct acpi_node *StartNode;
ACPI_GENERIC_STATE *Scope; /* current scope */
struct acpi_parse_state *Next;
} ACPI_PARSE_STATE;
/*****************************************************************************
*
* Tree walking typedefs and structs
@ -672,11 +646,11 @@ typedef struct acpi_walk_state
UINT8 CurrentResult; /* */
struct acpi_walk_state *Next; /* Next WalkState in list */
ACPI_GENERIC_OP *Origin; /* Start of walk */
ACPI_PARSE_OBJECT *Origin; /* Start of walk */
/* TBD: Obsolete with removal of WALK procedure ? */
ACPI_GENERIC_OP *PrevOp; /* Last op that was processed */
ACPI_GENERIC_OP *NextOp; /* next op to be processed */
ACPI_PARSE_OBJECT *PrevOp; /* Last op that was processed */
ACPI_PARSE_OBJECT *NextOp; /* next op to be processed */
ACPI_GENERIC_STATE *ControlState; /* List of control states (nested IFs) */
@ -688,12 +662,13 @@ typedef struct acpi_walk_state
union AcpiObjInternal *ReturnDesc; /* Return object, if any */
union AcpiObjInternal *MethodDesc; /* Method descriptor if running a method */
ACPI_GENERIC_OP *MethodCallOp; /* MethodCall Op if running a method */
struct AcpiNamedObject *MethodEntry;
struct acpi_node *MethodNode; /* Method Node if running a method */
ACPI_PARSE_OBJECT *MethodCallOp; /* MethodCall Op if running a method */
struct acpi_node *MethodCallNode; /* Called method Node*/
union AcpiObjInternal *Operands[OBJ_NUM_OPERANDS]; /* Operands passed to the interpreter */
union AcpiObjInternal *Results[OBJ_NUM_OPERANDS]; /* Accumulated results */
struct AcpiNamedObject Arguments[MTH_NUM_ARGS]; /* Control method arguments */
struct AcpiNamedObject LocalVariables[MTH_NUM_LOCALS]; /* Control method locals */
struct acpi_node Arguments[MTH_NUM_ARGS]; /* Control method arguments */
struct acpi_node LocalVariables[MTH_NUM_LOCALS]; /* Control method locals */
UINT32 ParseFlags;
UINT8 WalkType;
UINT8 ReturnUsed;

36
source/include/acmacros.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
@ -240,19 +239,19 @@
/*
* An ACPI_HANDLE (which is actually an ACPI_NAMED_OBJECT*) can appear in some contexts,
* such as on apObjStack, where a pointer to an ACPI_OBJECT_INTERNAL can also
* An ACPI_HANDLE (which is actually an ACPI_NAMESPACE_NODE *) can appear in some contexts,
* such as on apObjStack, where a pointer to an ACPI_OPERAND_OBJECT can also
* appear. This macro is used to distinguish them.
*
* The DataType field is the first field in both structures.
*/
#define VALID_DESCRIPTOR_TYPE(d,t) (((ACPI_NAMED_OBJECT*)d)->DataType == t)
#define VALID_DESCRIPTOR_TYPE(d,t) (((ACPI_NAMESPACE_NODE *)d)->DataType == t)
/* Macro to test the object type */
#define IS_THIS_OBJECT_TYPE(d,t) (((ACPI_OBJECT_INTERNAL *)d)->Common.Type == (UINT8)t)
#define IS_THIS_OBJECT_TYPE(d,t) (((ACPI_OPERAND_OBJECT *)d)->Common.Type == (UINT8)t)
/* Macro to check the table flags for SINGLE or MULTIPLE tables are allowed */
@ -351,7 +350,7 @@
#ifdef ACPI_DEBUG
#define MODULE_NAME(name) static char *_THIS_MODULE = name
#define MODULE_NAME(name) static char *_THIS_MODULE = name;
/*
* Function entry tracing.
@ -398,6 +397,7 @@
#define DUMP_ENTRY(a,b) AcpiNsDumpEntry (a,b)
#define DUMP_TABLES(a,b) AcpiNsDumpTables(a,b)
#define DUMP_PATHNAME(a,b,c,d) AcpiNsDumpPathname(a,b,c,d)
#define DUMP_RESOURCE_LIST(a) AcpiRsDumpResourceList(a)
#define BREAK_MSG(a) AcpiOsBreakpoint (a)
/*
@ -467,6 +467,7 @@
#define DUMP_ENTRY(a,b)
#define DUMP_TABLES(a,b)
#define DUMP_PATHNAME(a,b,c,d)
#define DUMP_RESOURCE_LIST(a)
#define DEBUG_PRINT(l,f)
#define DEBUG_PRINT_RAW(l,f)
#define BREAK_MSG(a)
@ -481,6 +482,17 @@
#endif
/*
* Some code only gets executed when the debugger is built in.
* Note that this is entirely independent of whether the
* DEBUG_PRINT stuff (set by ACPI_DEBUG) is on, or not.
*/
#ifdef ENABLE_DEBUGGER
#define DEBUGGER_EXEC(a) a;
#else
#define DEBUGGER_EXEC(a)
#endif
/*
* For 16-bit code, we want to shrink some things even though
@ -494,12 +506,7 @@
#endif
#ifndef ACPI_DEBUG
#define ADD_OBJECT_NAME(a,b)
#else
#ifdef ACPI_DEBUG
/*
* 1) Set name to blanks
@ -509,7 +516,10 @@
#define ADD_OBJECT_NAME(a,b) MEMSET (a->Common.Name, ' ', sizeof (a->Common.Name));\
STRNCPY (a->Common.Name, AcpiGbl_NsTypeNames[b], sizeof (a->Common.Name))
#else
#define ADD_OBJECT_NAME(a,b)
#endif
#endif /* ACMACROS_H */

126
source/include/acnamesp.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
@ -163,33 +162,29 @@ AcpiNsWalkNamespace (
void **ReturnValue);
ACPI_NAMED_OBJECT*
ACPI_NAMESPACE_NODE *
AcpiNsGetNextObject (
OBJECT_TYPE_INTERNAL Type,
ACPI_NAMED_OBJECT *Parent,
ACPI_NAMED_OBJECT *Child);
ACPI_NAMESPACE_NODE *Parent,
ACPI_NAMESPACE_NODE *Child);
ACPI_STATUS
AcpiNsDeleteNamespaceByOwner (
UINT16 TableId);
void
AcpiNsFreeTableEntry (
ACPI_NAMED_OBJECT *Entry);
/* Namespace loading - nsload */
ACPI_STATUS
AcpiNsParseTable (
ACPI_TABLE_DESC *TableDesc,
ACPI_NAME_TABLE *Scope);
ACPI_NAMESPACE_NODE *Scope);
ACPI_STATUS
AcpiNsLoadTable (
ACPI_TABLE_DESC *TableDesc,
ACPI_NAMED_OBJECT *Entry);
ACPI_NAMESPACE_NODE *Node);
ACPI_STATUS
AcpiNsLoadTableByType (
@ -213,28 +208,33 @@ AcpiNsLookup (
OPERATING_MODE InterpreterMode,
UINT32 Flags,
ACPI_WALK_STATE *WalkState,
ACPI_NAMED_OBJECT **RetEntry);
ACPI_NAMESPACE_NODE **RetNode);
/*
* Table allocation/deallocation - nsalloc
* Named object allocation/deallocation - nsalloc
*/
ACPI_NAME_TABLE *
AcpiNsAllocateNameTable (
UINT32 NumEntries);
ACPI_NAMESPACE_NODE *
AcpiNsCreateNode (
UINT32 AcpiName);
void
AcpiNsDeleteNode (
ACPI_NAMESPACE_NODE *Node);
ACPI_STATUS
AcpiNsDeleteNamespaceSubtree (
ACPI_NAMED_OBJECT *ParentHandle);
ACPI_NAMESPACE_NODE *ParentHandle);
void
AcpiNsDetachObject (
ACPI_HANDLE Object);
ACPI_NAMESPACE_NODE *Node);
void
AcpiNsDeleteNameTable (
ACPI_NAME_TABLE *NameTable);
AcpiNsDeleteChildren (
ACPI_NAMESPACE_NODE *Parent);
/*
@ -289,33 +289,33 @@ AcpiNsDumpObjects (
ACPI_STATUS
AcpiNsEvaluateByHandle (
ACPI_NAMED_OBJECT *ObjectNte,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **ReturnObject);
ACPI_NAMESPACE_NODE *PrefixNode,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObject);
ACPI_STATUS
AcpiNsEvaluateByName (
NATIVE_CHAR *Pathname,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **ReturnObject);
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObject);
ACPI_STATUS
AcpiNsEvaluateRelative (
ACPI_NAMED_OBJECT *ObjectNte,
ACPI_NAMESPACE_NODE *PrefixNode,
NATIVE_CHAR *Pathname,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **ReturnObject);
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObject);
ACPI_STATUS
AcpiNsExecuteControlMethod (
ACPI_NAMED_OBJECT *MethodEntry,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **ReturnObjDesc);
ACPI_NAMESPACE_NODE *MethodNode,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObjDesc);
ACPI_STATUS
AcpiNsGetObjectValue (
ACPI_NAMED_OBJECT *ObjectEntry,
ACPI_OBJECT_INTERNAL **ReturnObjDesc);
ACPI_NAMESPACE_NODE *ObjectNode,
ACPI_OPERAND_OBJECT **ReturnObjDesc);
/*
@ -324,11 +324,11 @@ AcpiNsGetObjectValue (
ACPI_NAME
AcpiNsFindParentName (
ACPI_NAMED_OBJECT *EntryToSearch);
ACPI_NAMESPACE_NODE *NodeToSearch);
BOOLEAN
AcpiNsExistDownstreamSibling (
ACPI_NAMED_OBJECT *ThisEntry);
ACPI_NAMESPACE_NODE *ThisNode);
/*
@ -341,7 +341,7 @@ AcpiNsOpensScope (
NATIVE_CHAR *
AcpiNsGetTablePathname (
ACPI_NAME_TABLE *Scope);
ACPI_NAMESPACE_NODE *Node);
NATIVE_CHAR *
AcpiNsNameOfCurrentScope (
@ -355,7 +355,7 @@ AcpiNsHandleToPathname (
BOOLEAN
AcpiNsPatternMatch (
ACPI_NAMED_OBJECT *ObjEntry,
ACPI_NAMESPACE_NODE *ObjNode,
NATIVE_CHAR *SearchFor);
ACPI_STATUS
@ -366,10 +366,10 @@ AcpiNsNameCompare (
void **ReturnValue);
ACPI_STATUS
AcpiNsGetNamedObject (
AcpiNsGetNode (
NATIVE_CHAR *Pathname,
ACPI_NAME_TABLE *InScope,
ACPI_NAMED_OBJECT **OutNte);
ACPI_NAMESPACE_NODE *InPrefixNode,
ACPI_NAMESPACE_NODE **OutNode);
/*
* Object management for NTEs - nsobject
@ -377,8 +377,8 @@ AcpiNsGetNamedObject (
ACPI_STATUS
AcpiNsAttachObject (
ACPI_HANDLE ObjHandle,
ACPI_HANDLE Value,
ACPI_NAMESPACE_NODE *Node,
ACPI_OPERAND_OBJECT *Object,
OBJECT_TYPE_INTERNAL Type);
@ -397,25 +397,29 @@ ACPI_STATUS
AcpiNsSearchAndEnter (
UINT32 EntryName,
ACPI_WALK_STATE *WalkState,
ACPI_NAME_TABLE *NameTable,
ACPI_NAMESPACE_NODE *Node,
OPERATING_MODE InterpreterMode,
OBJECT_TYPE_INTERNAL Type,
UINT32 Flags,
ACPI_NAMED_OBJECT **RetEntry);
void
AcpiNsInitializeTable (
ACPI_NAME_TABLE *NewTable,
ACPI_NAME_TABLE *ParentScope,
ACPI_NAMED_OBJECT *ParentEntry);
ACPI_NAMESPACE_NODE **RetNode);
ACPI_STATUS
AcpiNsSearchNameTable (
AcpiNsSearchNode (
UINT32 EntryName,
ACPI_NAME_TABLE *NameTable,
ACPI_NAMESPACE_NODE *Node,
OBJECT_TYPE_INTERNAL Type,
ACPI_NAMED_OBJECT **RetEntry,
NS_SEARCH_DATA *RetInfo);
ACPI_NAMESPACE_NODE **RetNode);
ACPI_NAMESPACE_NODE *
AcpiNsCreateNode (
UINT32 AcpiName);
void
AcpiNsInstallNode (
ACPI_WALK_STATE *WalkState,
ACPI_NAMESPACE_NODE *ParentNode, /* Parent */
ACPI_NAMESPACE_NODE *Node, /* New Child*/
OBJECT_TYPE_INTERNAL Type);
/*
@ -454,26 +458,26 @@ AcpiNsExternalizeName (
UINT32 *ConvertedNameLength,
NATIVE_CHAR **ConvertedName);
ACPI_NAMED_OBJECT*
ACPI_NAMESPACE_NODE *
AcpiNsConvertHandleToEntry (
ACPI_HANDLE Handle);
ACPI_HANDLE
AcpiNsConvertEntryToHandle(
ACPI_NAMED_OBJECT*Nte);
ACPI_NAMESPACE_NODE *Node);
void
AcpiNsTerminate (
void);
ACPI_NAMED_OBJECT *
AcpiNsGetParentEntry (
ACPI_NAMED_OBJECT *ThisEntry);
ACPI_NAMESPACE_NODE *
AcpiNsGetParentObject (
ACPI_NAMESPACE_NODE *Node);
ACPI_NAMED_OBJECT *
AcpiNsGetNextValidEntry (
ACPI_NAMED_OBJECT *ThisEntry);
ACPI_NAMESPACE_NODE *
AcpiNsGetNextValidObject (
ACPI_NAMESPACE_NODE *Node);
#endif /* __ACNAMESP_H__ */

30
source/include/acobject.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acobject.h - Definition of ACPI_OBJECT_INTERNAL (Internal object only)
* Name: acobject.h - Definition of ACPI_OPERAND_OBJECT (Internal object only)
*
*****************************************************************************/
@ -119,12 +119,12 @@
/*
* The ACPI_OBJECT_INTERNAL is used to pass AML operands from the dispatcher
* The ACPI_OPERAND_OBJECT is used to pass AML operands from the dispatcher
* to the interpreter, and to keep track of the various handlers such as
* address space handlers and notify handlers. The object is a constant
* size in order to allow them to be cached and reused.
*
* All variants of the ACPI_OBJECT_INTERNAL are defined with the same
* All variants of the ACPI_OPERAND_OBJECT are defined with the same
* sequence of field types, with fields that are not used in a particular
* variant being named "Reserved". This is not strictly necessary, but
* may in some circumstances simplify understanding if these structures
@ -328,14 +328,14 @@ typedef struct /* METHOD */
UINT8 Concurrency;
UINT8 ThreadCount;
UINT32 PcodeLength;
UINT32 TableLength;
ACPI_OWNER_ID OwningId;
UINT16 Reserved4;
UINT16 Reserved3_16;
UINT32 Reserved4;
UINT8 *Pcode;
UINT8 *AcpiTable;
void *ParserOp;
void *Semaphore;
void *Reserved_p3;
void *Reserved_p4;
void *Reserved_p5;
} ACPI_OBJECT_METHOD;
@ -382,8 +382,8 @@ typedef struct /* REGION */
union AcpiObjInternal *AddrHandler; /* Handler for system notifies */
union AcpiObjInternal *Link; /* Link in list of regions */
/* list is owned by AddrHandler */
ACPI_NAMED_OBJECT *REGMethod; /* _REG method for this region (if any) */
ACPI_NAMED_OBJECT *Nte; /* containing object */
ACPI_NAMESPACE_NODE *REGMethod; /* _REG method for this region (if any) */
ACPI_NAMESPACE_NODE *Node; /* containing object */
} ACPI_OBJECT_REGION;
@ -508,7 +508,7 @@ typedef struct /* NOTIFY HANDLER */
UINT32 Reserved3;
UINT32 Reserved4;
ACPI_NAMED_OBJECT *Nte; /* Parent device */
ACPI_NAMESPACE_NODE *Node; /* Parent device */
NOTIFY_HANDLER Handler;
void *Context;
void *Reserved_p4;
@ -529,7 +529,7 @@ typedef struct /* ADDRESS HANDLER */
UINT16 Hflags;
ADDRESS_SPACE_HANDLER Handler;
ACPI_NAMED_OBJECT *Nte; /* Parent device */
ACPI_NAMESPACE_NODE *Node; /* Parent device */
void *Context;
ADDRESS_SPACE_SETUP Setup;
union AcpiObjInternal *Link; /* Link to next handler on device */
@ -554,8 +554,8 @@ typedef struct /* Reference - Local object type */
UINT32 Reserved3;
UINT32 Reserved4;
void *Object; /* NameOp=>HANDLE to obj, IndexOp=>ACPI_OBJECT_INTERNAL */
ACPI_NAMED_OBJECT *Nte;
void *Object; /* NameOp=>HANDLE to obj, IndexOp=>ACPI_OPERAND_OBJECT */
ACPI_NAMESPACE_NODE *Node;
union AcpiObjInternal **Where;
void *Reserved_p4;
void *Reserved_p5;
@ -565,7 +565,7 @@ typedef struct /* Reference - Local object type */
/******************************************************************************
*
* ACPI_OBJECT_INTERNAL Descriptor - a giant union of all of the above
* ACPI_OPERAND_OBJECT Descriptor - a giant union of all of the above
*
*****************************************************************************/
@ -592,6 +592,6 @@ typedef union AcpiObjInternal
ACPI_OBJECT_NOTIFY_HANDLER NotifyHandler;
ACPI_OBJECT_ADDR_HANDLER AddrHandler;
} ACPI_OBJECT_INTERNAL;
} ACPI_OPERAND_OBJECT;
#endif /* _ACOBJECT_H */

113
source/include/acparser.h
View File

@ -129,9 +129,14 @@
#define ACPI_MAX_AML ((UINT8 *)(~0UL))
#define PARSE_DELETE_TREE 1
#define PARSE_NO_TREE_DELETE 0
#define ACPI_PARSE_DELETE_TREE 0x0001
#define ACPI_PARSE_NO_TREE_DELETE 0x0000
#define ACPI_PARSE_TREE_MASK 0x0001
#define ACPI_PARSE_LOAD_PASS1 0x0010
#define ACPI_PARSE_LOAD_PASS2 0x0020
#define ACPI_PARSE_EXECUTE 0x0030
#define ACPI_PARSE_MODE_MASK 0x0030
/* psapi - Parser external interfaces */
@ -142,9 +147,9 @@ AcpiPsxLoadTable (
ACPI_STATUS
AcpiPsxExecute (
ACPI_NAMED_OBJECT *MethodEntry,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **ReturnObjDesc);
ACPI_NAMESPACE_NODE *MethodNode,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **ReturnObjDesc);
BOOLEAN
@ -180,20 +185,20 @@ void
AcpiPsGetNextSimpleArg (
ACPI_PARSE_STATE *ParserState,
UINT32 ArgType, /* type of argument */
ACPI_GENERIC_OP *Arg); /* (OUT) argument data */
ACPI_PARSE_OBJECT *Arg); /* (OUT) argument data */
void
AcpiPsGetNextNamepath (
ACPI_PARSE_STATE *ParserState,
ACPI_GENERIC_OP *Arg,
ACPI_PARSE_OBJECT *Arg,
UINT32 *ArgCount,
BOOLEAN MethodCall);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsGetNextField (
ACPI_PARSE_STATE *ParserState);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsGetNextArg (
ACPI_PARSE_STATE *ParserState,
UINT32 ArgType,
@ -202,7 +207,7 @@ AcpiPsGetNextArg (
/* psopcode - AML Opcode information */
ACPI_OP_INFO *
ACPI_OPCODE_INFO *
AcpiPsGetOpcodeInfo (
UINT16 Opcode);
@ -216,13 +221,13 @@ AcpiPsGetOpcodeName (
ACPI_STATUS
AcpiPsFindObject (
UINT16 Opcode,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP **OutOp);
ACPI_PARSE_OBJECT **OutOp);
void
AcpiPsDeleteParseTree (
ACPI_GENERIC_OP *root);
ACPI_PARSE_OBJECT *root);
ACPI_STATUS
AcpiPsParseLoop (
@ -230,13 +235,13 @@ AcpiPsParseLoop (
ACPI_STATUS
AcpiPsParseAml (
ACPI_GENERIC_OP *StartScope,
ACPI_PARSE_OBJECT *StartScope,
UINT8 *Aml,
UINT32 AmlSize,
UINT32 ParseFlags,
ACPI_NAMED_OBJECT *MethodEntry,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **CallerReturnDesc,
ACPI_NAMESPACE_NODE *MethodNode,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **CallerReturnDesc,
ACPI_PARSE_DOWNWARDS DescendingCallback,
ACPI_PARSE_UPWARDS AscendingCallback);
@ -246,7 +251,7 @@ AcpiPsParseTable (
UINT32 amlSize,
ACPI_PARSE_DOWNWARDS DescendingCallback,
ACPI_PARSE_UPWARDS AscendingCallback,
ACPI_GENERIC_OP **RootObject);
ACPI_PARSE_OBJECT **RootObject);
UINT16
AcpiPsPeekOpcode (
@ -259,9 +264,9 @@ AcpiPsPeekOpcode (
ACPI_STATUS
AcpiPsInitScope (
ACPI_PARSE_STATE *ParserState,
ACPI_GENERIC_OP *Root);
ACPI_PARSE_OBJECT *Root);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsGetParentScope (
ACPI_PARSE_STATE *state);
@ -272,13 +277,13 @@ AcpiPsHasCompletedScope (
void
AcpiPsPopScope (
ACPI_PARSE_STATE *ParserState,
ACPI_GENERIC_OP **Op,
ACPI_PARSE_OBJECT **Op,
UINT32 *ArgList);
ACPI_STATUS
AcpiPsPushScope (
ACPI_PARSE_STATE *ParserState,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
UINT32 RemainingArgs,
UINT32 ArgCount);
@ -291,41 +296,41 @@ AcpiPsCleanupScope (
void
AcpiPsAppendArg(
ACPI_GENERIC_OP *op,
ACPI_GENERIC_OP *arg);
ACPI_PARSE_OBJECT *op,
ACPI_PARSE_OBJECT *arg);
ACPI_GENERIC_OP*
ACPI_PARSE_OBJECT*
AcpiPsFind (
ACPI_GENERIC_OP *Scope,
ACPI_PARSE_OBJECT *Scope,
NATIVE_CHAR *Path,
UINT16 Opcode,
UINT32 Create);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsGetArg(
ACPI_GENERIC_OP *op,
ACPI_PARSE_OBJECT *op,
UINT32 argn);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsGetChild (
ACPI_GENERIC_OP *op);
ACPI_PARSE_OBJECT *op);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsGetDepthNext (
ACPI_GENERIC_OP *Origin,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Origin,
ACPI_PARSE_OBJECT *Op);
/* pswalk - parse tree walk routines */
ACPI_STATUS
AcpiPsWalkParsedAml (
ACPI_GENERIC_OP *StartOp,
ACPI_GENERIC_OP *EndOp,
ACPI_OBJECT_INTERNAL *MthDesc,
ACPI_NAME_TABLE *StartScope,
ACPI_OBJECT_INTERNAL **Params,
ACPI_OBJECT_INTERNAL **CallerReturnDesc,
ACPI_PARSE_OBJECT *StartOp,
ACPI_PARSE_OBJECT *EndOp,
ACPI_OPERAND_OBJECT *MthDesc,
ACPI_NAMESPACE_NODE *StartNode,
ACPI_OPERAND_OBJECT **Params,
ACPI_OPERAND_OBJECT **CallerReturnDesc,
ACPI_OWNER_ID OwnerId,
ACPI_PARSE_DOWNWARDS DescendingCallback,
ACPI_PARSE_UPWARDS AscendingCallback);
@ -333,24 +338,30 @@ AcpiPsWalkParsedAml (
ACPI_STATUS
AcpiPsGetNextWalkOp (
ACPI_WALK_STATE *WalkState,
ACPI_GENERIC_OP *Op,
ACPI_PARSE_OBJECT *Op,
ACPI_PARSE_UPWARDS AscendingCallback);
/* psutils - parser utilities */
ACPI_PARSE_STATE *
AcpiPsCreateState (
UINT8 *Aml,
UINT32 AmlSize);
void
AcpiPsInitOp (
ACPI_GENERIC_OP *op,
ACPI_PARSE_OBJECT *op,
UINT16 opcode);
ACPI_GENERIC_OP *
ACPI_PARSE_OBJECT *
AcpiPsAllocOp (
UINT16 opcode);
void
AcpiPsFreeOp (
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiPsDeleteParseCache (
@ -369,7 +380,7 @@ AcpiPsIsNamedOp (
UINT16 opcode);
BOOLEAN
AcpiPsIsNamedObjectOp (
AcpiPsIsNodeOp (
UINT16 opcode);
BOOLEAN
@ -388,17 +399,17 @@ BOOLEAN
AcpiPsIsCreateFieldOp (
UINT16 Opcode);
ACPI_EXTENDED_OP*
ACPI_PARSE2_OBJECT*
AcpiPsToExtendedOp(
ACPI_GENERIC_OP *op);
ACPI_PARSE_OBJECT *op);
UINT32
AcpiPsGetName(
ACPI_GENERIC_OP *op);
ACPI_PARSE_OBJECT *op);
void
AcpiPsSetName(
ACPI_GENERIC_OP *op,
ACPI_PARSE_OBJECT *op,
UINT32 name);
@ -408,17 +419,17 @@ UINT32
AcpiPsSprintPath (
NATIVE_CHAR *BufferStart,
UINT32 BufferSize,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
UINT32
AcpiPsSprintOp (
NATIVE_CHAR *BufferStart,
UINT32 BufferSize,
ACPI_GENERIC_OP *Op);
ACPI_PARSE_OBJECT *Op);
void
AcpiPsShow (
ACPI_GENERIC_OP *op);
ACPI_PARSE_OBJECT *op);
#endif /* __ACPARSER_H__ */