mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-03-15 10:42:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update to new typing of "object" field of ACPI_NAMESPACE_NODE

Browse Source 
date	2001.10.17.19.01.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:00:23 +00:00
parent 25e849bece
commit 0deebb7e96
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/compiler/aslload.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswload - Dispatcher namespace load callbacks
* $Revision: 1.33 $
* $Revision: 1.34 $
*
*****************************************************************************/
@ -245,7 +245,7 @@ LdLoadFieldElements (
}
Child->NsNode = NsNode;
NsNode->Object = Child;
NsNode->Object = (ACPI_OPERAND_OBJECT *) Child;
break;
}
@ -322,7 +322,7 @@ LdLoadResourceElements (
*/
NsNode->OwnerId = InitializerNode->Value.Integer16;
InitializerNode->NsNode = NsNode;
NsNode->Object = InitializerNode;
NsNode->Object = (ACPI_OPERAND_OBJECT *) InitializerNode;
/* Pass thru the field type (Bitfield or Bytefield) */
@ -483,7 +483,7 @@ LdNamespace1Begin (
* the NsNode back to the original Parse node
*/
PsNode->NsNode = NsNode;
NsNode->Object = PsNode;
NsNode->Object = (ACPI_OPERAND_OBJECT *) PsNode;

18
source/compiler/asllookup.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: asllookup- Namespace lookup
* $Revision: 1.39 $
* $Revision: 1.42 $
*
*****************************************************************************/
@ -423,6 +423,7 @@ LkNamespaceLocateBegin (
ASL_PARSE_NODE *OwningPsNode;
UINT32 MinimumLength;
UINT32 Temp;
const ACPI_OPCODE_INFO *OpInfo;
PROC_NAME ("LkNamespaceLocateBegin");
@ -431,7 +432,9 @@ LkNamespaceLocateBegin (
/* We are only interested in opcodes that have an associated name */
if ((!AcpiPsIsNamedOp (PsNode->AmlOpcode)) &&
OpInfo = AcpiPsGetOpcodeInfo (PsNode->AmlOpcode);
if ((!(OpInfo->Flags & AML_NAMED)) &&
(PsNode->ParseOpcode != NAMESTRING) &&
(PsNode->ParseOpcode != NAMESEG) &&
(PsNode->ParseOpcode != METHODCALL))
@ -439,7 +442,7 @@ LkNamespaceLocateBegin (
return (AE_OK);
}
if (AcpiPsIsNamedOp (PsNode->AmlOpcode))
if (OpInfo->Flags & AML_NAMED)
{
Path = PsNode->Child->Value.String;
}
@ -667,7 +670,7 @@ LkNamespaceLocateBegin (
{
/* 1) The result from the method is used (the method is a TermArg) */
OwningPsNode = NsNode->Object;
OwningPsNode = (ASL_PARSE_NODE *) NsNode->Object;
if (OwningPsNode->Flags & NODE_METHOD_NO_RETVAL)
{
/*
@ -762,12 +765,9 @@ LkNamespaceLocateBegin (
}
}
}
}
PsNode->NsNode = NsNode;
return (Status);
}
@ -793,6 +793,7 @@ LkNamespaceLocateEnd (
{
ACPI_WALK_STATE *WalkState = (ACPI_WALK_STATE *) Context;
ACPI_OBJECT_TYPE8 DataType;
const ACPI_OPCODE_INFO *OpInfo;
PROC_NAME ("LkNamespaceLocateEnd");
@ -800,7 +801,8 @@ LkNamespaceLocateEnd (
/* We are only interested in opcodes that have an associated name */
if (!AcpiPsIsNamedOp (PsNode->AmlOpcode))
OpInfo = AcpiPsGetOpcodeInfo (PsNode->AmlOpcode);
if (!(OpInfo->Flags & AML_NAMED))
{
return (AE_OK);
}