mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-30 21:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pass correct scope to parse loop in non-method case.

Browse Source 
date	2000.12.06.22.46.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 18:07:44 +00:00
parent b5df1f2075
commit d9aa4002c9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/components/parser/psparse.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: psparse - Parser top level AML parse routines
* $Revision: 1.69 $
* $Revision: 1.70 $
*
*****************************************************************************/
@ -1227,7 +1227,6 @@ AcpiPsParseAml (
ACPI_WALK_LIST *PrevWalkList = AcpiGbl_CurrentWalkList;
ACPI_OPERAND_OBJECT *ReturnDesc;
ACPI_OPERAND_OBJECT *MthDesc = NULL;
ACPI_NAMESPACE_NODE *StartNode;
FUNCTION_TRACE ("PsParseAml");
@ -1276,21 +1275,17 @@ AcpiPsParseAml (
if (MethodNode)
{
StartNode = MethodNode;
ParserState->StartNode = MethodNode;
WalkState->WalkType = WALK_METHOD;
if (StartNode)
/* Push start scope on scope stack and make it current */
Status = AcpiDsScopeStackPush (MethodNode, ACPI_TYPE_METHOD, WalkState);
if (ACPI_FAILURE (Status))
{
/* Push start scope on scope stack and make it current */
Status = AcpiDsScopeStackPush (StartNode, ACPI_TYPE_METHOD, WalkState);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
}
return_ACPI_STATUS (Status);
}
/* Init arguments if this is a control method */
/* TBD: [Restructure] add walkstate as a param */
@ -1302,6 +1297,8 @@ AcpiPsParseAml (
/* Setup the current scope */
Node = ParserState->StartOp->Node;
ParserState->StartNode = Node;
if (Node)
{
/* Push start scope on scope stack and make it current */