mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2024-12-29 05:39:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify and optimize NsGetNextNode function.

Browse Source 
Reduced parameter count and reduced code for this frequently used
function.
This commit is contained in:
Robert Moore 2009-05-11 13:13:54 -07:00
parent 7224854f08
commit 200372599b
4 changed files with 63 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/components/namespace/nsalloc.c
View File

@ -450,7 +450,7 @@ AcpiNsDeleteNamespaceSubtree (
{
/* Get the next node in this scope (NULL if none) */
ChildNode = AcpiNsGetNextNode (ACPI_TYPE_ANY, ParentNode, ChildNode);
ChildNode = AcpiNsGetNextNode (ParentNode, ChildNode);
if (ChildNode)
{
/* Found a child node - detach any attached object */
@ -459,7 +459,7 @@ AcpiNsDeleteNamespaceSubtree (
/* Check if this node has any children */
if (AcpiNsGetNextNode (ACPI_TYPE_ANY, ChildNode, NULL))
if (ChildNode->Child)
{
/*
* There is at least one child of this node,
@ -556,7 +556,7 @@ AcpiNsDeleteNamespaceByOwner (
* Get the next child of this parent node. When ChildNode is NULL,
* the first child of the parent is returned
*/
ChildNode = AcpiNsGetNextNode (ACPI_TYPE_ANY, ParentNode, ChildNode);
ChildNode = AcpiNsGetNextNode (ParentNode, ChildNode);
if (DeletionNode)
{
@ -576,7 +576,7 @@ AcpiNsDeleteNamespaceByOwner (
/* Check if this node has any children */
if (AcpiNsGetNextNode (ACPI_TYPE_ANY, ChildNode, NULL))
if (ChildNode->Child)
{
/*
* There is at least one child of this node,

69
source/components/namespace/nswalk.c
View File

@ -129,6 +129,55 @@
*
* FUNCTION: AcpiNsGetNextNode
*
* PARAMETERS: ParentNode - Parent node whose children we are
* getting
* ChildNode - Previous child that was found.
* The NEXT child will be returned
*
* RETURN: ACPI_NAMESPACE_NODE - Pointer to the NEXT child or NULL if
* none is found.
*
* DESCRIPTION: Return the next peer node within the namespace. If Handle
* is valid, Scope is ignored. Otherwise, the first node
* within Scope is returned.
*
******************************************************************************/
ACPI_NAMESPACE_NODE *
AcpiNsGetNextNode (
ACPI_NAMESPACE_NODE *ParentNode,
ACPI_NAMESPACE_NODE *ChildNode)
{
ACPI_FUNCTION_ENTRY ();
if (!ChildNode)
{
/* It's really the parent's _scope_ that we want */
return (ParentNode->Child);
}
/*
* Get the next node.
*
* If we are at the end of this peer list, return NULL
*/
if (ChildNode->Flags & ANOBJ_END_OF_PEER_LIST)
{
return NULL;
}
/* Otherwise just return the next peer */
return (ChildNode->Peer);
}
/*******************************************************************************
*
* FUNCTION: AcpiNsGetNextNodeTyped
*
* PARAMETERS: Type - Type of node to be searched for
* ParentNode - Parent node whose children we are
* getting
@ -145,7 +194,7 @@
******************************************************************************/
ACPI_NAMESPACE_NODE *
AcpiNsGetNextNode (
AcpiNsGetNextNodeTyped (
ACPI_OBJECT_TYPE Type,
ACPI_NAMESPACE_NODE *ParentNode,
ACPI_NAMESPACE_NODE *ChildNode)
@ -156,19 +205,7 @@ AcpiNsGetNextNode (
ACPI_FUNCTION_ENTRY ();
if (!ChildNode)
{
/* It's really the parent's _scope_ that we want */
NextNode = ParentNode->Child;
}
else
{
/* Start search at the NEXT node */
NextNode = AcpiNsGetNextValidNode (ChildNode);
}
NextNode = AcpiNsGetNextNode (ParentNode, ChildNode);
/* If any type is OK, we are done */
@ -276,7 +313,7 @@ AcpiNsWalkNamespace (
/* Get the next node in this scope. Null if not found */
Status = AE_OK;
ChildNode = AcpiNsGetNextNode (ACPI_TYPE_ANY, ParentNode, ChildNode);
ChildNode = AcpiNsGetNextNode (ParentNode, ChildNode);
if (ChildNode)
{
/* Found next child, get the type if we are not searching for ANY */
@ -358,7 +395,7 @@ AcpiNsWalkNamespace (
*/
if ((Level < MaxDepth) && (Status != AE_CTRL_DEPTH))
{
if (AcpiNsGetNextNode (ACPI_TYPE_ANY, ChildNode, NULL))
if (ChildNode->Child)
{
/* There is at least one child of this node, visit it */

2
source/components/namespace/nsxfobj.c
View File

@ -333,7 +333,7 @@ AcpiGetNextObject (
/* Internal function does the real work */
Node = AcpiNsGetNextNode (Type, ParentNode, ChildNode);
Node = AcpiNsGetNextNodeTyped (Type, ParentNode, ChildNode);
if (!Node)
{
Status = AE_NOT_FOUND;

6
source/include/acnamesp.h
View File

@ -187,10 +187,14 @@ AcpiNsWalkNamespace (
ACPI_NAMESPACE_NODE *
AcpiNsGetNextNode (
ACPI_OBJECT_TYPE Type,
ACPI_NAMESPACE_NODE *Parent,
ACPI_NAMESPACE_NODE *Child);
ACPI_NAMESPACE_NODE *
AcpiNsGetNextNodeTyped (
ACPI_OBJECT_TYPE Type,
ACPI_NAMESPACE_NODE *Parent,
ACPI_NAMESPACE_NODE *Child);
/*
* nsparse - table parsing