patch-2.4.22 linux-2.4.22/drivers/acpi/namespace/nsaccess.c
Next file: linux-2.4.22/drivers/acpi/namespace/nsalloc.c
Previous file: linux-2.4.22/drivers/acpi/namespace/Makefile
Back to the patch index
Back to the overall index
- Lines: 830
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/namespace/nsaccess.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/namespace/nsaccess.c linux-2.4.22/drivers/acpi/namespace/nsaccess.c
@@ -1,43 +1,60 @@
/*******************************************************************************
*
* Module Name: nsaccess - Top-level functions for accessing ACPI namespace
- * $Revision: 135 $
*
******************************************************************************/
/*
- * 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 "acdispat.h"
+#include <acpi/acpi.h>
+#include <acpi/amlcode.h>
+#include <acpi/acnamesp.h>
+#include <acpi/acdispat.h>
#define _COMPONENT ACPI_NAMESPACE
- MODULE_NAME ("nsaccess")
+ ACPI_MODULE_NAME ("nsaccess")
/*******************************************************************************
*
- * FUNCTION: Acpi_ns_root_initialize
+ * FUNCTION: acpi_ns_root_initialize
*
* PARAMETERS: None
*
@@ -52,42 +69,44 @@
acpi_status
acpi_ns_root_initialize (void)
{
- acpi_status status = AE_OK;
- const predefined_names *init_val = NULL;
- acpi_namespace_node *new_node;
- acpi_operand_object *obj_desc;
+ acpi_status status;
+ const struct acpi_predefined_names *init_val = NULL;
+ struct acpi_namespace_node *new_node;
+ union acpi_operand_object *obj_desc;
+ acpi_string val = NULL;
- FUNCTION_TRACE ("Ns_root_initialize");
+ ACPI_FUNCTION_TRACE ("ns_root_initialize");
- acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+ status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+ if (ACPI_FAILURE (status)) {
+ return_ACPI_STATUS (status);
+ }
/*
* The global root ptr is initially NULL, so a non-NULL value indicates
- * that Acpi_ns_root_initialize() has already been called; just return.
+ * that acpi_ns_root_initialize() has already been called; just return.
*/
if (acpi_gbl_root_node) {
status = AE_OK;
goto unlock_and_exit;
}
-
/*
* Tell the rest of the subsystem that the root is initialized
* (This is OK because the namespace is locked)
*/
acpi_gbl_root_node = &acpi_gbl_root_node_struct;
-
/* Enter the pre-defined names in the name table */
- ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Entering predefined entries into namespace\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ "Entering predefined entries into namespace\n"));
for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) {
status = acpi_ns_lookup (NULL, init_val->name, init_val->type,
- IMODE_LOAD_PASS2, NS_NO_UPSEARCH,
- NULL, &new_node);
+ ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, NULL, &new_node);
if (ACPI_FAILURE (status) || (!new_node)) /* Must be on same line for code converter */ {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -97,10 +116,20 @@
/*
* Name entered successfully.
- * If entry in Pre_defined_names[] specifies an
+ * If entry in pre_defined_names[] specifies an
* initial value, create the initial value.
*/
if (init_val->val) {
+ status = acpi_os_predefined_override (init_val, &val);
+ if (ACPI_FAILURE (status)) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not override predefined %s\n",
+ init_val->name));
+ }
+
+ if (!val) {
+ val = init_val->val;
+ }
+
/*
* Entry requests an initial value, allocate a
* descriptor for it.
@@ -116,13 +145,24 @@
* internal representation. Only types actually
* used for initial values are implemented here.
*/
-
switch (init_val->type) {
+ case ACPI_TYPE_METHOD:
+ obj_desc->method.param_count =
+ (u8) ACPI_STRTOUL (val, NULL, 10);
+ obj_desc->common.flags |= AOPOBJ_DATA_VALID;
+
+#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
+
+ /* Compiler cheats by putting parameter count in the owner_iD */
+
+ new_node->owner_id = obj_desc->method.param_count;
+#endif
+ break;
case ACPI_TYPE_INTEGER:
obj_desc->integer.value =
- (acpi_integer) STRTOUL (init_val->val, NULL, 10);
+ (acpi_integer) ACPI_STRTOUL (val, NULL, 10);
break;
@@ -131,25 +171,25 @@
/*
* Build an object around the static string
*/
- obj_desc->string.length = STRLEN (init_val->val);
- obj_desc->string.pointer = init_val->val;
+ obj_desc->string.length = (u32) ACPI_STRLEN (val);
+ obj_desc->string.pointer = val;
obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
break;
case ACPI_TYPE_MUTEX:
+ obj_desc->mutex.node = new_node;
obj_desc->mutex.sync_level =
- (u16) STRTOUL (init_val->val, NULL, 10);
+ (u16) ACPI_STRTOUL (val, NULL, 10);
- if (STRCMP (init_val->name, "_GL_") == 0) {
+ if (ACPI_STRCMP (init_val->name, "_GL_") == 0) {
/*
* Create a counting semaphore for the
* global lock
*/
status = acpi_os_create_semaphore (ACPI_NO_UNIT_LIMIT,
1, &obj_desc->mutex.semaphore);
-
if (ACPI_FAILURE (status)) {
goto unlock_and_exit;
}
@@ -160,13 +200,11 @@
*/
acpi_gbl_global_lock_semaphore = obj_desc->mutex.semaphore;
}
-
else {
/* Create a mutex */
status = acpi_os_create_semaphore (1, 1,
&obj_desc->mutex.semaphore);
-
if (ACPI_FAILURE (status)) {
goto unlock_and_exit;
}
@@ -175,7 +213,7 @@
default:
- REPORT_ERROR (("Unsupported initial type value %X\n",
+ ACPI_REPORT_ERROR (("Unsupported initial type value %X\n",
init_val->type));
acpi_ut_remove_reference (obj_desc);
obj_desc = NULL;
@@ -184,7 +222,7 @@
/* Store pointer to value descriptor in the Node */
- acpi_ns_attach_object (new_node, obj_desc, obj_desc->common.type);
+ status = acpi_ns_attach_object (new_node, obj_desc, ACPI_GET_OBJECT_TYPE (obj_desc));
/* Remove local reference to the object */
@@ -194,23 +232,23 @@
unlock_and_exit:
- acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ns_lookup
+ * FUNCTION: acpi_ns_lookup
*
- * PARAMETERS: Prefix_node - Search scope if name is not fully qualified
+ * PARAMETERS: prefix_node - Search scope if name is not fully qualified
* Pathname - Search pathname, in internal format
* (as represented in the AML stream)
* Type - Type associated with name
- * Interpreter_mode - IMODE_LOAD_PASS2 => add name if not found
+ * interpreter_mode - IMODE_LOAD_PASS2 => add name if not found
* Flags - Flags describing the search restrictions
- * Walk_state - Current state of the walk
- * Return_node - Where the Node is placed (if found
+ * walk_state - Current state of the walk
+ * return_node - Where the Node is placed (if found
* or created successfully)
*
* RETURN: Status
@@ -224,44 +262,41 @@
acpi_status
acpi_ns_lookup (
- acpi_generic_state *scope_info,
- NATIVE_CHAR *pathname,
- acpi_object_type8 type,
- operating_mode interpreter_mode,
- u32 flags,
- acpi_walk_state *walk_state,
- acpi_namespace_node **return_node)
+ union acpi_generic_state *scope_info,
+ char *pathname,
+ acpi_object_type type,
+ acpi_interpreter_mode interpreter_mode,
+ u32 flags,
+ struct acpi_walk_state *walk_state,
+ struct acpi_namespace_node **return_node)
{
- acpi_status status;
- acpi_namespace_node *prefix_node;
- acpi_namespace_node *current_node = NULL;
- acpi_namespace_node *scope_to_push = NULL;
- acpi_namespace_node *this_node = NULL;
- u32 num_segments;
- acpi_name simple_name;
- u8 null_name_path = FALSE;
- acpi_object_type8 type_to_check_for;
- acpi_object_type8 this_search_type;
- u32 local_flags = flags & ~NS_ERROR_IF_FOUND;
-
- DEBUG_EXEC (u32 i;)
+ acpi_status status;
+ char *path = pathname;
+ struct acpi_namespace_node *prefix_node;
+ struct acpi_namespace_node *current_node = NULL;
+ struct acpi_namespace_node *this_node = NULL;
+ u32 num_segments;
+ u32 num_carats;
+ acpi_name simple_name;
+ acpi_object_type type_to_check_for;
+ acpi_object_type this_search_type;
+ u32 search_parent_flag = ACPI_NS_SEARCH_PARENT;
+ u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
+ ACPI_NS_SEARCH_PARENT);
- FUNCTION_TRACE ("Ns_lookup");
+ ACPI_FUNCTION_TRACE ("ns_lookup");
if (!return_node) {
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
-
acpi_gbl_ns_lookup_count++;
-
- *return_node = ENTRY_NOT_FOUND;
-
+ *return_node = ACPI_ENTRY_NOT_FOUND;
if (!acpi_gbl_root_node) {
- return (AE_NO_NAMESPACE);
+ return_ACPI_STATUS (AE_NO_NAMESPACE);
}
/*
@@ -270,248 +305,273 @@
*/
if ((!scope_info) ||
(!scope_info->scope.node)) {
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Null scope prefix, using root node (%p)\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "Null scope prefix, using root node (%p)\n",
acpi_gbl_root_node));
prefix_node = acpi_gbl_root_node;
}
else {
prefix_node = scope_info->scope.node;
- }
-
-
- /*
- * This check is explicitly split to relax the Type_to_check_for
- * conditions for Bank_field_defn. Originally, both Bank_field_defn and
- * Def_field_defn caused Type_to_check_for to be set to ACPI_TYPE_REGION,
- * but the Bank_field_defn may also check for a Field definition as well
- * as an Operation_region.
- */
- if (INTERNAL_TYPE_FIELD_DEFN == type) {
- /* Def_field_defn defines fields in a Region */
-
- type_to_check_for = ACPI_TYPE_REGION;
- }
-
- else if (INTERNAL_TYPE_BANK_FIELD_DEFN == type) {
- /* Bank_field_defn defines data fields in a Field Object */
-
- type_to_check_for = ACPI_TYPE_ANY;
- }
+ if (ACPI_GET_DESCRIPTOR_TYPE (prefix_node) != ACPI_DESC_TYPE_NAMED) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "[%p] Not a namespace node\n",
+ prefix_node));
+ return_ACPI_STATUS (AE_AML_INTERNAL);
+ }
- else {
- type_to_check_for = type;
+ /*
+ * This node might not be a actual "scope" node (such as a
+ * Device/Method, etc.) It could be a Package or other object node.
+ * Backup up the tree to find the containing scope node.
+ */
+ while (!acpi_ns_opens_scope (prefix_node->type) &&
+ prefix_node->type != ACPI_TYPE_ANY) {
+ prefix_node = acpi_ns_get_parent_node (prefix_node);
+ }
}
+ /* Save type TBD: may be no longer necessary */
- /* TBD: [Restructure] - Move the pathname stuff into a new procedure */
-
- /* Examine the name pointer */
+ type_to_check_for = type;
+ /*
+ * Begin examination of the actual pathname
+ */
if (!pathname) {
- /* 8-12-98 ASL Grammar Update supports null Name_path */
+ /* A Null name_path is allowed and refers to the root */
- null_name_path = TRUE;
num_segments = 0;
- this_node = acpi_gbl_root_node;
+ this_node = acpi_gbl_root_node;
+ path = "";
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
- "Null Pathname (Zero segments), Flags=%x\n", flags));
+ "Null Pathname (Zero segments), Flags=%X\n", flags));
}
-
else {
/*
- * Valid name pointer (Internal name format)
+ * Name pointer is valid (and must be in internal name format)
*
- * Check for prefixes. As represented in the AML stream, a
- * Pathname consists of an optional scope prefix followed by
- * a segment part.
+ * Check for scope prefixes:
*
- * If present, the scope prefix is either a Root_prefix (in
- * which case the name is fully qualified), or zero or more
- * Parent_prefixes (in which case the name's scope is relative
- * to the current scope).
+ * As represented in the AML stream, a namepath consists of an
+ * optional scope prefix followed by a name segment part.
*
- * The segment part consists of either:
- * - A single 4-byte name segment, or
- * - A Dual_name_prefix followed by two 4-byte name segments, or
- * - A Multi_name_prefix_op, followed by a byte indicating the
- * number of segments and the segments themselves.
+ * If present, the scope prefix is either a Root Prefix (in
+ * which case the name is fully qualified), or one or more
+ * Parent Prefixes (in which case the name's scope is relative
+ * to the current scope).
*/
- if (*pathname == AML_ROOT_PREFIX) {
- /* Pathname is fully qualified, look in root name table */
-
- current_node = acpi_gbl_root_node;
+ if (*path == (u8) AML_ROOT_PREFIX) {
+ /* Pathname is fully qualified, start from the root */
- /* point to segment part */
+ this_node = acpi_gbl_root_node;
+ search_parent_flag = ACPI_NS_NO_UPSEARCH;
- pathname++;
+ /* Point to name segment part */
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching from root [%p]\n",
- current_node));
+ path++;
- /* Direct reference to root, "\" */
-
- if (!(*pathname)) {
- this_node = acpi_gbl_root_node;
- goto check_for_new_scope_and_exit;
- }
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "Path is absolute from root [%p]\n", this_node));
}
-
else {
/* Pathname is relative to current scope, start there */
- current_node = prefix_node;
-
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching relative to pfx scope [%p]\n",
- prefix_node));
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "Searching relative to prefix scope [%4.4s] (%p)\n",
+ prefix_node->name.ascii, prefix_node));
/*
- * Handle up-prefix (carat). More than one prefix
- * is supported
+ * Handle multiple Parent Prefixes (carat) by just getting
+ * the parent node for each prefix instance.
*/
- while (*pathname == AML_PARENT_PREFIX) {
- /* Point to segment part or next Parent_prefix */
+ this_node = prefix_node;
+ num_carats = 0;
+ while (*path == (u8) AML_PARENT_PREFIX) {
+ /* Name is fully qualified, no search rules apply */
- pathname++;
+ search_parent_flag = ACPI_NS_NO_UPSEARCH;
+ /*
+ * Point past this prefix to the name segment
+ * part or the next Parent Prefix
+ */
+ path++;
- /* Backup to the parent's scope */
+ /* Backup to the parent node */
- this_node = acpi_ns_get_parent_object (current_node);
+ num_carats++;
+ this_node = acpi_ns_get_parent_node (this_node);
if (!this_node) {
/* Current scope has no parent scope */
- REPORT_ERROR (
- ("Too many parent prefixes (^) - reached root\n"));
+ ACPI_REPORT_ERROR (
+ ("ACPI path has too many parent prefixes (^) - reached beyond root node\n"));
return_ACPI_STATUS (AE_NOT_FOUND);
}
+ }
- current_node = this_node;
+ if (search_parent_flag == ACPI_NS_NO_UPSEARCH) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "Search scope is [%4.4s], path has %d carat(s)\n",
+ this_node->name.ascii, num_carats));
}
}
-
/*
- * Examine the name prefix opcode, if any,
- * to determine the number of segments
+ * Determine the number of ACPI name segments in this pathname.
+ *
+ * The segment part consists of either:
+ * - A Null name segment (0)
+ * - A dual_name_prefix followed by two 4-byte name segments
+ * - A multi_name_prefix followed by a byte indicating the
+ * number of segments and the segments themselves.
+ * - A single 4-byte name segment
+ *
+ * Examine the name prefix opcode, if any, to determine the number of
+ * segments.
*/
- if (*pathname == AML_DUAL_NAME_PREFIX) {
- num_segments = 2;
+ switch (*path) {
+ case 0:
+ /*
+ * Null name after a root or parent prefixes. We already
+ * have the correct target node and there are no name segments.
+ */
+ num_segments = 0;
+ type = this_node->type;
+
+ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ "Prefix-only Pathname (Zero name segments), Flags=%X\n", flags));
+ break;
+
+ case AML_DUAL_NAME_PREFIX:
+
+ /* More than one name_seg, search rules do not apply */
- /* point to first segment */
+ search_parent_flag = ACPI_NS_NO_UPSEARCH;
- pathname++;
+ /* Two segments, point to first name segment */
+
+ num_segments = 2;
+ path++;
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
"Dual Pathname (2 segments, Flags=%X)\n", flags));
- }
+ break;
+
+ case AML_MULTI_NAME_PREFIX_OP:
- else if (*pathname == AML_MULTI_NAME_PREFIX_OP) {
- num_segments = (u32)* (u8 *) ++pathname;
+ /* More than one name_seg, search rules do not apply */
- /* point to first segment */
+ search_parent_flag = ACPI_NS_NO_UPSEARCH;
- pathname++;
+ /* Extract segment count, point to first name segment */
+
+ path++;
+ num_segments = (u32) (u8) *path;
+ path++;
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
"Multi Pathname (%d Segments, Flags=%X) \n",
num_segments, flags));
- }
+ break;
- else {
+ default:
/*
- * No Dual or Multi prefix, hence there is only one
- * segment and Pathname is already pointing to it.
+ * Not a Null name, no Dual or Multi prefix, hence there is
+ * only one name segment and Pathname is already pointing to it.
*/
num_segments = 1;
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
"Simple Pathname (1 segment, Flags=%X)\n", flags));
+ break;
}
-#ifdef ACPI_DEBUG
-
- /* TBD: [Restructure] Make this a procedure */
-
- /* Debug only: print the entire name that we are about to lookup */
-
- ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "["));
-
- for (i = 0; i < num_segments; i++) {
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_NAMES, "%4.4s/", (char*)&pathname[i * 4]));
- }
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_NAMES, "]\n"));
-#endif
+ ACPI_DEBUG_EXEC (acpi_ns_print_pathname (num_segments, path));
}
/*
- * Search namespace for each segment of the name.
- * Loop through and verify/add each name segment.
+ * Search namespace for each segment of the name. Loop through and
+ * verify (or add to the namespace) each name segment.
+ *
+ * The object type is significant only at the last name
+ * segment. (We don't care about the types along the path, only
+ * the type of the final target object.)
*/
- while (num_segments-- && current_node) {
- /*
- * Search for the current name segment under the current
- * named object. The Type is significant only at the last (topmost)
- * level. (We don't care about the types along the path, only
- * the type of the final target object.)
- */
- this_search_type = ACPI_TYPE_ANY;
+ this_search_type = ACPI_TYPE_ANY;
+ current_node = this_node;
+ while (num_segments && current_node) {
+ num_segments--;
if (!num_segments) {
+ /*
+ * This is the last segment, enable typechecking
+ */
this_search_type = type;
- local_flags = flags;
- }
- /* Pluck one ACPI name from the front of the pathname */
+ /*
+ * Only allow automatic parent search (search rules) if the caller
+ * requested it AND we have a single, non-fully-qualified name_seg
+ */
+ if ((search_parent_flag != ACPI_NS_NO_UPSEARCH) &&
+ (flags & ACPI_NS_SEARCH_PARENT)) {
+ local_flags |= ACPI_NS_SEARCH_PARENT;
+ }
+
+ /* Set error flag according to caller */
- MOVE_UNALIGNED32_TO_32 (&simple_name, pathname);
+ if (flags & ACPI_NS_ERROR_IF_FOUND) {
+ local_flags |= ACPI_NS_ERROR_IF_FOUND;
+ }
+ }
- /* Try to find the ACPI name */
+ /* Extract one ACPI name from the front of the pathname */
- status = acpi_ns_search_and_enter (simple_name, walk_state,
- current_node, interpreter_mode,
- this_search_type, local_flags,
- &this_node);
+ ACPI_MOVE_32_TO_32 (&simple_name, path);
+ /* Try to find the single (4 character) ACPI name */
+
+ status = acpi_ns_search_and_enter (simple_name, walk_state, current_node,
+ interpreter_mode, this_search_type, local_flags, &this_node);
if (ACPI_FAILURE (status)) {
if (status == AE_NOT_FOUND) {
- /* Name not found in ACPI namespace */
+ /* Name not found in ACPI namespace */
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
- "Name [%4.4s] not found in scope %p\n",
- (char*)&simple_name, current_node));
+ "Name [%4.4s] not found in scope [%4.4s] %p\n",
+ (char *) &simple_name, (char *) ¤t_node->name,
+ current_node));
}
+ *return_node = this_node;
return_ACPI_STATUS (status);
}
-
/*
- * If 1) This is the last segment (Num_segments == 0)
- * 2) and looking for a specific type
+ * Sanity typecheck of the target object:
+ *
+ * If 1) This is the last segment (num_segments == 0)
+ * 2) And we are looking for a specific type
* (Not checking for TYPE_ANY)
* 3) Which is not an alias
- * 4) which is not a local type (TYPE_DEF_ANY)
- * 5) which is not a local type (TYPE_SCOPE)
- * 6) which is not a local type (TYPE_INDEX_FIELD_DEFN)
- * 7) and type of object is known (not TYPE_ANY)
- * 8) and object does not match request
+ * 4) Which is not a local type (TYPE_SCOPE)
+ * 5) And the type of target object is known (not TYPE_ANY)
+ * 6) And target object does not match what we are looking for
*
* Then we have a type mismatch. Just warn and ignore it.
*/
if ((num_segments == 0) &&
(type_to_check_for != ACPI_TYPE_ANY) &&
- (type_to_check_for != INTERNAL_TYPE_ALIAS) &&
- (type_to_check_for != INTERNAL_TYPE_DEF_ANY) &&
- (type_to_check_for != INTERNAL_TYPE_SCOPE) &&
- (type_to_check_for != INTERNAL_TYPE_INDEX_FIELD_DEFN) &&
+ (type_to_check_for != ACPI_TYPE_LOCAL_ALIAS) &&
+ (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) &&
(this_node->type != ACPI_TYPE_ANY) &&
(this_node->type != type_to_check_for)) {
/* Complain about a type mismatch */
- REPORT_WARNING (
- ("Ns_lookup: %4.4s, type %X, checking for type %X\n",
- (char*)&simple_name, this_node->type, type_to_check_for));
+ ACPI_REPORT_WARNING (
+ ("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n",
+ (char *) &simple_name, acpi_ut_get_type_name (this_node->type),
+ acpi_ut_get_type_name (type_to_check_for)));
}
/*
@@ -519,57 +579,29 @@
* specific type, but the type of found object is known, use that type
* to see if it opens a scope.
*/
- if ((0 == num_segments) && (ACPI_TYPE_ANY == type)) {
+ if ((num_segments == 0) && (type == ACPI_TYPE_ANY)) {
type = this_node->type;
}
- if ((num_segments || acpi_ns_opens_scope (type)) &&
- (this_node->child == NULL)) {
- /*
- * More segments or the type implies enclosed scope,
- * and the next scope has not been allocated.
- */
- ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Load mode=%X This_node=%p\n",
- interpreter_mode, this_node));
- }
+ /* Point to next name segment and make this node current */
+ path += ACPI_NAME_SIZE;
current_node = this_node;
-
- /* point to next name segment */
-
- pathname += ACPI_NAME_SIZE;
}
-
/*
* Always check if we need to open a new scope
*/
-check_for_new_scope_and_exit:
-
- if (!(flags & NS_DONT_OPEN_SCOPE) && (walk_state)) {
+ if (!(flags & ACPI_NS_DONT_OPEN_SCOPE) && (walk_state)) {
/*
- * If entry is a type which opens a scope,
- * push the new scope on the scope stack.
+ * If entry is a type which opens a scope, push the new scope on the
+ * scope stack.
*/
- if (acpi_ns_opens_scope (type_to_check_for)) {
- /* 8-12-98 ASL Grammar Update supports null Name_path */
-
- if (null_name_path) {
- /* TBD: [Investigate] - is this the correct thing to do? */
-
- scope_to_push = NULL;
- }
- else {
- scope_to_push = this_node;
- }
-
- status = acpi_ds_scope_stack_push (scope_to_push, type,
- walk_state);
+ if (acpi_ns_opens_scope (type)) {
+ status = acpi_ds_scope_stack_push (this_node, type, walk_state);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
-
- ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Set global scope to %p\n", scope_to_push));
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)