patch-2.4.22 linux-2.4.22/drivers/acpi/namespace/nssearch.c
Next file: linux-2.4.22/drivers/acpi/namespace/nsutils.c
Previous file: linux-2.4.22/drivers/acpi/namespace/nsparse.c
Back to the patch index
Back to the overall index
- Lines: 477
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/namespace/nssearch.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/namespace/nssearch.c linux-2.4.22/drivers/acpi/namespace/nssearch.c
@@ -1,52 +1,69 @@
/*******************************************************************************
*
* Module Name: nssearch - Namespace search
- * $Revision: 75 $
*
******************************************************************************/
/*
- * Copyright (C) 2000, 2001 R. Byron Moore
+ * Copyright (C) 2000 - 2003, R. Byron Moore
+ * All rights reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
+#include <acpi/acpi.h>
+#include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE
- MODULE_NAME ("nssearch")
+ ACPI_MODULE_NAME ("nssearch")
/*******************************************************************************
*
- * FUNCTION: Acpi_ns_search_node
+ * FUNCTION: acpi_ns_search_node
*
- * PARAMETERS: *Target_name - Ascii ACPI name to search for
- * *Node - Starting table where search will begin
+ * PARAMETERS: *target_name - Ascii ACPI name to search for
+ * *Node - Starting node where search will begin
* Type - Object type to match
- * **Return_node - Where the matched Named obj is returned
+ * **return_node - Where the matched Named obj is returned
*
* RETURN: Status
*
- * DESCRIPTION: Search a single namespace table. Performs a simple search,
- * does not add entries or search parents.
+ * DESCRIPTION: Search a single level of the namespace. Performs a
+ * simple search of the specified level, and does not add
+ * entries or search parents.
*
*
* Named object lists are built (and subsequently dumped) in the
@@ -62,75 +79,52 @@
acpi_status
acpi_ns_search_node (
- u32 target_name,
- acpi_namespace_node *node,
- acpi_object_type8 type,
- acpi_namespace_node **return_node)
+ u32 target_name,
+ struct acpi_namespace_node *node,
+ acpi_object_type type,
+ struct acpi_namespace_node **return_node)
{
- acpi_namespace_node *next_node;
+ struct acpi_namespace_node *next_node;
- FUNCTION_TRACE ("Ns_search_node");
+ ACPI_FUNCTION_TRACE ("ns_search_node");
-#ifdef ACPI_DEBUG
+#ifdef ACPI_DEBUG_OUTPUT
if (ACPI_LV_NAMES & acpi_dbg_level) {
- NATIVE_CHAR *scope_name;
+ char *scope_name;
- scope_name = acpi_ns_get_table_pathname (node);
+ scope_name = acpi_ns_get_external_pathname (node);
if (scope_name) {
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching %s [%p] For %4.4s (type %X)\n",
- scope_name, node, (char*)&target_name, type));
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching %s [%p] For %4.4s (%s)\n",
+ scope_name, node, (char *) &target_name, acpi_ut_get_type_name (type)));
ACPI_MEM_FREE (scope_name);
}
}
#endif
-
/*
- * Search for name in this table, which is to say that we must search
- * for the name among the children of this object
+ * Search for name at this namespace level, which is to say that we
+ * must search for the name among the children of this object
*/
next_node = node->child;
while (next_node) {
/* Check for match against the name */
- if (next_node->name == target_name) {
- /*
- * Found matching entry. Capture the type if appropriate, before
- * returning the entry.
- *
- * The Def_field_defn and Bank_field_defn cases are actually looking up
- * the Region in which the field will be defined
- */
- if ((INTERNAL_TYPE_FIELD_DEFN == type) ||
- (INTERNAL_TYPE_BANK_FIELD_DEFN == type)) {
- type = ACPI_TYPE_REGION;
- }
-
+ if (next_node->name.integer == target_name) {
/*
- * Scope, Def_any, and Index_field_defn are bogus "types" which do not
- * actually have anything to do with the type of the name being
- * looked up. For any other value of Type, if the type stored in
- * the entry is Any (i.e. unknown), save the actual type.
+ * Found matching entry.
*/
- if (type != INTERNAL_TYPE_SCOPE &&
- type != INTERNAL_TYPE_DEF_ANY &&
- type != INTERNAL_TYPE_INDEX_FIELD_DEFN &&
- next_node->type == ACPI_TYPE_ANY) {
- next_node->type = (u8) type;
- }
-
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
- "Name %4.4s (actual type %X) found at %p\n",
- (char*)&target_name, next_node->type, next_node));
+ "Name %4.4s Type [%s] found in scope [%4.4s] %p\n",
+ (char *) &target_name, acpi_ut_get_type_name (next_node->type),
+ next_node->name.ascii, next_node));
*return_node = next_node;
return_ACPI_STATUS (AE_OK);
}
-
/*
* The last entry in the list points back to the parent,
* so a flag is used to indicate the end-of-list
@@ -146,11 +140,12 @@
next_node = next_node->peer;
}
+ /* Searched entire namespace level, not found */
- /* Searched entire table, not found */
-
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Name %4.4s (type %X) not found at %p\n",
- (char*)&target_name, type, next_node));
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "Name %4.4s Type [%s] not found in search in scope [%4.4s] %p first child %p\n",
+ (char *) &target_name, acpi_ut_get_type_name (type),
+ node->name.ascii, node, node->child));
return_ACPI_STATUS (AE_NOT_FOUND);
}
@@ -158,18 +153,18 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ns_search_parent_tree
+ * FUNCTION: acpi_ns_search_parent_tree
*
- * PARAMETERS: *Target_name - Ascii ACPI name to search for
- * *Node - Starting table where search will begin
+ * PARAMETERS: *target_name - Ascii ACPI name to search for
+ * *Node - Starting node where search will begin
* Type - Object type to match
- * **Return_node - Where the matched Named Obj is returned
+ * **return_node - Where the matched Named Obj is returned
*
* RETURN: Status
*
* DESCRIPTION: Called when a name has not been found in the current namespace
- * table. Before adding it or giving up, ACPI scope rules require
- * searching enclosing scopes in cases identified by Acpi_ns_local().
+ * level. Before adding it or giving up, ACPI scope rules require
+ * searching enclosing scopes in cases identified by acpi_ns_local().
*
* "A name is located by finding the matching name in the current
* name space, and then in the parent name space. If the parent
@@ -183,55 +178,53 @@
static acpi_status
acpi_ns_search_parent_tree (
- u32 target_name,
- acpi_namespace_node *node,
- acpi_object_type8 type,
- acpi_namespace_node **return_node)
+ u32 target_name,
+ struct acpi_namespace_node *node,
+ acpi_object_type type,
+ struct acpi_namespace_node **return_node)
{
- acpi_status status;
- acpi_namespace_node *parent_node;
+ acpi_status status;
+ struct acpi_namespace_node *parent_node;
- FUNCTION_TRACE ("Ns_search_parent_tree");
+ ACPI_FUNCTION_TRACE ("ns_search_parent_tree");
- parent_node = acpi_ns_get_parent_object (node);
+ parent_node = acpi_ns_get_parent_node (node);
/*
- * If there is no parent (at the root) or type is "local", we won't be
- * searching the parent tree.
+ * If there is no parent (i.e., we are at the root) or
+ * type is "local", we won't be searching the parent tree.
*/
- if ((acpi_ns_local (type)) ||
- (!parent_node)) {
- if (!parent_node) {
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] has no parent\n",
- (char*)&target_name));
- }
-
- if (acpi_ns_local (type)) {
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] type %X is local(no search)\n",
- (char*)&target_name, type));
- }
+ if (!parent_node) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] has no parent\n",
+ (char *) &target_name));
+ return_ACPI_STATUS (AE_NOT_FOUND);
+ }
+ if (acpi_ns_local (type)) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "[%4.4s] type [%s] must be local to this scope (no parent search)\n",
+ (char *) &target_name, acpi_ut_get_type_name (type)));
return_ACPI_STATUS (AE_NOT_FOUND);
}
-
/* Search the parent tree */
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching parent for %4.4s\n", (char*)&target_name));
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching parent for %4.4s\n", (char *) &target_name));
/*
* Search parents until found the target or we have backed up to
* the root
*/
while (parent_node) {
- /* Search parent scope */
- /* TBD: [Investigate] Why ACPI_TYPE_ANY? */
-
+ /*
+ * Search parent scope. Use TYPE_ANY because we don't care about the
+ * object type at this point, we only care about the existence of
+ * the actual name we are searching for. Typechecking comes later.
+ */
status = acpi_ns_search_node (target_name, parent_node,
ACPI_TYPE_ANY, return_node);
-
if (ACPI_SUCCESS (status)) {
return_ACPI_STATUS (status);
}
@@ -240,10 +233,9 @@
* Not found here, go up another level
* (until we reach the root)
*/
- parent_node = acpi_ns_get_parent_object (parent_node);
+ parent_node = acpi_ns_get_parent_node (parent_node);
}
-
/* Not found in parent tree */
return_ACPI_STATUS (AE_NOT_FOUND);
@@ -252,71 +244,67 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ns_search_and_enter
+ * FUNCTION: acpi_ns_search_and_enter
*
- * PARAMETERS: Target_name - Ascii ACPI name to search for (4 chars)
- * Walk_state - Current state of the walk
- * *Node - Starting table where search will begin
- * Interpreter_mode - Add names only in MODE_Load_pass_x.
+ * PARAMETERS: target_name - Ascii ACPI name to search for (4 chars)
+ * walk_state - Current state of the walk
+ * *Node - Starting node where search will begin
+ * interpreter_mode - Add names only in ACPI_MODE_LOAD_PASS_x.
* Otherwise,search only.
* Type - Object type to match
* Flags - Flags describing the search restrictions
- * **Return_node - Where the Node is returned
+ * **return_node - Where the Node is returned
*
* RETURN: Status
*
- * DESCRIPTION: Search for a name segment in a single name table,
+ * DESCRIPTION: Search for a name segment in a single namespace level,
* optionally adding it if it is not found. If the passed
* Type is not Any and the type previously stored in the
* entry was Any (i.e. unknown), update the stored type.
*
- * In IMODE_EXECUTE, search only.
+ * In ACPI_IMODE_EXECUTE, search only.
* In other modes, search and add if not found.
*
******************************************************************************/
acpi_status
acpi_ns_search_and_enter (
- u32 target_name,
- acpi_walk_state *walk_state,
- acpi_namespace_node *node,
- operating_mode interpreter_mode,
- acpi_object_type8 type,
- u32 flags,
- acpi_namespace_node **return_node)
+ u32 target_name,
+ struct acpi_walk_state *walk_state,
+ struct acpi_namespace_node *node,
+ acpi_interpreter_mode interpreter_mode,
+ acpi_object_type type,
+ u32 flags,
+ struct acpi_namespace_node **return_node)
{
- acpi_status status;
- acpi_namespace_node *new_node;
+ acpi_status status;
+ struct acpi_namespace_node *new_node;
- FUNCTION_TRACE ("Ns_search_and_enter");
+ ACPI_FUNCTION_TRACE ("ns_search_and_enter");
/* Parameter validation */
if (!node || !target_name || !return_node) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null param- Table %p Name %X Return %p\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null param: Node %p Name %X return_node %p\n",
node, target_name, return_node));
- REPORT_ERROR (("Ns_search_and_enter: bad (null) parameter\n"));
+ ACPI_REPORT_ERROR (("ns_search_and_enter: Null parameter\n"));
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
-
/* Name must consist of printable characters */
if (!acpi_ut_valid_acpi_name (target_name)) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "*** Bad character in name: %08x *** \n",
+ ACPI_REPORT_ERROR (("ns_search_and_enter: Bad character in ACPI Name: %X\n",
target_name));
-
- REPORT_ERROR (("Ns_search_and_enter: Bad character in ACPI Name\n"));
return_ACPI_STATUS (AE_BAD_CHARACTER);
}
+ /* Try to find the name in the namespace level specified by the caller */
- /* Try to find the name in the table specified by the caller */
-
- *return_node = ENTRY_NOT_FOUND;
+ *return_node = ACPI_ENTRY_NOT_FOUND;
status = acpi_ns_search_node (target_name, node, type, return_node);
if (status != AE_NOT_FOUND) {
/*
@@ -324,8 +312,8 @@
* return the error
*/
if ((status == AE_OK) &&
- (flags & NS_ERROR_IF_FOUND)) {
- status = AE_EXIST;
+ (flags & ACPI_NS_ERROR_IF_FOUND)) {
+ status = AE_ALREADY_EXISTS;
}
/*
@@ -335,9 +323,8 @@
return_ACPI_STATUS (status);
}
-
/*
- * Not found in the table. If we are NOT performing the
+ * The name was not found. If we are NOT performing the
* first pass (name entry) of loading the namespace, search
* the parent tree (all the way to the root if necessary.)
* We don't want to perform the parent search when the
@@ -345,10 +332,10 @@
* the search when namespace references are being resolved
* (load pass 2) and during the execution phase.
*/
- if ((interpreter_mode != IMODE_LOAD_PASS1) &&
- (flags & NS_SEARCH_PARENT)) {
+ if ((interpreter_mode != ACPI_IMODE_LOAD_PASS1) &&
+ (flags & ACPI_NS_SEARCH_PARENT)) {
/*
- * Not found in table - search parent tree according
+ * Not found at this level - search parent tree according
* to ACPI specification
*/
status = acpi_ns_search_parent_tree (target_name, node,
@@ -358,18 +345,16 @@
}
}
-
/*
* In execute mode, just search, never add names. Exit now.
*/
- if (interpreter_mode == IMODE_EXECUTE) {
+ if (interpreter_mode == ACPI_IMODE_EXECUTE) {
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "%4.4s Not found in %p [Not adding]\n",
- (char*)&target_name, node));
+ (char *) &target_name, node));
return_ACPI_STATUS (AE_NOT_FOUND);
}
-
/* Create the new named object */
new_node = acpi_ns_create_node (target_name);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)