patch-2.4.22 linux-2.4.22/drivers/acpi/dispatcher/dsfield.c
Next file: linux-2.4.22/drivers/acpi/dispatcher/dsinit.c
Previous file: linux-2.4.22/drivers/acpi/dispatcher/Makefile
Back to the patch index
Back to the overall index
- Lines: 717
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/dispatcher/dsfield.c
- Orig date:
2002-11-28 15:53:12.000000000 -0800
diff -urN linux-2.4.21/drivers/acpi/dispatcher/dsfield.c linux-2.4.22/drivers/acpi/dispatcher/dsfield.c
@@ -1,78 +1,98 @@
/******************************************************************************
*
* Module Name: dsfield - Dispatcher field routines
- * $Revision: 46 $
*
*****************************************************************************/
/*
- * 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 "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acparser.h"
+#include <acpi/acpi.h>
+#include <acpi/amlcode.h>
+#include <acpi/acdispat.h>
+#include <acpi/acinterp.h>
+#include <acpi/acnamesp.h>
+#include <acpi/acparser.h>
#define _COMPONENT ACPI_DISPATCHER
- MODULE_NAME ("dsfield")
+ ACPI_MODULE_NAME ("dsfield")
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_create_buffer_field
+ * FUNCTION: acpi_ds_create_buffer_field
*
* PARAMETERS: Opcode - The opcode to be executed
* Operands - List of operands for the opcode
- * Walk_state - Current state
+ * walk_state - Current state
*
* RETURN: Status
*
- * DESCRIPTION: Execute the Create_field operators:
- * Create_bit_field_op,
- * Create_byte_field_op,
- * Create_word_field_op,
- * Create_dWord_field_op,
- * Create_qWord_field_op,
- * Create_field_op (all of which define fields in buffers)
+ * DESCRIPTION: Execute the create_field operators:
+ * create_bit_field_op,
+ * create_byte_field_op,
+ * create_word_field_op,
+ * create_dword_field_op,
+ * create_qword_field_op,
+ * create_field_op (all of which define fields in buffers)
*
******************************************************************************/
acpi_status
acpi_ds_create_buffer_field (
- acpi_parse_object *op,
- acpi_walk_state *walk_state)
+ union acpi_parse_object *op,
+ struct acpi_walk_state *walk_state)
{
- acpi_parse_object *arg;
- acpi_namespace_node *node;
- acpi_status status;
- acpi_operand_object *obj_desc;
+ union acpi_parse_object *arg;
+ struct acpi_namespace_node *node;
+ acpi_status status;
+ union acpi_operand_object *obj_desc;
+ union acpi_operand_object *second_desc = NULL;
+ u32 flags;
- FUNCTION_TRACE ("Ds_create_buffer_field");
+ ACPI_FUNCTION_TRACE ("ds_create_buffer_field");
- /* Get the Name_string argument */
+ /* Get the name_string argument */
- if (op->opcode == AML_CREATE_FIELD_OP) {
+ if (op->common.aml_opcode == AML_CREATE_FIELD_OP) {
arg = acpi_ps_get_arg (op, 3);
}
else {
@@ -86,13 +106,25 @@
}
/*
- * Enter the Name_string into the namespace
+ * During the load phase, we want to enter the name of the field into
+ * the namespace. During the execute phase (when we evaluate the size
+ * operand), we want to lookup the name
*/
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.string,
- INTERNAL_TYPE_DEF_ANY, IMODE_LOAD_PASS1,
- NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
- walk_state, &(node));
+ if (walk_state->parse_flags & ACPI_PARSE_EXECUTE) {
+ flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE;
+ }
+ else {
+ flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND;
+ }
+
+ /*
+ * Enter the name_string into the namespace
+ */
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
+ ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1,
+ flags, walk_state, &(node));
if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (arg->common.value.string, status);
return_ACPI_STATUS (status);
}
@@ -100,14 +132,15 @@
* for now, we will put it in the "op" object that the parser uses, so we
* can get it again at the end of this scope
*/
- op->node = node;
+ op->common.node = node;
/*
* If there is no object attached to the node, this node was just created and
* we need to create the field object. Otherwise, this was a lookup of an
* existing node and we don't want to create the field object again.
*/
- if (node->object) {
+ obj_desc = acpi_ns_get_attached_object (node);
+ if (obj_desc) {
return_ACPI_STATUS (AE_OK);
}
@@ -125,27 +158,21 @@
}
/*
- * Allocate a method object for this field unit
- */
- obj_desc->buffer_field.extra = acpi_ut_create_internal_object (
- INTERNAL_TYPE_EXTRA);
- if (!obj_desc->buffer_field.extra) {
- status = AE_NO_MEMORY;
- goto cleanup;
- }
-
- /*
* Remember location in AML stream of the field unit
* opcode and operands -- since the buffer and index
* operands must be evaluated.
*/
- obj_desc->buffer_field.extra->extra.aml_start = ((acpi_parse2_object *) op)->data;
- obj_desc->buffer_field.extra->extra.aml_length = ((acpi_parse2_object *) op)->length;
+ second_desc = obj_desc->common.next_object;
+ second_desc->extra.aml_start = op->named.data;
+ second_desc->extra.aml_length = op->named.length;
obj_desc->buffer_field.node = node;
- /* Attach constructed field descriptor to parent node */
+ /* Attach constructed field descriptors to parent node */
status = acpi_ns_attach_object (node, obj_desc, ACPI_TYPE_BUFFER_FIELD);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
+ }
cleanup:
@@ -159,10 +186,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_get_field_names
+ * FUNCTION: acpi_ds_get_field_names
*
- * PARAMETERS: Info - Create_field info structure
- * ` Walk_state - Current method state
+ * PARAMETERS: Info - create_field info structure
+ * ` walk_state - Current method state
* Arg - First parser arg for the field name list
*
* RETURN: Status
@@ -174,14 +201,15 @@
acpi_status
acpi_ds_get_field_names (
- ACPI_CREATE_FIELD_INFO *info,
- acpi_walk_state *walk_state,
- acpi_parse_object *arg)
+ struct acpi_create_field_info *info,
+ struct acpi_walk_state *walk_state,
+ union acpi_parse_object *arg)
{
- acpi_status status;
+ acpi_status status;
+ acpi_integer position;
- PROC_NAME("acpi_ds_get_field_names");
+ ACPI_FUNCTION_TRACE_PTR ("ds_get_field_names", info);
/* First field starts at bit zero */
@@ -194,51 +222,78 @@
/*
* Three types of field elements are handled:
* 1) Offset - specifies a bit offset
- * 2) Access_as - changes the access mode
+ * 2) access_as - changes the access mode
* 3) Name - Enters a new named field into the namespace
*/
- switch (arg->opcode) {
+ switch (arg->common.aml_opcode) {
case AML_INT_RESERVEDFIELD_OP:
- info->field_bit_position += arg->value.size;
+ position = (acpi_integer) info->field_bit_position
+ + (acpi_integer) arg->common.value.size;
+
+ if (position > ACPI_UINT32_MAX) {
+ ACPI_REPORT_ERROR (("Bit offset within field too large (> 0xFFFFFFFF)\n"));
+ return_ACPI_STATUS (AE_SUPPORT);
+ }
+
+ info->field_bit_position = (u32) position;
break;
case AML_INT_ACCESSFIELD_OP:
/*
- * Get a new Access_type and Access_attribute for all
- * entries (until end or another Access_as keyword)
+ * Get a new access_type and access_attribute -- to be used for all
+ * field units that follow, until field end or another access_as keyword.
+ *
+ * In field_flags, preserve the flag bits other than the ACCESS_TYPE bits
*/
- info->field_flags = (u8) ((info->field_flags & FIELD_ACCESS_TYPE_MASK) ||
- ((u8) (arg->value.integer >> 8)));
+ info->field_flags = (u8) ((info->field_flags & ~(AML_FIELD_ACCESS_TYPE_MASK)) |
+ ((u8) ((u32) arg->common.value.integer >> 8)));
+
+ info->attribute = (u8) (arg->common.value.integer);
break;
case AML_INT_NAMEDFIELD_OP:
- /* Enter a new field name into the namespace */
+ /* Lookup the name */
status = acpi_ns_lookup (walk_state->scope_info,
- (NATIVE_CHAR *) &((acpi_parse2_object *)arg)->name,
- info->field_type, IMODE_LOAD_PASS1,
- NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
- NULL, &info->field_node);
+ (char *) &arg->named.name,
+ info->field_type, ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
+ walk_state, &info->field_node);
if (ACPI_FAILURE (status)) {
- return_ACPI_STATUS (status);
+ ACPI_REPORT_NSERROR ((char *) &arg->named.name, status);
+ if (status != AE_ALREADY_EXISTS) {
+ return_ACPI_STATUS (status);
+ }
+
+ /* Already exists, ignore error */
+ }
+ else {
+ arg->common.node = info->field_node;
+ info->field_bit_length = arg->common.value.size;
+
+ /* Create and initialize an object for the new Field Node */
+
+ status = acpi_ex_prep_field_value (info);
+ if (ACPI_FAILURE (status)) {
+ return_ACPI_STATUS (status);
+ }
}
- /* Create and initialize an object for the new Field Node */
+ /* Keep track of bit position for the next field */
- info->field_bit_length = arg->value.size;
+ position = (acpi_integer) info->field_bit_position
+ + (acpi_integer) arg->common.value.size;
- status = acpi_ex_prep_field_value (info);
- if (ACPI_FAILURE (status)) {
- return_ACPI_STATUS (status);
+ if (position > ACPI_UINT32_MAX) {
+ ACPI_REPORT_ERROR (("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n",
+ (char *) &info->field_node->name));
+ return_ACPI_STATUS (AE_SUPPORT);
}
- /* Keep track of bit position for the next field */
-
info->field_bit_position += info->field_bit_length;
break;
@@ -246,12 +301,11 @@
default:
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid opcode in field list: %X\n",
- arg->opcode));
- return_ACPI_STATUS (AE_AML_ERROR);
- break;
+ arg->common.aml_opcode));
+ return_ACPI_STATUS (AE_AML_BAD_OPCODE);
}
- arg = arg->next;
+ arg = arg->common.next;
}
return_ACPI_STATUS (AE_OK);
@@ -260,11 +314,11 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_create_field
+ * FUNCTION: acpi_ds_create_field
*
* PARAMETERS: Op - Op containing the Field definition and args
- * Region_node - Object for the containing Operation Region
- * ` Walk_state - Current method state
+ * region_node - Object for the containing Operation Region
+ * ` walk_state - Current method state
*
* RETURN: Status
*
@@ -274,41 +328,43 @@
acpi_status
acpi_ds_create_field (
- acpi_parse_object *op,
- acpi_namespace_node *region_node,
- acpi_walk_state *walk_state)
+ union acpi_parse_object *op,
+ struct acpi_namespace_node *region_node,
+ struct acpi_walk_state *walk_state)
{
- acpi_status status = AE_AML_ERROR;
- acpi_parse_object *arg;
- ACPI_CREATE_FIELD_INFO info;
+ acpi_status status;
+ union acpi_parse_object *arg;
+ struct acpi_create_field_info info;
- FUNCTION_TRACE_PTR ("Ds_create_field", op);
+ ACPI_FUNCTION_TRACE_PTR ("ds_create_field", op);
- /* First arg is the name of the parent Op_region (must already exist) */
+ /* First arg is the name of the parent op_region (must already exist) */
- arg = op->value.arg;
+ arg = op->common.value.arg;
if (!region_node) {
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.name,
- ACPI_TYPE_REGION, IMODE_EXECUTE,
- NS_SEARCH_PARENT, walk_state, ®ion_node);
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.name,
+ ACPI_TYPE_REGION, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT, walk_state, ®ion_node);
if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (arg->common.value.name, status);
return_ACPI_STATUS (status);
}
}
/* Second arg is the field flags */
- arg = arg->next;
- info.field_flags = arg->value.integer8;
+ arg = arg->common.next;
+ info.field_flags = (u8) arg->common.value.integer;
+ info.attribute = 0;
/* Each remaining arg is a Named Field */
- info.field_type = INTERNAL_TYPE_REGION_FIELD;
+ info.field_type = ACPI_TYPE_LOCAL_REGION_FIELD;
info.region_node = region_node;
- status = acpi_ds_get_field_names (&info, walk_state, arg->next);
+ status = acpi_ds_get_field_names (&info, walk_state, arg->common.next);
return_ACPI_STATUS (status);
}
@@ -316,11 +372,95 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_create_bank_field
+ * FUNCTION: acpi_ds_init_field_objects
*
* PARAMETERS: Op - Op containing the Field definition and args
- * Region_node - Object for the containing Operation Region
- * ` Walk_state - Current method state
+ * ` walk_state - Current method state
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: For each "Field Unit" name in the argument list that is
+ * part of the field declaration, enter the name into the
+ * namespace.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ds_init_field_objects (
+ union acpi_parse_object *op,
+ struct acpi_walk_state *walk_state)
+{
+ acpi_status status;
+ union acpi_parse_object *arg = NULL;
+ struct acpi_namespace_node *node;
+ u8 type = 0;
+
+
+ ACPI_FUNCTION_TRACE_PTR ("ds_init_field_objects", op);
+
+
+ switch (walk_state->opcode) {
+ case AML_FIELD_OP:
+ arg = acpi_ps_get_arg (op, 2);
+ type = ACPI_TYPE_LOCAL_REGION_FIELD;
+ break;
+
+ case AML_BANK_FIELD_OP:
+ arg = acpi_ps_get_arg (op, 4);
+ type = ACPI_TYPE_LOCAL_BANK_FIELD;
+ break;
+
+ case AML_INDEX_FIELD_OP:
+ arg = acpi_ps_get_arg (op, 3);
+ type = ACPI_TYPE_LOCAL_INDEX_FIELD;
+ break;
+
+ default:
+ return_ACPI_STATUS (AE_BAD_PARAMETER);
+ }
+
+ /*
+ * Walk the list of entries in the field_list
+ */
+ while (arg) {
+ /* Ignore OFFSET and ACCESSAS terms here */
+
+ if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
+ status = acpi_ns_lookup (walk_state->scope_info,
+ (char *) &arg->named.name,
+ type, ACPI_IMODE_LOAD_PASS1,
+ ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND,
+ walk_state, &node);
+ if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR ((char *) &arg->named.name, status);
+ if (status != AE_ALREADY_EXISTS) {
+ return_ACPI_STATUS (status);
+ }
+
+ /* Name already exists, just ignore this error */
+
+ status = AE_OK;
+ }
+
+ arg->common.node = node;
+ }
+
+ /* Move to next field in the list */
+
+ arg = arg->common.next;
+ }
+
+ return_ACPI_STATUS (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_ds_create_bank_field
+ *
+ * PARAMETERS: Op - Op containing the Field definition and args
+ * region_node - Object for the containing Operation Region
+ * ` walk_state - Current method state
*
* RETURN: Status
*
@@ -330,56 +470,58 @@
acpi_status
acpi_ds_create_bank_field (
- acpi_parse_object *op,
- acpi_namespace_node *region_node,
- acpi_walk_state *walk_state)
+ union acpi_parse_object *op,
+ struct acpi_namespace_node *region_node,
+ struct acpi_walk_state *walk_state)
{
- acpi_status status = AE_AML_ERROR;
- acpi_parse_object *arg;
- ACPI_CREATE_FIELD_INFO info;
+ acpi_status status;
+ union acpi_parse_object *arg;
+ struct acpi_create_field_info info;
- FUNCTION_TRACE_PTR ("Ds_create_bank_field", op);
+ ACPI_FUNCTION_TRACE_PTR ("ds_create_bank_field", op);
- /* First arg is the name of the parent Op_region (must already exist) */
+ /* First arg is the name of the parent op_region (must already exist) */
- arg = op->value.arg;
+ arg = op->common.value.arg;
if (!region_node) {
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.name,
- ACPI_TYPE_REGION, IMODE_EXECUTE,
- NS_SEARCH_PARENT, walk_state, ®ion_node);
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.name,
+ ACPI_TYPE_REGION, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT, walk_state, ®ion_node);
if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (arg->common.value.name, status);
return_ACPI_STATUS (status);
}
}
- /* Second arg is the Bank Register (must already exist) */
+ /* Second arg is the Bank Register (Field) (must already exist) */
- arg = arg->next;
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.string,
- INTERNAL_TYPE_BANK_FIELD_DEFN, IMODE_EXECUTE,
- NS_SEARCH_PARENT, walk_state, &info.register_node);
+ arg = arg->common.next;
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
+ ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT, walk_state, &info.register_node);
if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (arg->common.value.string, status);
return_ACPI_STATUS (status);
}
- /* Third arg is the Bank_value */
+ /* Third arg is the bank_value */
- arg = arg->next;
- info.bank_value = arg->value.integer32;
+ arg = arg->common.next;
+ info.bank_value = (u32) arg->common.value.integer;
/* Fourth arg is the field flags */
- arg = arg->next;
- info.field_flags = arg->value.integer8;
+ arg = arg->common.next;
+ info.field_flags = (u8) arg->common.value.integer;
/* Each remaining arg is a Named Field */
- info.field_type = INTERNAL_TYPE_BANK_FIELD;
+ info.field_type = ACPI_TYPE_LOCAL_BANK_FIELD;
info.region_node = region_node;
- status = acpi_ds_get_field_names (&info, walk_state, arg->next);
+ status = acpi_ds_get_field_names (&info, walk_state, arg->common.next);
return_ACPI_STATUS (status);
}
@@ -387,11 +529,11 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ds_create_index_field
+ * FUNCTION: acpi_ds_create_index_field
*
* PARAMETERS: Op - Op containing the Field definition and args
- * Region_node - Object for the containing Operation Region
- * ` Walk_state - Current method state
+ * region_node - Object for the containing Operation Region
+ * ` walk_state - Current method state
*
* RETURN: Status
*
@@ -401,50 +543,51 @@
acpi_status
acpi_ds_create_index_field (
- acpi_parse_object *op,
- acpi_namespace_node *region_node,
- acpi_walk_state *walk_state)
+ union acpi_parse_object *op,
+ struct acpi_namespace_node *region_node,
+ struct acpi_walk_state *walk_state)
{
- acpi_status status;
- acpi_parse_object *arg;
- ACPI_CREATE_FIELD_INFO info;
+ acpi_status status;
+ union acpi_parse_object *arg;
+ struct acpi_create_field_info info;
- FUNCTION_TRACE_PTR ("Ds_create_index_field", op);
+ ACPI_FUNCTION_TRACE_PTR ("ds_create_index_field", op);
/* First arg is the name of the Index register (must already exist) */
- arg = op->value.arg;
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.string,
- ACPI_TYPE_ANY, IMODE_EXECUTE,
- NS_SEARCH_PARENT, walk_state, &info.register_node);
+ arg = op->common.value.arg;
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
+ ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT, walk_state, &info.register_node);
if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (arg->common.value.string, status);
return_ACPI_STATUS (status);
}
/* Second arg is the data register (must already exist) */
- arg = arg->next;
- status = acpi_ns_lookup (walk_state->scope_info, arg->value.string,
- INTERNAL_TYPE_INDEX_FIELD_DEFN, IMODE_EXECUTE,
- NS_SEARCH_PARENT, walk_state, &info.data_register_node);
+ arg = arg->common.next;
+ status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
+ ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT, walk_state, &info.data_register_node);
if (ACPI_FAILURE (status)) {
+ ACPI_REPORT_NSERROR (arg->common.value.string, status);
return_ACPI_STATUS (status);
}
/* Next arg is the field flags */
- arg = arg->next;
- info.field_flags = arg->value.integer8;
-
+ arg = arg->common.next;
+ info.field_flags = (u8) arg->common.value.integer;
/* Each remaining arg is a Named Field */
- info.field_type = INTERNAL_TYPE_INDEX_FIELD;
+ info.field_type = ACPI_TYPE_LOCAL_INDEX_FIELD;
info.region_node = region_node;
- status = acpi_ds_get_field_names (&info, walk_state, arg->next);
+ status = acpi_ds_get_field_names (&info, walk_state, arg->common.next);
return_ACPI_STATUS (status);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)