Commit ea8e33ae authored by Andy Grover's avatar Andy Grover

ACPI: Remove typedefs in favor of using "struct" and "union" explicitly

parent cf6aeaef
......@@ -1017,7 +1017,7 @@ void __init mp_config_ioapic_for_sci(int irq)
* walking the MADT again.
*/
status = acpi_get_firmware_table("APIC", 1, ACPI_LOGICAL_ADDRESSING,
(acpi_table_header **) &madt);
(struct acpi_table_header **) &madt);
if (ACPI_SUCCESS(status)) {
madt_end = (void *) (unsigned long)madt + madt->header.length;
......
......@@ -44,9 +44,24 @@ struct acpi_handle_list {
/* acpi_utils.h */
acpi_status acpi_extract_package (acpi_object *, acpi_buffer *, acpi_buffer *);
acpi_status acpi_evaluate_integer (acpi_handle, acpi_string, acpi_object_list *, unsigned long *);
acpi_status acpi_evaluate_reference (acpi_handle, acpi_string, acpi_object_list *, struct acpi_handle_list *);
acpi_status
acpi_extract_package (
union acpi_object *package,
struct acpi_buffer *format,
struct acpi_buffer *buffer);
acpi_status
acpi_evaluate_integer (
acpi_handle handle,
acpi_string pathname,
struct acpi_object_list *arguments,
unsigned long *data);
acpi_status
acpi_evaluate_reference (
acpi_handle handle,
acpi_string pathname,
struct acpi_object_list *arguments,
struct acpi_handle_list *list);
#ifdef CONFIG_ACPI_BUS
......
......@@ -55,7 +55,7 @@
/* ACPI PCI Root Bridge (pci_root.c) */
void acpi_pci_get_translations (acpi_pci_id* id, u64* mem_tra, u64* io_tra);
void acpi_pci_get_translations (struct acpi_pci_id* id, u64* mem_tra, u64* io_tra);
/* ACPI PCI Interrupt Link (pci_link.c) */
......@@ -71,7 +71,7 @@ int acpi_pci_irq_add_prt (acpi_handle handle, int segment, int bus);
struct pci_bus;
int acpi_pci_bind (struct acpi_device *device);
int acpi_pci_bind_root (struct acpi_device *device, acpi_pci_id *id, struct pci_bus *bus);
int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus);
#endif /*CONFIG_ACPI_PCI*/
......
......@@ -127,11 +127,11 @@ acpi_battery_get_info (
{
int result = 0;
acpi_status status = 0;
acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
acpi_buffer format = {sizeof(ACPI_BATTERY_FORMAT_BIF),
struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
struct acpi_buffer format = {sizeof(ACPI_BATTERY_FORMAT_BIF),
ACPI_BATTERY_FORMAT_BIF};
acpi_buffer data = {0, NULL};
acpi_object *package = NULL;
struct acpi_buffer data = {0, NULL};
union acpi_object *package = NULL;
ACPI_FUNCTION_TRACE("acpi_battery_get_info");
......@@ -146,7 +146,7 @@ acpi_battery_get_info (
return_VALUE(-ENODEV);
}
package = (acpi_object *) buffer.pointer;
package = (union acpi_object *) buffer.pointer;
/* Extract Package Data */
......@@ -188,11 +188,11 @@ acpi_battery_get_status (
{
int result = 0;
acpi_status status = 0;
acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
acpi_buffer format = {sizeof(ACPI_BATTERY_FORMAT_BST),
struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
struct acpi_buffer format = {sizeof(ACPI_BATTERY_FORMAT_BST),
ACPI_BATTERY_FORMAT_BST};
acpi_buffer data = {0, NULL};
acpi_object *package = NULL;
struct acpi_buffer data = {0, NULL};
union acpi_object *package = NULL;
ACPI_FUNCTION_TRACE("acpi_battery_get_status");
......@@ -207,7 +207,7 @@ acpi_battery_get_status (
return_VALUE(-ENODEV);
}
package = (acpi_object *) buffer.pointer;
package = (union acpi_object *) buffer.pointer;
/* Extract Package Data */
......@@ -249,8 +249,8 @@ acpi_battery_set_alarm (
unsigned long alarm)
{
acpi_status status = 0;
acpi_object arg0 = {ACPI_TYPE_INTEGER};
acpi_object_list arg_list = {1, &arg0};
union acpi_object arg0 = {ACPI_TYPE_INTEGER};
struct acpi_object_list arg_list = {1, &arg0};
ACPI_FUNCTION_TRACE("acpi_battery_set_alarm");
......
......@@ -540,8 +540,8 @@ static int __init
acpi_bus_init_irq (void)
{
acpi_status status = AE_OK;
acpi_object arg = {ACPI_TYPE_INTEGER};
acpi_object_list arg_list = {1, &arg};
union acpi_object arg = {ACPI_TYPE_INTEGER};
struct acpi_object_list arg_list = {1, &arg};
char *message = NULL;
ACPI_FUNCTION_TRACE("acpi_bus_init_irq");
......@@ -585,7 +585,7 @@ acpi_bus_init (void)
{
int result = 0;
acpi_status status = AE_OK;
acpi_buffer buffer = {sizeof(acpi_fadt), &acpi_fadt};
struct acpi_buffer buffer = {sizeof(acpi_fadt), &acpi_fadt};
ACPI_FUNCTION_TRACE("acpi_bus_init");
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -57,14 +57,14 @@
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;
union acpi_parse_object *arg;
struct acpi_namespace_node *node;
acpi_status status;
acpi_operand_object *obj_desc;
acpi_operand_object *second_desc = NULL;
union acpi_operand_object *obj_desc;
union acpi_operand_object *second_desc = NULL;
u32 flags;
......@@ -182,9 +182,9 @@ acpi_ds_create_buffer_field (
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_integer position;
......@@ -309,13 +309,13 @@ acpi_ds_get_field_names (
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;
acpi_parse_object *arg;
acpi_create_field_info info;
union acpi_parse_object *arg;
struct acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("ds_create_field", op);
......@@ -368,12 +368,12 @@ acpi_ds_create_field (
acpi_status
acpi_ds_init_field_objects (
acpi_parse_object *op,
acpi_walk_state *walk_state)
union acpi_parse_object *op,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_parse_object *arg = NULL;
acpi_namespace_node *node;
union acpi_parse_object *arg = NULL;
struct acpi_namespace_node *node;
u8 type = 0;
......@@ -451,13 +451,13 @@ acpi_ds_init_field_objects (
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;
acpi_parse_object *arg;
acpi_create_field_info info;
union acpi_parse_object *arg;
struct acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("ds_create_bank_field", op);
......@@ -524,13 +524,13 @@ acpi_ds_create_bank_field (
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;
union acpi_parse_object *arg;
struct acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("ds_create_index_field", op);
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -63,7 +63,7 @@ acpi_ds_init_one_object (
{
acpi_object_type type;
acpi_status status;
acpi_init_walk_info *info = (acpi_init_walk_info *) context;
struct acpi_init_walk_info *info = (struct acpi_init_walk_info *) context;
ACPI_FUNCTION_NAME ("ds_init_one_object");
......@@ -73,7 +73,7 @@ acpi_ds_init_one_object (
* We are only interested in objects owned by the table that
* was just loaded
*/
if (((acpi_namespace_node *) obj_handle)->owner_id !=
if (((struct acpi_namespace_node *) obj_handle)->owner_id !=
info->table_desc->table_id) {
return (AE_OK);
}
......@@ -90,7 +90,7 @@ acpi_ds_init_one_object (
status = acpi_ds_initialize_region (obj_handle);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Region %p [%4.4s] - Init failure, %s\n",
obj_handle, ((acpi_namespace_node *) obj_handle)->name.ascii,
obj_handle, ((struct acpi_namespace_node *) obj_handle)->name.ascii,
acpi_format_exception (status)));
}
......@@ -115,7 +115,7 @@ acpi_ds_init_one_object (
* on a per-table basis. Currently, we just use a global for the width.
*/
if (info->table_desc->pointer->revision == 1) {
((acpi_namespace_node *) obj_handle)->flags |= ANOBJ_DATA_WIDTH_32;
((struct acpi_namespace_node *) obj_handle)->flags |= ANOBJ_DATA_WIDTH_32;
}
/*
......@@ -125,7 +125,7 @@ acpi_ds_init_one_object (
status = acpi_ds_parse_method (obj_handle);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Method %p [%4.4s] - parse failure, %s\n",
obj_handle, ((acpi_namespace_node *) obj_handle)->name.ascii,
obj_handle, ((struct acpi_namespace_node *) obj_handle)->name.ascii,
acpi_format_exception (status)));
/* This parse failed, but we will continue parsing more methods */
......@@ -138,7 +138,7 @@ acpi_ds_init_one_object (
* for every execution since there isn't much overhead
*/
acpi_ns_delete_namespace_subtree (obj_handle);
acpi_ns_delete_namespace_by_owner (((acpi_namespace_node *) obj_handle)->object->method.owning_id);
acpi_ns_delete_namespace_by_owner (((struct acpi_namespace_node *) obj_handle)->object->method.owning_id);
break;
......@@ -176,11 +176,11 @@ acpi_ds_init_one_object (
acpi_status
acpi_ds_initialize_objects (
acpi_table_desc *table_desc,
acpi_namespace_node *start_node)
struct acpi_table_desc *table_desc,
struct acpi_namespace_node *start_node)
{
acpi_status status;
acpi_init_walk_info info;
struct acpi_init_walk_info info;
ACPI_FUNCTION_TRACE ("ds_initialize_objects");
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -58,11 +58,11 @@ acpi_ds_parse_method (
acpi_handle obj_handle)
{
acpi_status status;
acpi_operand_object *obj_desc;
acpi_parse_object *op;
acpi_namespace_node *node;
union acpi_operand_object *obj_desc;
union acpi_parse_object *op;
struct acpi_namespace_node *node;
acpi_owner_id owner_id;
acpi_walk_state *walk_state;
struct acpi_walk_state *walk_state;
ACPI_FUNCTION_TRACE_PTR ("ds_parse_method", obj_handle);
......@@ -75,11 +75,11 @@ acpi_ds_parse_method (
}
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Parsing [%4.4s] **** named_obj=%p\n",
((acpi_namespace_node *) obj_handle)->name.ascii, obj_handle));
((struct acpi_namespace_node *) obj_handle)->name.ascii, obj_handle));
/* Extract the method object from the method Node */
node = (acpi_namespace_node *) obj_handle;
node = (struct acpi_namespace_node *) obj_handle;
obj_desc = acpi_ns_get_attached_object (node);
if (!obj_desc) {
return_ACPI_STATUS (AE_NULL_OBJECT);
......@@ -150,7 +150,7 @@ acpi_ds_parse_method (
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
"**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",
((acpi_namespace_node *) obj_handle)->name.ascii, obj_handle, op));
((struct acpi_namespace_node *) obj_handle)->name.ascii, obj_handle, op));
acpi_ps_delete_parse_tree (op);
return_ACPI_STATUS (status);
......@@ -177,9 +177,9 @@ acpi_ds_parse_method (
acpi_status
acpi_ds_begin_method_execution (
acpi_namespace_node *method_node,
acpi_operand_object *obj_desc,
acpi_namespace_node *calling_method_node)
struct acpi_namespace_node *method_node,
union acpi_operand_object *obj_desc,
struct acpi_namespace_node *calling_method_node)
{
acpi_status status = AE_OK;
......@@ -242,14 +242,14 @@ acpi_ds_begin_method_execution (
acpi_status
acpi_ds_call_control_method (
acpi_thread_state *thread,
acpi_walk_state *this_walk_state,
acpi_parse_object *op)
struct acpi_thread_state *thread,
struct acpi_walk_state *this_walk_state,
union acpi_parse_object *op)
{
acpi_status status;
acpi_namespace_node *method_node;
acpi_operand_object *obj_desc;
acpi_walk_state *next_walk_state;
struct acpi_namespace_node *method_node;
union acpi_operand_object *obj_desc;
struct acpi_walk_state *next_walk_state;
u32 i;
......@@ -376,8 +376,8 @@ acpi_ds_call_control_method (
acpi_status
acpi_ds_restart_control_method (
acpi_walk_state *walk_state,
acpi_operand_object *return_desc)
struct acpi_walk_state *walk_state,
union acpi_operand_object *return_desc)
{
acpi_status status;
......@@ -431,10 +431,10 @@ acpi_ds_restart_control_method (
acpi_status
acpi_ds_terminate_control_method (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object *obj_desc;
acpi_namespace_node *method_node;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *method_node;
acpi_status status;
......
......@@ -5,7 +5,7 @@
******************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -57,7 +57,7 @@
void
acpi_ds_method_data_init (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
......@@ -107,7 +107,7 @@ acpi_ds_method_data_init (
void
acpi_ds_method_data_delete_all (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 index;
......@@ -163,9 +163,9 @@ acpi_ds_method_data_delete_all (
acpi_status
acpi_ds_method_data_init_args (
acpi_operand_object **params,
union acpi_operand_object **params,
u32 max_param_count,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status;
u32 index = 0;
......@@ -217,8 +217,8 @@ acpi_status
acpi_ds_method_data_get_node (
u16 opcode,
u32 index,
acpi_walk_state *walk_state,
acpi_namespace_node **node)
struct acpi_walk_state *walk_state,
struct acpi_namespace_node **node)
{
ACPI_FUNCTION_TRACE ("ds_method_data_get_node");
......@@ -282,12 +282,12 @@ acpi_status
acpi_ds_method_data_set_value (
u16 opcode,
u32 index,
acpi_operand_object *object,
acpi_walk_state *walk_state)
union acpi_operand_object *object,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *new_desc = object;
struct acpi_namespace_node *node;
union acpi_operand_object *new_desc = object;
ACPI_FUNCTION_TRACE ("ds_method_data_set_value");
......@@ -349,11 +349,11 @@ acpi_object_type
acpi_ds_method_data_get_type (
u16 opcode,
u32 index,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *object;
struct acpi_namespace_node *node;
union acpi_operand_object *object;
ACPI_FUNCTION_TRACE ("ds_method_data_get_type");
......@@ -403,12 +403,12 @@ acpi_status
acpi_ds_method_data_get_value (
u16 opcode,
u32 index,
acpi_walk_state *walk_state,
acpi_operand_object **dest_desc)
struct acpi_walk_state *walk_state,
union acpi_operand_object **dest_desc)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *object;
struct acpi_namespace_node *node;
union acpi_operand_object *object;
ACPI_FUNCTION_TRACE ("ds_method_data_get_value");
......@@ -492,11 +492,11 @@ void
acpi_ds_method_data_delete_value (
u16 opcode,
u32 index,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *object;
struct acpi_namespace_node *node;
union acpi_operand_object *object;
ACPI_FUNCTION_TRACE ("ds_method_data_delete_value");
......@@ -555,12 +555,12 @@ acpi_status
acpi_ds_store_object_to_local (
u16 opcode,
u32 index,
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *current_obj_desc;
struct acpi_namespace_node *node;
union acpi_operand_object *current_obj_desc;
ACPI_FUNCTION_TRACE ("ds_store_object_to_local");
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -52,11 +52,11 @@
acpi_status
acpi_ds_build_internal_object (
acpi_walk_state *walk_state,
acpi_parse_object *op,
acpi_operand_object **obj_desc_ptr)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
union acpi_operand_object **obj_desc_ptr)
{
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
acpi_status status;
......@@ -74,7 +74,7 @@ acpi_ds_build_internal_object (
status = acpi_ns_lookup (walk_state->scope_info, op->common.value.string,
ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL,
(acpi_namespace_node **) &(op->common.node));
(struct acpi_namespace_node **) &(op->common.node));
if (ACPI_FAILURE (status)) {
ACPI_REPORT_NSERROR (op->common.value.string, status);
......@@ -119,14 +119,14 @@ acpi_ds_build_internal_object (
acpi_status
acpi_ds_build_internal_buffer_obj (
acpi_walk_state *walk_state,
acpi_parse_object *op,
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u32 buffer_length,
acpi_operand_object **obj_desc_ptr)
union acpi_operand_object **obj_desc_ptr)
{
acpi_parse_object *arg;
acpi_operand_object *obj_desc;
acpi_parse_object *byte_list;
union acpi_parse_object *arg;
union acpi_operand_object *obj_desc;
union acpi_parse_object *byte_list;
u32 byte_list_length = 0;
......@@ -204,7 +204,7 @@ acpi_ds_build_internal_buffer_obj (
}
obj_desc->buffer.flags |= AOPOBJ_DATA_VALID;
op->common.node = (acpi_namespace_node *) obj_desc;
op->common.node = (struct acpi_namespace_node *) obj_desc;
return_ACPI_STATUS (AE_OK);
}
......@@ -227,14 +227,14 @@ acpi_ds_build_internal_buffer_obj (
acpi_status
acpi_ds_build_internal_package_obj (
acpi_walk_state *walk_state,
acpi_parse_object *op,
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u32 package_length,
acpi_operand_object **obj_desc_ptr)
union acpi_operand_object **obj_desc_ptr)
{
acpi_parse_object *arg;
acpi_parse_object *parent;
acpi_operand_object *obj_desc = NULL;
union acpi_parse_object *arg;
union acpi_parse_object *parent;
union acpi_operand_object *obj_desc = NULL;
u32 package_list_length;
acpi_status status = AE_OK;
u32 i;
......@@ -311,7 +311,7 @@ acpi_ds_build_internal_package_obj (
if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
/* Object (package or buffer) is already built */
obj_desc->package.elements[i] = ACPI_CAST_PTR (acpi_operand_object, arg->common.node);
obj_desc->package.elements[i] = ACPI_CAST_PTR (union acpi_operand_object, arg->common.node);
}
else {
status = acpi_ds_build_internal_object (walk_state, arg,
......@@ -323,7 +323,7 @@ acpi_ds_build_internal_package_obj (
}
obj_desc->package.flags |= AOPOBJ_DATA_VALID;
op->common.node = (acpi_namespace_node *) obj_desc;
op->common.node = (struct acpi_namespace_node *) obj_desc;
return_ACPI_STATUS (status);
}
......@@ -344,12 +344,12 @@ acpi_ds_build_internal_package_obj (
acpi_status
acpi_ds_create_node (
acpi_walk_state *walk_state,
acpi_namespace_node *node,
acpi_parse_object *op)
struct acpi_walk_state *walk_state,
struct acpi_namespace_node *node,
union acpi_parse_object *op)
{
acpi_status status;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("ds_create_node", op);
......@@ -413,13 +413,13 @@ acpi_ds_create_node (
acpi_status
acpi_ds_init_object_from_op (
acpi_walk_state *walk_state,
acpi_parse_object *op,
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u16 opcode,
acpi_operand_object **ret_obj_desc)
union acpi_operand_object **ret_obj_desc)
{
const acpi_opcode_info *op_info;
acpi_operand_object *obj_desc;
const struct acpi_opcode_info *op_info;
union acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
......@@ -442,7 +442,7 @@ acpi_ds_init_object_from_op (
/*
* Defer evaluation of Buffer term_arg operand
*/
obj_desc->buffer.node = (acpi_namespace_node *) walk_state->operands[0];
obj_desc->buffer.node = (struct acpi_namespace_node *) walk_state->operands[0];
obj_desc->buffer.aml_start = op->named.data;
obj_desc->buffer.aml_length = op->named.length;
break;
......@@ -453,7 +453,7 @@ acpi_ds_init_object_from_op (
/*
* Defer evaluation of Package term_arg operand
*/
obj_desc->package.node = (acpi_namespace_node *) walk_state->operands[0];
obj_desc->package.node = (struct acpi_namespace_node *) walk_state->operands[0];
obj_desc->package.aml_start = op->named.data;
obj_desc->package.aml_length = op->named.length;
break;
......@@ -551,7 +551,7 @@ acpi_ds_init_object_from_op (
#ifndef ACPI_NO_METHOD_EXECUTION
status = acpi_ds_method_data_get_node (AML_LOCAL_OP, obj_desc->reference.offset,
walk_state, (acpi_namespace_node **) &obj_desc->reference.object);
walk_state, (struct acpi_namespace_node **) &obj_desc->reference.object);
#endif
break;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -52,15 +52,15 @@
acpi_status
acpi_ds_execute_arguments (
acpi_namespace_node *node,
acpi_namespace_node *scope_node,
struct acpi_namespace_node *node,
struct acpi_namespace_node *scope_node,
u32 aml_length,
u8 *aml_start)
{
acpi_status status;
acpi_parse_object *op;
acpi_walk_state *walk_state;
acpi_parse_object *arg;
union acpi_parse_object *op;
struct acpi_walk_state *walk_state;
union acpi_parse_object *arg;
ACPI_FUNCTION_TRACE ("acpi_ds_execute_arguments");
......@@ -153,10 +153,10 @@ acpi_ds_execute_arguments (
acpi_status
acpi_ds_get_buffer_field_arguments (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_operand_object *extra_desc;
acpi_namespace_node *node;
union acpi_operand_object *extra_desc;
struct acpi_namespace_node *node;
acpi_status status;
......@@ -199,9 +199,9 @@ acpi_ds_get_buffer_field_arguments (
acpi_status
acpi_ds_get_buffer_arguments (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_namespace_node *node;
struct acpi_namespace_node *node;
acpi_status status;
......@@ -246,9 +246,9 @@ acpi_ds_get_buffer_arguments (
acpi_status
acpi_ds_get_package_arguments (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_namespace_node *node;
struct acpi_namespace_node *node;
acpi_status status;
......@@ -293,11 +293,11 @@ acpi_ds_get_package_arguments (
acpi_status
acpi_ds_get_region_arguments (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_namespace_node *node;
struct acpi_namespace_node *node;
acpi_status status;
acpi_operand_object *extra_desc;
union acpi_operand_object *extra_desc;
ACPI_FUNCTION_TRACE_PTR ("ds_get_region_arguments", obj_desc);
......@@ -344,7 +344,7 @@ acpi_status
acpi_ds_initialize_region (
acpi_handle obj_handle)
{
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
acpi_status status;
......@@ -377,11 +377,11 @@ acpi_ds_initialize_region (
acpi_status
acpi_ds_init_buffer_field (
u16 aml_opcode,
acpi_operand_object *obj_desc,
acpi_operand_object *buffer_desc,
acpi_operand_object *offset_desc,
acpi_operand_object *length_desc,
acpi_operand_object *result_desc)
union acpi_operand_object *obj_desc,
union acpi_operand_object *buffer_desc,
union acpi_operand_object *offset_desc,
union acpi_operand_object *length_desc,
union acpi_operand_object *result_desc)
{
u32 offset;
u32 bit_offset;
......@@ -558,13 +558,13 @@ acpi_ds_init_buffer_field (
acpi_status
acpi_ds_eval_buffer_field_operands (
acpi_walk_state *walk_state,
acpi_parse_object *op)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op)
{
acpi_status status;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
acpi_parse_object *next_op;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *node;
union acpi_parse_object *next_op;
ACPI_FUNCTION_TRACE_PTR ("ds_eval_buffer_field_operands", op);
......@@ -645,14 +645,14 @@ acpi_ds_eval_buffer_field_operands (
acpi_status
acpi_ds_eval_region_operands (
acpi_walk_state *walk_state,
acpi_parse_object *op)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op)
{
acpi_status status;
acpi_operand_object *obj_desc;
acpi_operand_object *operand_desc;
acpi_namespace_node *node;
acpi_parse_object *next_op;
union acpi_operand_object *obj_desc;
union acpi_operand_object *operand_desc;
struct acpi_namespace_node *node;
union acpi_parse_object *next_op;
ACPI_FUNCTION_TRACE_PTR ("ds_eval_region_operands", op);
......@@ -743,12 +743,12 @@ acpi_ds_eval_region_operands (
acpi_status
acpi_ds_eval_data_object_operands (
acpi_walk_state *walk_state,
acpi_parse_object *op,
acpi_operand_object *obj_desc)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
union acpi_operand_object *obj_desc)
{
acpi_status status;
acpi_operand_object *arg_desc;
union acpi_operand_object *arg_desc;
u32 length;
......@@ -836,11 +836,11 @@ acpi_ds_eval_data_object_operands (
acpi_status
acpi_ds_exec_begin_control_op (
acpi_walk_state *walk_state,
acpi_parse_object *op)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op)
{
acpi_status status = AE_OK;
acpi_generic_state *control_state;
union acpi_generic_state *control_state;
ACPI_FUNCTION_NAME ("ds_exec_begin_control_op");
......@@ -916,11 +916,11 @@ acpi_ds_exec_begin_control_op (
acpi_status
acpi_ds_exec_end_control_op (
acpi_walk_state *walk_state,
acpi_parse_object *op)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op)
{
acpi_status status = AE_OK;
acpi_generic_state *control_state;
union acpi_generic_state *control_state;
ACPI_FUNCTION_NAME ("ds_exec_end_control_op");
......
......@@ -5,7 +5,7 @@
******************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -52,10 +52,10 @@
u8
acpi_ds_is_result_used (
acpi_parse_object *op,
acpi_walk_state *walk_state)
union acpi_parse_object *op,
struct acpi_walk_state *walk_state)
{
const acpi_opcode_info *parent_info;
const struct acpi_opcode_info *parent_info;
ACPI_FUNCTION_TRACE_PTR ("ds_is_result_used", op);
......@@ -200,11 +200,11 @@ acpi_ds_is_result_used (
void
acpi_ds_delete_result_if_not_used (
acpi_parse_object *op,
acpi_operand_object *result_obj,
acpi_walk_state *walk_state)
union acpi_parse_object *op,
union acpi_operand_object *result_obj,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
acpi_status status;
......@@ -251,7 +251,7 @@ acpi_ds_delete_result_if_not_used (
acpi_status
acpi_ds_resolve_operands (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
acpi_status status = AE_OK;
......@@ -289,7 +289,7 @@ acpi_ds_resolve_operands (
void
acpi_ds_clear_operands (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
......@@ -333,18 +333,18 @@ acpi_ds_clear_operands (
acpi_status
acpi_ds_create_operand (
acpi_walk_state *walk_state,
acpi_parse_object *arg,
struct acpi_walk_state *walk_state,
union acpi_parse_object *arg,
u32 arg_index)
{
acpi_status status = AE_OK;
char *name_string;
u32 name_length;
acpi_operand_object *obj_desc;
acpi_parse_object *parent_op;
union acpi_operand_object *obj_desc;
union acpi_parse_object *parent_op;
u16 opcode;
acpi_interpreter_mode interpreter_mode;
const acpi_opcode_info *op_info;
const struct acpi_opcode_info *op_info;
ACPI_FUNCTION_TRACE_PTR ("ds_create_operand", arg);
......@@ -397,7 +397,7 @@ acpi_ds_create_operand (
ACPI_TYPE_ANY, interpreter_mode,
ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
walk_state,
ACPI_CAST_INDIRECT_PTR (acpi_namespace_node, &obj_desc));
ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &obj_desc));
/*
* The only case where we pass through (ignore) a NOT_FOUND
* error is for the cond_ref_of opcode.
......@@ -410,7 +410,7 @@ acpi_ds_create_operand (
* indicate this to the interpreter, set the
* object to the root
*/
obj_desc = ACPI_CAST_PTR (acpi_operand_object, acpi_gbl_root_node);
obj_desc = ACPI_CAST_PTR (union acpi_operand_object, acpi_gbl_root_node);
status = AE_OK;
}
......@@ -543,11 +543,11 @@ acpi_ds_create_operand (
acpi_status
acpi_ds_create_operands (
acpi_walk_state *walk_state,
acpi_parse_object *first_arg)
struct acpi_walk_state *walk_state,
union acpi_parse_object *first_arg)
{
acpi_status status = AE_OK;
acpi_parse_object *arg;
union acpi_parse_object *arg;
u32 arg_count = 0;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -66,10 +66,10 @@ static ACPI_EXECUTE_OP acpi_gbl_op_type_dispatch [] = {
acpi_status
acpi_ds_get_predicate_value (
acpi_walk_state *walk_state,
acpi_operand_object *result_obj) {
struct acpi_walk_state *walk_state,
union acpi_operand_object *result_obj) {
acpi_status status = AE_OK;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("ds_get_predicate_value", walk_state);
......@@ -179,10 +179,10 @@ acpi_ds_get_predicate_value (
acpi_status
acpi_ds_exec_begin_op (
acpi_walk_state *walk_state,
acpi_parse_object **out_op)
struct acpi_walk_state *walk_state,
union acpi_parse_object **out_op)
{
acpi_parse_object *op;
union acpi_parse_object *op;
acpi_status status = AE_OK;
u32 opcode_class;
......@@ -320,14 +320,14 @@ acpi_ds_exec_begin_op (
acpi_status
acpi_ds_exec_end_op (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_parse_object *op;
union acpi_parse_object *op;
acpi_status status = AE_OK;
u32 op_type;
u32 op_class;
acpi_parse_object *next_op;
acpi_parse_object *first_arg;
union acpi_parse_object *next_op;
union acpi_parse_object *first_arg;
ACPI_FUNCTION_TRACE_PTR ("ds_exec_end_op", walk_state);
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -51,7 +51,7 @@
acpi_status
acpi_ds_init_callbacks (
acpi_walk_state *walk_state,
struct acpi_walk_state *walk_state,
u32 pass_number)
{
......@@ -100,11 +100,11 @@ acpi_ds_init_callbacks (
acpi_status
acpi_ds_load1_begin_op (
acpi_walk_state *walk_state,
acpi_parse_object **out_op)
struct acpi_walk_state *walk_state,
union acpi_parse_object **out_op)
{
acpi_parse_object *op;
acpi_namespace_node *node;
union acpi_parse_object *op;
struct acpi_namespace_node *node;
acpi_status status;
acpi_object_type object_type;
char *path;
......@@ -303,9 +303,9 @@ acpi_ds_load1_begin_op (
acpi_status
acpi_ds_load1_end_op (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_parse_object *op;
union acpi_parse_object *op;
acpi_object_type object_type;
acpi_status status = AE_OK;
......@@ -415,11 +415,11 @@ acpi_ds_load1_end_op (
acpi_status
acpi_ds_load2_begin_op (
acpi_walk_state *walk_state,
acpi_parse_object **out_op)
struct acpi_walk_state *walk_state,
union acpi_parse_object **out_op)
{
acpi_parse_object *op;
acpi_namespace_node *node;
union acpi_parse_object *op;
struct acpi_namespace_node *node;
acpi_status status;
acpi_object_type object_type;
char *buffer_ptr;
......@@ -627,14 +627,14 @@ acpi_ds_load2_begin_op (
acpi_status
acpi_ds_load2_end_op (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_parse_object *op;
union acpi_parse_object *op;
acpi_status status = AE_OK;
acpi_object_type object_type;
acpi_namespace_node *node;
acpi_parse_object *arg;
acpi_namespace_node *new_node;
struct acpi_namespace_node *node;
union acpi_parse_object *arg;
struct acpi_namespace_node *new_node;
#ifndef ACPI_NO_METHOD_EXECUTION
u32 i;
#endif
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -47,9 +47,9 @@
void
acpi_ds_scope_stack_clear (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *scope_info;
union acpi_generic_state *scope_info;
ACPI_FUNCTION_NAME ("ds_scope_stack_clear");
......@@ -81,12 +81,12 @@ acpi_ds_scope_stack_clear (
acpi_status
acpi_ds_scope_stack_push (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
acpi_object_type type,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *scope_info;
acpi_generic_state *old_scope_info;
union acpi_generic_state *scope_info;
union acpi_generic_state *old_scope_info;
ACPI_FUNCTION_TRACE ("ds_scope_stack_push");
......@@ -168,10 +168,10 @@ acpi_ds_scope_stack_push (
acpi_status
acpi_ds_scope_stack_pop (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *scope_info;
acpi_generic_state *new_scope_info;
union acpi_generic_state *scope_info;
union acpi_generic_state *new_scope_info;
ACPI_FUNCTION_TRACE ("ds_scope_stack_pop");
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -49,9 +49,9 @@ acpi_status
acpi_ds_result_insert (
void *object,
u32 index,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_insert");
......@@ -83,7 +83,7 @@ acpi_ds_result_insert (
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Obj=%p [%s] State=%p Num=%X Cur=%X\n",
object, object ? acpi_ut_get_object_type_name ((acpi_operand_object *) object) : "NULL",
object, object ? acpi_ut_get_object_type_name ((union acpi_operand_object *) object) : "NULL",
walk_state, state->results.num_results, walk_state->current_result));
return (AE_OK);
......@@ -106,11 +106,11 @@ acpi_ds_result_insert (
acpi_status
acpi_ds_result_remove (
acpi_operand_object **object,
union acpi_operand_object **object,
u32 index,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_remove");
......@@ -170,11 +170,11 @@ acpi_ds_result_remove (
acpi_status
acpi_ds_result_pop (
acpi_operand_object **object,
acpi_walk_state *walk_state)
union acpi_operand_object **object,
struct acpi_walk_state *walk_state)
{
acpi_native_uint index;
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_pop");
......@@ -230,11 +230,11 @@ acpi_ds_result_pop (
acpi_status
acpi_ds_result_pop_from_bottom (
acpi_operand_object **object,
acpi_walk_state *walk_state)
union acpi_operand_object **object,
struct acpi_walk_state *walk_state)
{
acpi_native_uint index;
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_pop_from_bottom");
......@@ -296,10 +296,10 @@ acpi_ds_result_pop_from_bottom (
acpi_status
acpi_ds_result_push (
acpi_operand_object *object,
acpi_walk_state *walk_state)
union acpi_operand_object *object,
struct acpi_walk_state *walk_state)
{
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_push");
......@@ -328,7 +328,7 @@ acpi_ds_result_push (
state->results.num_results++;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] State=%p Num=%X Cur=%X\n",
object, object ? acpi_ut_get_object_type_name ((acpi_operand_object *) object) : "NULL",
object, object ? acpi_ut_get_object_type_name ((union acpi_operand_object *) object) : "NULL",
walk_state, state->results.num_results, walk_state->current_result));
return (AE_OK);
......@@ -350,9 +350,9 @@ acpi_ds_result_push (
acpi_status
acpi_ds_result_stack_push (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_stack_push");
......@@ -386,9 +386,9 @@ acpi_ds_result_stack_push (
acpi_status
acpi_ds_result_stack_pop (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_NAME ("ds_result_stack_pop");
......@@ -429,7 +429,7 @@ acpi_ds_result_stack_pop (
acpi_status
acpi_ds_obj_stack_delete_all (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
......@@ -466,7 +466,7 @@ acpi_ds_obj_stack_delete_all (
acpi_status
acpi_ds_obj_stack_push (
void *object,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
ACPI_FUNCTION_NAME ("ds_obj_stack_push");
......@@ -486,7 +486,7 @@ acpi_ds_obj_stack_push (
walk_state->num_operands++;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] State=%p #Ops=%X\n",
object, acpi_ut_get_object_type_name ((acpi_operand_object *) object),
object, acpi_ut_get_object_type_name ((union acpi_operand_object *) object),
walk_state, walk_state->num_operands));
return (AE_OK);
......@@ -510,8 +510,8 @@ acpi_ds_obj_stack_push (
acpi_status
acpi_ds_obj_stack_pop_object (
acpi_operand_object **object,
acpi_walk_state *walk_state)
union acpi_operand_object **object,
struct acpi_walk_state *walk_state)
{
ACPI_FUNCTION_NAME ("ds_obj_stack_pop_object");
......@@ -570,7 +570,7 @@ acpi_ds_obj_stack_pop_object (
acpi_status
acpi_ds_obj_stack_pop (
u32 pop_count,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
......@@ -617,10 +617,10 @@ acpi_ds_obj_stack_pop (
acpi_status
acpi_ds_obj_stack_pop_and_delete (
u32 pop_count,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_NAME ("ds_obj_stack_pop_and_delete");
......@@ -670,7 +670,7 @@ acpi_ds_obj_stack_pop_and_delete (
void *
acpi_ds_obj_stack_get_value (
u32 index,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
ACPI_FUNCTION_TRACE_PTR ("ds_obj_stack_get_value", walk_state);
......@@ -706,9 +706,9 @@ acpi_ds_obj_stack_get_value (
*
******************************************************************************/
acpi_walk_state *
struct acpi_walk_state *
acpi_ds_get_current_walk_state (
acpi_thread_state *thread)
struct acpi_thread_state *thread)
{
ACPI_FUNCTION_NAME ("ds_get_current_walk_state");
......@@ -740,8 +740,8 @@ acpi_ds_get_current_walk_state (
void
acpi_ds_push_walk_state (
acpi_walk_state *walk_state,
acpi_thread_state *thread)
struct acpi_walk_state *walk_state,
struct acpi_thread_state *thread)
{
ACPI_FUNCTION_TRACE ("ds_push_walk_state");
......@@ -767,11 +767,11 @@ acpi_ds_push_walk_state (
*
******************************************************************************/
acpi_walk_state *
struct acpi_walk_state *
acpi_ds_pop_walk_state (
acpi_thread_state *thread)
struct acpi_thread_state *thread)
{
acpi_walk_state *walk_state;
struct acpi_walk_state *walk_state;
ACPI_FUNCTION_TRACE ("ds_pop_walk_state");
......@@ -809,14 +809,14 @@ acpi_ds_pop_walk_state (
*
******************************************************************************/
acpi_walk_state *
struct acpi_walk_state *
acpi_ds_create_walk_state (
acpi_owner_id owner_id,
acpi_parse_object *origin,
acpi_operand_object *mth_desc,
acpi_thread_state *thread)
union acpi_parse_object *origin,
union acpi_operand_object *mth_desc,
struct acpi_thread_state *thread)
{
acpi_walk_state *walk_state;
struct acpi_walk_state *walk_state;
acpi_status status;
......@@ -873,18 +873,18 @@ acpi_ds_create_walk_state (
acpi_status
acpi_ds_init_aml_walk (
acpi_walk_state *walk_state,
acpi_parse_object *op,
acpi_namespace_node *method_node,
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
struct acpi_namespace_node *method_node,
u8 *aml_start,
u32 aml_length,
acpi_operand_object **params,
acpi_operand_object **return_obj_desc,
union acpi_operand_object **params,
union acpi_operand_object **return_obj_desc,
u32 pass_number)
{
acpi_status status;
acpi_parse_state *parser_state = &walk_state->parser_state;
acpi_parse_object *extra_op;
struct acpi_parse_state *parser_state = &walk_state->parser_state;
union acpi_parse_object *extra_op;
ACPI_FUNCTION_TRACE ("ds_init_aml_walk");
......@@ -974,9 +974,9 @@ acpi_ds_init_aml_walk (
void
acpi_ds_delete_walk_state (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_generic_state *state;
union acpi_generic_state *state;
ACPI_FUNCTION_TRACE_PTR ("ds_delete_walk_state", walk_state);
......
......@@ -82,9 +82,9 @@ struct acpi_ec {
acpi_handle handle;
unsigned long uid;
unsigned long gpe_bit;
acpi_generic_address status_addr;
acpi_generic_address command_addr;
acpi_generic_address data_addr;
struct acpi_generic_address status_addr;
struct acpi_generic_address command_addr;
struct acpi_generic_address data_addr;
unsigned long global_lock;
spinlock_t lock;
};
......@@ -652,8 +652,8 @@ acpi_ec_start (
int result = 0;
acpi_status status = AE_OK;
struct acpi_ec *ec = NULL;
acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
acpi_resource *resource = NULL;
struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
struct acpi_resource *resource = NULL;
ACPI_FUNCTION_TRACE("acpi_ec_start");
......@@ -674,7 +674,7 @@ acpi_ec_start (
return_VALUE(-ENODEV);
}
resource = (acpi_resource *) buffer.pointer;
resource = (struct acpi_resource *) buffer.pointer;
if (!resource || (resource->id != ACPI_RSTYPE_IO)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid or missing resource\n"));
result = -ENODEV;
......@@ -761,7 +761,7 @@ acpi_ec_ecdt_probe (void)
struct acpi_table_ecdt *ecdt_ptr;
status = acpi_get_firmware_table("ECDT", 1, ACPI_LOGICAL_ADDRESSING,
(acpi_table_header **) &ecdt_ptr);
(struct acpi_table_header **) &ecdt_ptr);
if (ACPI_FAILURE(status))
return 0;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -51,7 +51,7 @@ acpi_ev_gpe_initialize (void)
u32 gpe_register;
u32 gpe_number_index;
u32 gpe_number;
acpi_gpe_register_info *gpe_register_info;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status;
......@@ -148,7 +148,7 @@ acpi_ev_gpe_initialize (void)
/* Allocate the GPE number-to-index translation table */
acpi_gbl_gpe_number_to_index = ACPI_MEM_CALLOCATE (
sizeof (acpi_gpe_index_info) *
sizeof (struct acpi_gpe_index_info) *
((acpi_size) acpi_gbl_gpe_number_max + 1));
if (!acpi_gbl_gpe_number_to_index) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
......@@ -159,13 +159,13 @@ acpi_ev_gpe_initialize (void)
/* Set the Gpe index table to GPE_INVALID */
ACPI_MEMSET (acpi_gbl_gpe_number_to_index, (int) ACPI_GPE_INVALID,
sizeof (acpi_gpe_index_info) * ((acpi_size) acpi_gbl_gpe_number_max + 1));
sizeof (struct acpi_gpe_index_info) * ((acpi_size) acpi_gbl_gpe_number_max + 1));
/* Allocate the GPE register information block */
acpi_gbl_gpe_register_info = ACPI_MEM_CALLOCATE (
(acpi_size) acpi_gbl_gpe_register_count *
sizeof (acpi_gpe_register_info));
sizeof (struct acpi_gpe_register_info));
if (!acpi_gbl_gpe_register_info) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Could not allocate the gpe_register_info table\n"));
......@@ -178,7 +178,7 @@ acpi_ev_gpe_initialize (void)
*/
acpi_gbl_gpe_number_info = ACPI_MEM_CALLOCATE (
((acpi_size) acpi_gbl_gpe_register_count * ACPI_GPE_REGISTER_WIDTH) *
sizeof (acpi_gpe_number_info));
sizeof (struct acpi_gpe_number_info));
if (!acpi_gbl_gpe_number_info) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not allocate the gpe_number_info table\n"));
goto error_exit2;
......@@ -319,7 +319,7 @@ acpi_ev_save_method_info (
/* Extract the name from the object and convert to a string */
ACPI_MOVE_UNALIGNED32_TO_32 (name,
&((acpi_namespace_node *) obj_handle)->name.integer);
&((struct acpi_namespace_node *) obj_handle)->name.integer);
name[ACPI_NAME_SIZE] = 0;
/*
......@@ -369,7 +369,7 @@ acpi_ev_save_method_info (
* for use during dispatch of this GPE.
*/
acpi_gbl_gpe_number_info [gpe_number_index].type = type;
acpi_gbl_gpe_number_info [gpe_number_index].method_node = (acpi_namespace_node *) obj_handle;
acpi_gbl_gpe_number_info [gpe_number_index].method_node = (struct acpi_namespace_node *) obj_handle;
/*
* Enable the GPE (SCIs should be disabled at this point)
......@@ -445,7 +445,7 @@ acpi_ev_gpe_detect (void)
u32 j;
u8 enabled_status_byte;
u8 bit_mask;
acpi_gpe_register_info *gpe_register_info;
struct acpi_gpe_register_info *gpe_register_info;
u32 in_value;
acpi_status status;
......@@ -532,7 +532,7 @@ acpi_ev_asynch_execute_gpe_method (
{
u32 gpe_number = (u32) ACPI_TO_INTEGER (context);
u32 gpe_number_index;
acpi_gpe_number_info gpe_info;
struct acpi_gpe_number_info gpe_info;
acpi_status status;
......@@ -610,7 +610,7 @@ acpi_ev_gpe_dispatch (
u32 gpe_number)
{
u32 gpe_number_index;
acpi_gpe_number_info *gpe_info;
struct acpi_gpe_number_info *gpe_info;
acpi_status status;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -47,7 +47,7 @@
u8
acpi_ev_is_notify_object (
acpi_namespace_node *node)
struct acpi_namespace_node *node)
{
switch (node->type) {
case ACPI_TYPE_DEVICE:
......@@ -132,12 +132,12 @@ acpi_ev_get_gpe_number_index (
acpi_status
acpi_ev_queue_notify_request (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
u32 notify_value)
{
acpi_operand_object *obj_desc;
acpi_operand_object *handler_obj = NULL;
acpi_generic_state *notify_info;
union acpi_operand_object *obj_desc;
union acpi_operand_object *handler_obj = NULL;
union acpi_generic_state *notify_info;
acpi_status status = AE_OK;
......@@ -252,10 +252,10 @@ void ACPI_SYSTEM_XFACE
acpi_ev_notify_dispatch (
void *context)
{
acpi_generic_state *notify_info = (acpi_generic_state *) context;
union acpi_generic_state *notify_info = (union acpi_generic_state *) context;
acpi_notify_handler global_handler = NULL;
void *global_context = NULL;
acpi_operand_object *handler_obj;
union acpi_operand_object *handler_obj;
ACPI_FUNCTION_ENTRY ();
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -121,11 +121,11 @@ acpi_ev_init_address_spaces (
static acpi_status
acpi_ev_execute_reg_method (
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u32 function)
{
acpi_operand_object *params[3];
acpi_operand_object *region_obj2;
union acpi_operand_object *params[3];
union acpi_operand_object *region_obj2;
acpi_status status;
......@@ -203,7 +203,7 @@ acpi_ev_execute_reg_method (
acpi_status
acpi_ev_address_space_dispatch (
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u32 function,
acpi_physical_address address,
u32 bit_width,
......@@ -213,8 +213,8 @@ acpi_ev_address_space_dispatch (
acpi_status status2;
acpi_adr_space_handler handler;
acpi_adr_space_setup region_setup;
acpi_operand_object *handler_desc;
acpi_operand_object *region_obj2;
union acpi_operand_object *handler_desc;
union acpi_operand_object *region_obj2;
void *region_context = NULL;
......@@ -352,15 +352,15 @@ acpi_ev_address_space_dispatch (
void
acpi_ev_detach_region(
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_is_locked)
{
acpi_operand_object *handler_obj;
acpi_operand_object *obj_desc;
acpi_operand_object **last_obj_ptr;
union acpi_operand_object *handler_obj;
union acpi_operand_object *obj_desc;
union acpi_operand_object **last_obj_ptr;
acpi_adr_space_setup region_setup;
void *region_context;
acpi_operand_object *region_obj2;
union acpi_operand_object *region_obj2;
acpi_status status;
......@@ -498,8 +498,8 @@ acpi_ev_detach_region(
acpi_status
acpi_ev_attach_region (
acpi_operand_object *handler_obj,
acpi_operand_object *region_obj,
union acpi_operand_object *handler_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_is_locked)
{
acpi_status status;
......@@ -575,17 +575,17 @@ acpi_ev_addr_handler_helper (
void *context,
void **return_value)
{
acpi_operand_object *handler_obj;
acpi_operand_object *tmp_obj;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
union acpi_operand_object *handler_obj;
union acpi_operand_object *tmp_obj;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *node;
acpi_status status;
ACPI_FUNCTION_NAME ("ev_addr_handler_helper");
handler_obj = (acpi_operand_object *) context;
handler_obj = (union acpi_operand_object *) context;
/* Parameter validation */
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -53,8 +53,8 @@ acpi_ev_system_memory_region_setup (
void *handler_context,
void **region_context)
{
acpi_operand_object *region_desc = (acpi_operand_object *) handle;
acpi_mem_space_context *local_region_context;
union acpi_operand_object *region_desc = (union acpi_operand_object *) handle;
struct acpi_mem_space_context *local_region_context;
ACPI_FUNCTION_TRACE ("ev_system_memory_region_setup");
......@@ -70,7 +70,7 @@ acpi_ev_system_memory_region_setup (
/* Create a new context */
local_region_context = ACPI_MEM_CALLOCATE (sizeof (acpi_mem_space_context));
local_region_context = ACPI_MEM_CALLOCATE (sizeof (struct acpi_mem_space_context));
if (!(local_region_context)) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
......@@ -147,11 +147,11 @@ acpi_ev_pci_config_region_setup (
{
acpi_status status = AE_OK;
acpi_integer temp;
acpi_pci_id *pci_id = *region_context;
acpi_operand_object *handler_obj;
acpi_namespace_node *node;
acpi_operand_object *region_obj = (acpi_operand_object *) handle;
acpi_device_id object_hID;
struct acpi_pci_id *pci_id = *region_context;
union acpi_operand_object *handler_obj;
struct acpi_namespace_node *node;
union acpi_operand_object *region_obj = (union acpi_operand_object *) handle;
struct acpi_device_id object_hID;
ACPI_FUNCTION_TRACE ("ev_pci_config_region_setup");
......@@ -179,7 +179,7 @@ acpi_ev_pci_config_region_setup (
/* Create a new context */
pci_id = ACPI_MEM_CALLOCATE (sizeof (acpi_pci_id));
pci_id = ACPI_MEM_CALLOCATE (sizeof (struct acpi_pci_id));
if (!pci_id) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
......@@ -400,17 +400,17 @@ acpi_ev_default_region_setup (
acpi_status
acpi_ev_initialize_region (
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_locked)
{
acpi_operand_object *handler_obj;
acpi_operand_object *obj_desc;
union acpi_operand_object *handler_obj;
union acpi_operand_object *obj_desc;
acpi_adr_space_type space_id;
acpi_namespace_node *node;
struct acpi_namespace_node *node;
acpi_status status;
acpi_namespace_node *method_node;
struct acpi_namespace_node *method_node;
acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
acpi_operand_object *region_obj2;
union acpi_operand_object *region_obj2;
ACPI_FUNCTION_TRACE_U32 ("ev_initialize_region", acpi_ns_locked);
......
......@@ -6,7 +6,7 @@
******************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -185,9 +185,9 @@ acpi_install_notify_handler (
acpi_notify_handler handler,
void *context)
{
acpi_operand_object *obj_desc;
acpi_operand_object *notify_obj;
acpi_namespace_node *node;
union acpi_operand_object *obj_desc;
union acpi_operand_object *notify_obj;
struct acpi_namespace_node *node;
acpi_status status;
......@@ -339,9 +339,9 @@ acpi_remove_notify_handler (
u32 handler_type,
acpi_notify_handler handler)
{
acpi_operand_object *notify_obj;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
union acpi_operand_object *notify_obj;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *node;
acpi_status status;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -57,9 +57,9 @@ acpi_install_address_space_handler (
acpi_adr_space_setup setup,
void *context)
{
acpi_operand_object *obj_desc;
acpi_operand_object *handler_obj;
acpi_namespace_node *node;
union acpi_operand_object *obj_desc;
union acpi_operand_object *handler_obj;
struct acpi_namespace_node *node;
acpi_status status;
acpi_object_type type;
u16 flags = 0;
......@@ -285,11 +285,11 @@ acpi_remove_address_space_handler (
acpi_adr_space_type space_id,
acpi_adr_space_handler handler)
{
acpi_operand_object *obj_desc;
acpi_operand_object *handler_obj;
acpi_operand_object *region_obj;
acpi_operand_object **last_obj_ptr;
acpi_namespace_node *node;
union acpi_operand_object *obj_desc;
union acpi_operand_object *handler_obj;
union acpi_operand_object *region_obj;
union acpi_operand_object **last_obj_ptr;
struct acpi_namespace_node *node;
acpi_status status;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -52,13 +52,13 @@
acpi_status
acpi_ex_add_table (
acpi_table_header *table,
acpi_namespace_node *parent_node,
acpi_operand_object **ddb_handle)
struct acpi_table_header *table,
struct acpi_namespace_node *parent_node,
union acpi_operand_object **ddb_handle)
{
acpi_status status;
acpi_table_desc table_info;
acpi_operand_object *obj_desc;
struct acpi_table_desc table_info;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE ("ex_add_table");
......@@ -121,16 +121,16 @@ acpi_ex_add_table (
acpi_status
acpi_ex_load_table_op (
acpi_walk_state *walk_state,
acpi_operand_object **return_desc)
struct acpi_walk_state *walk_state,
union acpi_operand_object **return_desc)
{
acpi_status status;
acpi_operand_object **operand = &walk_state->operands[0];
acpi_table_header *table;
acpi_namespace_node *parent_node;
acpi_namespace_node *start_node;
acpi_namespace_node *parameter_node = NULL;
acpi_operand_object *ddb_handle;
union acpi_operand_object **operand = &walk_state->operands[0];
struct acpi_table_header *table;
struct acpi_namespace_node *parent_node;
struct acpi_namespace_node *start_node;
struct acpi_namespace_node *parameter_node = NULL;
union acpi_operand_object *ddb_handle;
ACPI_FUNCTION_TRACE ("ex_load_table_op");
......@@ -225,7 +225,7 @@ acpi_ex_load_table_op (
if (parameter_node) {
/* Store the parameter data into the optional parameter object */
status = acpi_ex_store (operand[5], ACPI_CAST_PTR (acpi_operand_object, parameter_node),
status = acpi_ex_store (operand[5], ACPI_CAST_PTR (union acpi_operand_object, parameter_node),
walk_state);
if (ACPI_FAILURE (status)) {
(void) acpi_ex_unload_table (ddb_handle);
......@@ -253,16 +253,16 @@ acpi_ex_load_table_op (
acpi_status
acpi_ex_load_op (
acpi_operand_object *obj_desc,
acpi_operand_object *target,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
union acpi_operand_object *target,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_operand_object *ddb_handle;
acpi_operand_object *buffer_desc = NULL;
acpi_table_header *table_ptr = NULL;
union acpi_operand_object *ddb_handle;
union acpi_operand_object *buffer_desc = NULL;
struct acpi_table_header *table_ptr = NULL;
u8 *table_data_ptr;
acpi_table_header table_header;
struct acpi_table_header table_header;
u32 i;
ACPI_FUNCTION_TRACE ("ex_load_op");
......@@ -279,7 +279,7 @@ acpi_ex_load_op (
/* Get the table header */
table_header.length = 0;
for (i = 0; i < sizeof (acpi_table_header); i++) {
for (i = 0; i < sizeof (struct acpi_table_header); i++) {
status = acpi_ev_address_space_dispatch (obj_desc, ACPI_READ,
(acpi_physical_address) i, 8,
((u8 *) &table_header) + i);
......@@ -297,8 +297,8 @@ acpi_ex_load_op (
/* Copy the header to the buffer */
ACPI_MEMCPY (table_ptr, &table_header, sizeof (acpi_table_header));
table_data_ptr = ACPI_PTR_ADD (u8, table_ptr, sizeof (acpi_table_header));
ACPI_MEMCPY (table_ptr, &table_header, sizeof (struct acpi_table_header));
table_data_ptr = ACPI_PTR_ADD (u8, table_ptr, sizeof (struct acpi_table_header));
/* Get the table from the op region */
......@@ -331,7 +331,7 @@ acpi_ex_load_op (
goto cleanup;
}
table_ptr = ACPI_CAST_PTR (acpi_table_header, buffer_desc->buffer.pointer);
table_ptr = ACPI_CAST_PTR (struct acpi_table_header, buffer_desc->buffer.pointer);
break;
......@@ -397,11 +397,11 @@ acpi_ex_load_op (
acpi_status
acpi_ex_unload_table (
acpi_operand_object *ddb_handle)
union acpi_operand_object *ddb_handle)
{
acpi_status status = AE_NOT_IMPLEMENTED;
acpi_operand_object *table_desc = ddb_handle;
acpi_table_desc *table_info;
union acpi_operand_object *table_desc = ddb_handle;
struct acpi_table_desc *table_info;
ACPI_FUNCTION_TRACE ("ex_unload_table");
......@@ -421,7 +421,7 @@ acpi_ex_unload_table (
/* Get the actual table descriptor from the ddb_handle */
table_info = (acpi_table_desc *) table_desc->reference.object;
table_info = (struct acpi_table_desc *) table_desc->reference.object;
/*
* Delete the entire namespace under this table Node
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -48,12 +48,12 @@
acpi_status
acpi_ex_convert_to_integer (
acpi_operand_object *obj_desc,
acpi_operand_object **result_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
union acpi_operand_object **result_desc,
struct acpi_walk_state *walk_state)
{
u32 i;
acpi_operand_object *ret_desc;
union acpi_operand_object *ret_desc;
u32 count;
u8 *pointer;
acpi_integer result;
......@@ -182,11 +182,11 @@ acpi_ex_convert_to_integer (
acpi_status
acpi_ex_convert_to_buffer (
acpi_operand_object *obj_desc,
acpi_operand_object **result_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
union acpi_operand_object **result_desc,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *ret_desc;
union acpi_operand_object *ret_desc;
u32 i;
u8 *new_buf;
......@@ -389,13 +389,13 @@ acpi_ex_convert_to_ascii (
acpi_status
acpi_ex_convert_to_string (
acpi_operand_object *obj_desc,
acpi_operand_object **result_desc,
union acpi_operand_object *obj_desc,
union acpi_operand_object **result_desc,
u32 base,
u32 max_length,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object *ret_desc;
union acpi_operand_object *ret_desc;
u32 i;
u32 string_length;
u8 *new_buf;
......@@ -554,9 +554,9 @@ acpi_ex_convert_to_string (
acpi_status
acpi_ex_convert_to_target_type (
acpi_object_type destination_type,
acpi_operand_object *source_desc,
acpi_operand_object **result_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *source_desc,
union acpi_operand_object **result_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -50,10 +50,10 @@
acpi_status
acpi_ex_create_alias (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_namespace_node *target_node;
acpi_namespace_node *alias_node;
struct acpi_namespace_node *target_node;
struct acpi_namespace_node *alias_node;
acpi_status status = AE_OK;
......@@ -62,8 +62,8 @@ acpi_ex_create_alias (
/* Get the source/alias operands (both namespace nodes) */
alias_node = (acpi_namespace_node *) walk_state->operands[0];
target_node = (acpi_namespace_node *) walk_state->operands[1];
alias_node = (struct acpi_namespace_node *) walk_state->operands[0];
target_node = (struct acpi_namespace_node *) walk_state->operands[1];
if (target_node->type == ACPI_TYPE_LOCAL_ALIAS) {
/*
......@@ -72,7 +72,7 @@ acpi_ex_create_alias (
* always exactly one level of indirection away from the
* actual aliased name.
*/
target_node = (acpi_namespace_node *) target_node->object;
target_node = (struct acpi_namespace_node *) target_node->object;
}
/*
......@@ -95,7 +95,7 @@ acpi_ex_create_alias (
* types, the object can change dynamically via a Store.
*/
alias_node->type = ACPI_TYPE_LOCAL_ALIAS;
alias_node->object = ACPI_CAST_PTR (acpi_operand_object, target_node);
alias_node->object = ACPI_CAST_PTR (union acpi_operand_object, target_node);
break;
default:
......@@ -134,10 +134,10 @@ acpi_ex_create_alias (
acpi_status
acpi_ex_create_event (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE ("ex_create_event");
......@@ -161,7 +161,7 @@ acpi_ex_create_event (
/* Attach object to the Node */
status = acpi_ns_attach_object ((acpi_namespace_node *) walk_state->operands[0],
status = acpi_ns_attach_object ((struct acpi_namespace_node *) walk_state->operands[0],
obj_desc, ACPI_TYPE_EVENT);
cleanup:
......@@ -190,10 +190,10 @@ acpi_ex_create_event (
acpi_status
acpi_ex_create_mutex (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("ex_create_mutex", ACPI_WALK_OPERANDS);
......@@ -220,7 +220,7 @@ acpi_ex_create_mutex (
/* Init object and attach to NS node */
obj_desc->mutex.sync_level = (u8) walk_state->operands[1]->integer.value;
obj_desc->mutex.node = (acpi_namespace_node *) walk_state->operands[0];
obj_desc->mutex.node = (struct acpi_namespace_node *) walk_state->operands[0];
status = acpi_ns_attach_object (obj_desc->mutex.node,
obj_desc, ACPI_TYPE_MUTEX);
......@@ -256,12 +256,12 @@ acpi_ex_create_region (
u8 *aml_start,
u32 aml_length,
u8 region_space,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
acpi_operand_object *region_obj2;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *node;
union acpi_operand_object *region_obj2;
ACPI_FUNCTION_TRACE ("ex_create_region");
......@@ -344,14 +344,14 @@ acpi_ex_create_region (
acpi_status
acpi_ex_create_table_region (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
acpi_table_header *table;
acpi_operand_object *region_obj2;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *node;
struct acpi_table_header *table;
union acpi_operand_object *region_obj2;
ACPI_FUNCTION_TRACE ("ex_create_table_region");
......@@ -441,10 +441,10 @@ acpi_ex_create_table_region (
acpi_status
acpi_ex_create_processor (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *obj_desc;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *obj_desc;
acpi_status status;
......@@ -467,7 +467,7 @@ acpi_ex_create_processor (
/* Install the processor object in the parent Node */
status = acpi_ns_attach_object ((acpi_namespace_node *) operand[0],
status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
obj_desc, ACPI_TYPE_PROCESSOR);
......@@ -494,11 +494,11 @@ acpi_ex_create_processor (
acpi_status
acpi_ex_create_power_resource (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object **operand = &walk_state->operands[0];
acpi_status status;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("ex_create_power_resource", walk_state);
......@@ -518,7 +518,7 @@ acpi_ex_create_power_resource (
/* Install the power resource object in the parent Node */
status = acpi_ns_attach_object ((acpi_namespace_node *) operand[0],
status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
obj_desc, ACPI_TYPE_POWER);
......@@ -548,10 +548,10 @@ acpi_status
acpi_ex_create_method (
u8 *aml_start,
u32 aml_length,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *obj_desc;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *obj_desc;
acpi_status status;
u8 method_flags;
......@@ -597,7 +597,7 @@ acpi_ex_create_method (
/* Attach the new object to the method Node */
status = acpi_ns_attach_object ((acpi_namespace_node *) operand[0],
status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
obj_desc, ACPI_TYPE_METHOD);
/* Remove local reference to the object */
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -53,11 +53,11 @@
void
acpi_ex_dump_operand (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
u8 *buf = NULL;
u32 length;
acpi_operand_object **element;
union acpi_operand_object **element;
u16 element_index;
......@@ -86,7 +86,7 @@ acpi_ex_dump_operand (
if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) != ACPI_DESC_TYPE_OPERAND) {
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p is not a local object\n", obj_desc));
ACPI_DUMP_BUFFER (obj_desc, sizeof (acpi_operand_object));
ACPI_DUMP_BUFFER (obj_desc, sizeof (union acpi_operand_object));
return;
}
......@@ -383,7 +383,7 @@ acpi_ex_dump_operand (
void
acpi_ex_dump_operands (
acpi_operand_object **operands,
union acpi_operand_object **operands,
acpi_interpreter_mode interpreter_mode,
char *ident,
u32 num_levels,
......@@ -392,7 +392,7 @@ acpi_ex_dump_operands (
u32 line_number)
{
acpi_native_uint i;
acpi_operand_object **obj_desc;
union acpi_operand_object **obj_desc;
ACPI_FUNCTION_NAME ("ex_dump_operands");
......@@ -493,7 +493,7 @@ acpi_ex_out_address (
void
acpi_ex_dump_node (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
u32 flags)
{
......@@ -531,7 +531,7 @@ acpi_ex_dump_node (
void
acpi_ex_dump_object_descriptor (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
u32 flags)
{
u32 i;
......@@ -547,9 +547,9 @@ acpi_ex_dump_object_descriptor (
}
if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) == ACPI_DESC_TYPE_NAMED) {
acpi_ex_dump_node ((acpi_namespace_node *) obj_desc, flags);
acpi_os_printf ("\nAttached Object (%p):\n", ((acpi_namespace_node *) obj_desc)->object);
acpi_ex_dump_object_descriptor (((acpi_namespace_node *) obj_desc)->object, flags);
acpi_ex_dump_node ((struct acpi_namespace_node *) obj_desc, flags);
acpi_os_printf ("\nAttached Object (%p):\n", ((struct acpi_namespace_node *) obj_desc)->object);
acpi_ex_dump_object_descriptor (((struct acpi_namespace_node *) obj_desc)->object, flags);
return;
}
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -49,12 +49,12 @@
acpi_status
acpi_ex_read_data_from_field (
acpi_walk_state *walk_state,
acpi_operand_object *obj_desc,
acpi_operand_object **ret_buffer_desc)
struct acpi_walk_state *walk_state,
union acpi_operand_object *obj_desc,
union acpi_operand_object **ret_buffer_desc)
{
acpi_status status;
acpi_operand_object *buffer_desc;
union acpi_operand_object *buffer_desc;
acpi_size length;
void *buffer;
u8 locked;
......@@ -186,9 +186,9 @@ acpi_ex_read_data_from_field (
acpi_status
acpi_ex_write_data_to_field (
acpi_operand_object *source_desc,
acpi_operand_object *obj_desc,
acpi_operand_object **result_desc)
union acpi_operand_object *source_desc,
union acpi_operand_object *obj_desc,
union acpi_operand_object **result_desc)
{
acpi_status status;
u32 length;
......@@ -196,7 +196,7 @@ acpi_ex_write_data_to_field (
void *buffer;
void *new_buffer;
u8 locked;
acpi_operand_object *buffer_desc;
union acpi_operand_object *buffer_desc;
ACPI_FUNCTION_TRACE_PTR ("ex_write_data_to_field", obj_desc);
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -51,11 +51,11 @@
acpi_status
acpi_ex_setup_region (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
u32 field_datum_byte_offset)
{
acpi_status status = AE_OK;
acpi_operand_object *rgn_desc;
union acpi_operand_object *rgn_desc;
ACPI_FUNCTION_TRACE_U32 ("ex_setup_region", field_datum_byte_offset);
......@@ -147,13 +147,13 @@ acpi_ex_setup_region (
acpi_status
acpi_ex_access_region (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
u32 field_datum_byte_offset,
acpi_integer *value,
u32 function)
{
acpi_status status;
acpi_operand_object *rgn_desc;
union acpi_operand_object *rgn_desc;
acpi_physical_address address;
......@@ -240,7 +240,7 @@ acpi_ex_access_region (
u8
acpi_ex_register_overflow (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
acpi_integer value)
{
......@@ -286,7 +286,7 @@ acpi_ex_register_overflow (
acpi_status
acpi_ex_field_datum_io (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
u32 field_datum_byte_offset,
acpi_integer *value,
u32 read_write)
......@@ -465,7 +465,7 @@ acpi_ex_field_datum_io (
acpi_status
acpi_ex_write_with_update_rule (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
acpi_integer mask,
acpi_integer field_value,
u32 field_datum_byte_offset)
......@@ -670,7 +670,7 @@ acpi_ex_set_buffer_datum (
acpi_status
acpi_ex_extract_from_field (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
void *buffer,
u32 buffer_length)
{
......@@ -846,7 +846,7 @@ acpi_ex_extract_from_field (
acpi_status
acpi_ex_insert_into_field (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
void *buffer,
u32 buffer_length)
{
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -50,12 +50,12 @@
acpi_status
acpi_ex_get_object_reference (
acpi_operand_object *obj_desc,
acpi_operand_object **return_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
union acpi_operand_object **return_desc,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *reference_obj;
acpi_operand_object *referenced_obj;
union acpi_operand_object *reference_obj;
union acpi_operand_object *referenced_obj;
ACPI_FUNCTION_TRACE_PTR ("ex_get_object_reference", obj_desc);
......@@ -142,12 +142,12 @@ acpi_ex_get_object_reference (
acpi_status
acpi_ex_concat_template (
acpi_operand_object *obj_desc1,
acpi_operand_object *obj_desc2,
acpi_operand_object **actual_return_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc1,
union acpi_operand_object *obj_desc2,
union acpi_operand_object **actual_return_desc,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *return_desc;
union acpi_operand_object *return_desc;
u8 *new_buf;
u8 *end_tag1;
u8 *end_tag2;
......@@ -215,15 +215,15 @@ acpi_ex_concat_template (
acpi_status
acpi_ex_do_concatenate (
acpi_operand_object *obj_desc1,
acpi_operand_object *obj_desc2,
acpi_operand_object **actual_return_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc1,
union acpi_operand_object *obj_desc2,
union acpi_operand_object **actual_return_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status;
u32 i;
acpi_integer this_integer;
acpi_operand_object *return_desc;
union acpi_operand_object *return_desc;
char *new_buf;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -45,9 +45,9 @@
void
acpi_ex_unlink_mutex (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_thread_state *thread = obj_desc->mutex.owner_thread;
struct acpi_thread_state *thread = obj_desc->mutex.owner_thread;
if (!thread) {
......@@ -82,10 +82,10 @@ acpi_ex_unlink_mutex (
void
acpi_ex_link_mutex (
acpi_operand_object *obj_desc,
acpi_thread_state *thread)
union acpi_operand_object *obj_desc,
struct acpi_thread_state *thread)
{
acpi_operand_object *list_head;
union acpi_operand_object *list_head;
list_head = thread->acquired_mutex_list;
......@@ -122,9 +122,9 @@ acpi_ex_link_mutex (
acpi_status
acpi_ex_acquire_mutex (
acpi_operand_object *time_desc,
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *time_desc,
union acpi_operand_object *obj_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status;
......@@ -206,8 +206,8 @@ acpi_ex_acquire_mutex (
acpi_status
acpi_ex_release_mutex (
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status;
......@@ -297,10 +297,10 @@ acpi_ex_release_mutex (
void
acpi_ex_release_all_mutexes (
acpi_thread_state *thread)
struct acpi_thread_state *thread)
{
acpi_operand_object *next = thread->acquired_mutex_list;
acpi_operand_object *this;
union acpi_operand_object *next = thread->acquired_mutex_list;
union acpi_operand_object *this;
acpi_status status;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -73,9 +73,9 @@
acpi_status
acpi_ex_opcode_1A_0T_0R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object **operand = &walk_state->operands[0];
acpi_status status = AE_OK;
......@@ -148,10 +148,10 @@ acpi_ex_opcode_1A_0T_0R (
acpi_status
acpi_ex_opcode_1A_1T_0R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object **operand = &walk_state->operands[0];
ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_1T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -195,12 +195,12 @@ acpi_ex_opcode_1A_1T_0R (
acpi_status
acpi_ex_opcode_1A_1T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *return_desc = NULL;
acpi_operand_object *return_desc2 = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc = NULL;
union acpi_operand_object *return_desc2 = NULL;
u32 temp32;
u32 i;
u32 j;
......@@ -338,7 +338,7 @@ acpi_ex_opcode_1A_1T_1R (
* different than the return value stored in the result descriptor
* (There are really two return values)
*/
if ((acpi_namespace_node *) operand[0] == acpi_gbl_root_node) {
if ((struct acpi_namespace_node *) operand[0] == acpi_gbl_root_node) {
/*
* This means that the object does not exist in the namespace,
* return FALSE
......@@ -486,11 +486,11 @@ acpi_ex_opcode_1A_1T_1R (
acpi_status
acpi_ex_opcode_1A_0T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *temp_desc;
acpi_operand_object *return_desc = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *temp_desc;
union acpi_operand_object *return_desc = NULL;
acpi_status status = AE_OK;
u32 type;
acpi_integer value;
......@@ -695,13 +695,13 @@ acpi_ex_opcode_1A_0T_1R (
*/
status = acpi_ns_get_node_by_path (operand[0]->string.pointer,
walk_state->scope_info->scope.node, ACPI_NS_SEARCH_PARENT,
ACPI_CAST_INDIRECT_PTR (acpi_namespace_node, &return_desc));
ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &return_desc));
if (ACPI_FAILURE (status)) {
goto cleanup;
}
status = acpi_ex_resolve_node_to_value (
ACPI_CAST_INDIRECT_PTR (acpi_namespace_node, &return_desc), walk_state);
ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &return_desc), walk_state);
goto cleanup;
......@@ -720,7 +720,7 @@ acpi_ex_opcode_1A_0T_1R (
* Get the actual object from the Node (This is the dereference).
* -- This case may only happen when a local_x or arg_x is dereferenced above.
*/
return_desc = acpi_ns_get_attached_object ((acpi_namespace_node *) operand[0]);
return_desc = acpi_ns_get_attached_object ((struct acpi_namespace_node *) operand[0]);
}
else {
/*
......@@ -802,7 +802,7 @@ acpi_ex_opcode_1A_0T_1R (
if (ACPI_GET_DESCRIPTOR_TYPE (return_desc) == ACPI_DESC_TYPE_NAMED) {
return_desc = acpi_ns_get_attached_object ((acpi_namespace_node *) return_desc);
return_desc = acpi_ns_get_attached_object ((struct acpi_namespace_node *) return_desc);
}
/* Add another reference to the object! */
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -74,10 +74,10 @@
acpi_status
acpi_ex_opcode_2A_0T_0R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_namespace_node *node;
union acpi_operand_object **operand = &walk_state->operands[0];
struct acpi_namespace_node *node;
acpi_status status = AE_OK;
......@@ -92,7 +92,7 @@ acpi_ex_opcode_2A_0T_0R (
/* The first operand is a namespace node */
node = (acpi_namespace_node *) operand[0];
node = (struct acpi_namespace_node *) operand[0];
/* Notifies allowed on this object? */
......@@ -142,11 +142,11 @@ acpi_ex_opcode_2A_0T_0R (
acpi_status
acpi_ex_opcode_2A_2T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *return_desc1 = NULL;
acpi_operand_object *return_desc2 = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc1 = NULL;
union acpi_operand_object *return_desc2 = NULL;
acpi_status status;
......@@ -239,11 +239,11 @@ acpi_ex_opcode_2A_2T_1R (
acpi_status
acpi_ex_opcode_2A_1T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *return_desc = NULL;
acpi_operand_object *temp_desc = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc = NULL;
union acpi_operand_object *temp_desc = NULL;
u32 index;
acpi_status status = AE_OK;
acpi_size length;
......@@ -499,10 +499,10 @@ acpi_ex_opcode_2A_1T_1R (
acpi_status
acpi_ex_opcode_2A_0T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *return_desc = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc = NULL;
acpi_status status = AE_OK;
u8 logical_result = FALSE;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -71,10 +71,10 @@
acpi_status
acpi_ex_opcode_3A_0T_0R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_signal_fatal_info *fatal;
union acpi_operand_object **operand = &walk_state->operands[0];
struct acpi_signal_fatal_info *fatal;
acpi_status status = AE_OK;
......@@ -91,7 +91,7 @@ acpi_ex_opcode_3A_0T_0R (
(u32) operand[2]->integer.value));
fatal = ACPI_MEM_ALLOCATE (sizeof (acpi_signal_fatal_info));
fatal = ACPI_MEM_ALLOCATE (sizeof (struct acpi_signal_fatal_info));
if (fatal) {
fatal->type = (u32) operand[0]->integer.value;
fatal->code = (u32) operand[1]->integer.value;
......@@ -138,10 +138,10 @@ acpi_ex_opcode_3A_0T_0R (
acpi_status
acpi_ex_opcode_3A_1T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *return_desc = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc = NULL;
char *buffer;
acpi_status status = AE_OK;
acpi_native_uint index;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -148,13 +148,13 @@ acpi_ex_do_match (
acpi_status
acpi_ex_opcode_6A_0T_1R (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *return_desc = NULL;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc = NULL;
acpi_status status = AE_OK;
u32 index;
acpi_operand_object *this_element;
union acpi_operand_object *this_element;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_6A_0T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -50,7 +50,7 @@
static u32
acpi_ex_decode_field_access (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
u8 field_flags,
u32 *return_byte_alignment)
{
......@@ -171,7 +171,7 @@ acpi_ex_decode_field_access (
acpi_status
acpi_ex_prep_common_field_object (
acpi_operand_object *obj_desc,
union acpi_operand_object *obj_desc,
u8 field_flags,
u8 field_attribute,
u32 field_bit_position,
......@@ -289,16 +289,16 @@ acpi_ex_prep_common_field_object (
*
* RETURN: Status
*
* DESCRIPTION: Construct an acpi_operand_object of type def_field and
* DESCRIPTION: Construct an union acpi_operand_object of type def_field and
* connect it to the parent Node.
*
******************************************************************************/
acpi_status
acpi_ex_prep_field_value (
acpi_create_field_info *info)
struct acpi_create_field_info *info)
{
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
u32 type;
acpi_status status;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -61,7 +61,7 @@ acpi_ex_system_memory_space_handler (
{
acpi_status status = AE_OK;
void *logical_addr_ptr = NULL;
acpi_mem_space_context *mem_info = region_context;
struct acpi_mem_space_context *mem_info = region_context;
u32 length;
acpi_size window_size;
#ifndef _HW_ALIGNMENT_SUPPORT
......@@ -324,7 +324,7 @@ acpi_ex_pci_config_space_handler (
void *region_context)
{
acpi_status status = AE_OK;
acpi_pci_id *pci_id;
struct acpi_pci_id *pci_id;
u16 pci_register;
......@@ -343,7 +343,7 @@ acpi_ex_pci_config_space_handler (
* Value - input value for write, output address for read
*
*/
pci_id = (acpi_pci_id *) region_context;
pci_id = (struct acpi_pci_id *) region_context;
pci_register = (u16) (u32) address;
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -62,14 +62,14 @@
acpi_status
acpi_ex_resolve_node_to_value (
acpi_namespace_node **object_ptr,
acpi_walk_state *walk_state)
struct acpi_namespace_node **object_ptr,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object *source_desc;
acpi_operand_object *obj_desc = NULL;
acpi_namespace_node *node;
union acpi_operand_object *source_desc;
union acpi_operand_object *obj_desc = NULL;
struct acpi_namespace_node *node;
acpi_object_type entry_type;
......@@ -77,7 +77,7 @@ acpi_ex_resolve_node_to_value (
/*
* The stack pointer points to a acpi_namespace_node (Node). Get the
* The stack pointer points to a struct acpi_namespace_node (Node). Get the
* object that is attached to the Node.
*/
node = *object_ptr;
......@@ -90,7 +90,7 @@ acpi_ex_resolve_node_to_value (
if (entry_type == ACPI_TYPE_LOCAL_ALIAS) {
/* There is always exactly one level of indirection */
node = (acpi_namespace_node *) node->object;
node = (struct acpi_namespace_node *) node->object;
source_desc = acpi_ns_get_attached_object (node);
entry_type = acpi_ns_get_type ((acpi_handle) node);
*object_ptr = node;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -40,7 +40,7 @@
* FUNCTION: acpi_ex_resolve_to_value
*
* PARAMETERS: **stack_ptr - Points to entry on obj_stack, which can
* be either an (acpi_operand_object *)
* be either an (union acpi_operand_object *)
* or an acpi_handle.
* walk_state - Current method state
*
......@@ -52,8 +52,8 @@
acpi_status
acpi_ex_resolve_to_value (
acpi_operand_object **stack_ptr,
acpi_walk_state *walk_state)
union acpi_operand_object **stack_ptr,
struct acpi_walk_state *walk_state)
{
acpi_status status;
......@@ -68,8 +68,8 @@ acpi_ex_resolve_to_value (
/*
* The entity pointed to by the stack_ptr can be either
* 1) A valid acpi_operand_object, or
* 2) A acpi_namespace_node (named_obj)
* 1) A valid union acpi_operand_object, or
* 2) A struct acpi_namespace_node (named_obj)
*/
if (ACPI_GET_DESCRIPTOR_TYPE (*stack_ptr) == ACPI_DESC_TYPE_OPERAND) {
status = acpi_ex_resolve_object_to_value (stack_ptr, walk_state);
......@@ -84,7 +84,7 @@ acpi_ex_resolve_to_value (
*/
if (ACPI_GET_DESCRIPTOR_TYPE (*stack_ptr) == ACPI_DESC_TYPE_NAMED) {
status = acpi_ex_resolve_node_to_value (
ACPI_CAST_INDIRECT_PTR (acpi_namespace_node, stack_ptr),
ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, stack_ptr),
walk_state);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
......@@ -113,13 +113,13 @@ acpi_ex_resolve_to_value (
acpi_status
acpi_ex_resolve_object_to_value (
acpi_operand_object **stack_ptr,
acpi_walk_state *walk_state)
union acpi_operand_object **stack_ptr,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object *stack_desc;
union acpi_operand_object *stack_desc;
void *temp_node;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
u16 opcode;
......@@ -128,7 +128,7 @@ acpi_ex_resolve_object_to_value (
stack_desc = *stack_ptr;
/* This is an acpi_operand_object */
/* This is an union acpi_operand_object */
switch (ACPI_GET_OBJECT_TYPE (stack_desc)) {
case ACPI_TYPE_LOCAL_REFERENCE:
......@@ -298,13 +298,13 @@ acpi_ex_resolve_object_to_value (
acpi_status
acpi_ex_resolve_multiple (
acpi_walk_state *walk_state,
acpi_operand_object *operand,
struct acpi_walk_state *walk_state,
union acpi_operand_object *operand,
acpi_object_type *return_type,
acpi_operand_object **return_desc)
union acpi_operand_object **return_desc)
{
acpi_operand_object *obj_desc = (void *) operand;
acpi_namespace_node *node;
union acpi_operand_object *obj_desc = (void *) operand;
struct acpi_namespace_node *node;
acpi_object_type type;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -70,7 +70,7 @@ acpi_ex_check_object_type (
* specification, a store to a constant is a noop.)
*/
if ((this_type == ACPI_TYPE_INTEGER) &&
(((acpi_operand_object *) object)->common.flags & AOPOBJ_AML_CONSTANT)) {
(((union acpi_operand_object *) object)->common.flags & AOPOBJ_AML_CONSTANT)) {
return (AE_OK);
}
}
......@@ -112,15 +112,15 @@ acpi_ex_check_object_type (
acpi_status
acpi_ex_resolve_operands (
u16 opcode,
acpi_operand_object **stack_ptr,
acpi_walk_state *walk_state)
union acpi_operand_object **stack_ptr,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
u8 object_type;
void *temp_node;
u32 arg_types;
const acpi_opcode_info *op_info;
const struct acpi_opcode_info *op_info;
u32 this_arg_type;
acpi_object_type type_needed;
......@@ -170,7 +170,7 @@ acpi_ex_resolve_operands (
/* Node */
object_type = ((acpi_namespace_node *) obj_desc)->type;
object_type = ((struct acpi_namespace_node *) obj_desc)->type;
break;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -41,7 +41,7 @@
*
* PARAMETERS: *source_desc - Value to be stored
* *dest_desc - Where to store it. Must be an NS node
* or an acpi_operand_object of type
* or an union acpi_operand_object of type
* Reference;
* walk_state - Current walk state
*
......@@ -57,12 +57,12 @@
acpi_status
acpi_ex_store (
acpi_operand_object *source_desc,
acpi_operand_object *dest_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *source_desc,
union acpi_operand_object *dest_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object *ref_desc = dest_desc;
union acpi_operand_object *ref_desc = dest_desc;
ACPI_FUNCTION_TRACE_PTR ("ex_store", dest_desc);
......@@ -83,7 +83,7 @@ acpi_ex_store (
* Storing an object into a Named node.
*/
status = acpi_ex_store_object_to_node (source_desc,
(acpi_namespace_node *) dest_desc, walk_state);
(struct acpi_namespace_node *) dest_desc, walk_state);
return_ACPI_STATUS (status);
}
......@@ -237,13 +237,13 @@ acpi_ex_store (
acpi_status
acpi_ex_store_object_to_index (
acpi_operand_object *source_desc,
acpi_operand_object *index_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *source_desc,
union acpi_operand_object *index_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object *obj_desc;
acpi_operand_object *new_desc;
union acpi_operand_object *obj_desc;
union acpi_operand_object *new_desc;
u8 value = 0;
......@@ -390,13 +390,13 @@ acpi_ex_store_object_to_index (
acpi_status
acpi_ex_store_object_to_node (
acpi_operand_object *source_desc,
acpi_namespace_node *node,
acpi_walk_state *walk_state)
union acpi_operand_object *source_desc,
struct acpi_namespace_node *node,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_operand_object *target_desc;
acpi_operand_object *new_desc;
union acpi_operand_object *target_desc;
union acpi_operand_object *new_desc;
acpi_object_type target_type;
......
......@@ -7,7 +7,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -50,11 +50,11 @@
acpi_status
acpi_ex_resolve_object (
acpi_operand_object **source_desc_ptr,
union acpi_operand_object **source_desc_ptr,
acpi_object_type target_type,
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
acpi_operand_object *source_desc = *source_desc_ptr;
union acpi_operand_object *source_desc = *source_desc_ptr;
acpi_status status = AE_OK;
......@@ -171,12 +171,12 @@ acpi_ex_resolve_object (
acpi_status
acpi_ex_store_object_to_object (
acpi_operand_object *source_desc,
acpi_operand_object *dest_desc,
acpi_operand_object **new_desc,
acpi_walk_state *walk_state)
union acpi_operand_object *source_desc,
union acpi_operand_object *dest_desc,
union acpi_operand_object **new_desc,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *actual_src_desc;
union acpi_operand_object *actual_src_desc;
acpi_status status = AE_OK;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -47,8 +47,8 @@
acpi_status
acpi_ex_store_buffer_to_buffer (
acpi_operand_object *source_desc,
acpi_operand_object *target_desc)
union acpi_operand_object *source_desc,
union acpi_operand_object *target_desc)
{
u32 length;
u8 *buffer;
......@@ -121,8 +121,8 @@ acpi_ex_store_buffer_to_buffer (
acpi_status
acpi_ex_store_string_to_string (
acpi_operand_object *source_desc,
acpi_operand_object *target_desc)
union acpi_operand_object *source_desc,
union acpi_operand_object *target_desc)
{
u32 length;
u8 *buffer;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -183,8 +183,8 @@ acpi_ex_system_do_suspend (
acpi_status
acpi_ex_system_acquire_mutex (
acpi_operand_object *time_desc,
acpi_operand_object *obj_desc)
union acpi_operand_object *time_desc,
union acpi_operand_object *obj_desc)
{
acpi_status status = AE_OK;
......@@ -227,7 +227,7 @@ acpi_ex_system_acquire_mutex (
acpi_status
acpi_ex_system_release_mutex (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_status status = AE_OK;
......@@ -267,7 +267,7 @@ acpi_ex_system_release_mutex (
acpi_status
acpi_ex_system_signal_event (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_status status = AE_OK;
......@@ -300,8 +300,8 @@ acpi_ex_system_signal_event (
acpi_status
acpi_ex_system_wait_event (
acpi_operand_object *time_desc,
acpi_operand_object *obj_desc)
union acpi_operand_object *time_desc,
union acpi_operand_object *obj_desc)
{
acpi_status status = AE_OK;
......@@ -332,7 +332,7 @@ acpi_ex_system_wait_event (
acpi_status
acpi_ex_system_reset_event (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
acpi_status status = AE_OK;
void *temp_semaphore;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -132,7 +132,7 @@ acpi_ex_exit_interpreter (void)
void
acpi_ex_truncate_for32bit_table (
acpi_operand_object *obj_desc)
union acpi_operand_object *obj_desc)
{
ACPI_FUNCTION_ENTRY ();
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -295,7 +295,7 @@ acpi_hw_get_gpe_status (
u32 in_byte = 0;
u32 register_index = 0;
u8 bit_mask = 0;
acpi_gpe_register_info *gpe_register_info;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status;
......@@ -369,7 +369,7 @@ acpi_hw_disable_non_wakeup_gpes (
void)
{
u32 i;
acpi_gpe_register_info *gpe_register_info;
struct acpi_gpe_register_info *gpe_register_info;
u32 in_value;
acpi_status status;
......@@ -422,7 +422,7 @@ acpi_hw_enable_non_wakeup_gpes (
void)
{
u32 i;
acpi_gpe_register_info *gpe_register_info;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status;
......
......@@ -7,7 +7,7 @@
******************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -121,7 +121,7 @@ acpi_get_sleep_type_data (
u8 *sleep_type_b)
{
acpi_status status = AE_OK;
acpi_operand_object *obj_desc;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE ("acpi_get_sleep_type_data");
......@@ -207,7 +207,7 @@ acpi_get_sleep_type_data (
*
******************************************************************************/
acpi_bit_register_info *
struct acpi_bit_register_info *
acpi_hw_get_bit_register_info (
u32 register_id)
{
......@@ -244,7 +244,7 @@ acpi_get_register (
u32 flags)
{
u32 register_value = 0;
acpi_bit_register_info *bit_reg_info;
struct acpi_bit_register_info *bit_reg_info;
acpi_status status;
......@@ -309,7 +309,7 @@ acpi_set_register (
u32 flags)
{
u32 register_value = 0;
acpi_bit_register_info *bit_reg_info;
struct acpi_bit_register_info *bit_reg_info;
acpi_status status;
......@@ -680,12 +680,12 @@ acpi_status
acpi_hw_low_level_read (
u32 width,
u32 *value,
acpi_generic_address *reg,
struct acpi_generic_address *reg,
u32 offset)
{
acpi_physical_address mem_address;
acpi_io_address io_address;
acpi_pci_id pci_id;
struct acpi_pci_id pci_id;
u16 pci_register;
acpi_status status;
......@@ -770,12 +770,12 @@ acpi_status
acpi_hw_low_level_write (
u32 width,
u32 value,
acpi_generic_address *reg,
struct acpi_generic_address *reg,
u32 offset)
{
acpi_physical_address mem_address;
acpi_io_address io_address;
acpi_pci_id pci_id;
struct acpi_pci_id pci_id;
u16 pci_register;
acpi_status status;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -126,8 +126,8 @@ acpi_enter_sleep_state_prep (
u8 sleep_state)
{
acpi_status status;
acpi_object_list arg_list;
acpi_object arg;
struct acpi_object_list arg_list;
union acpi_object arg;
ACPI_FUNCTION_TRACE ("acpi_enter_sleep_state_prep");
......@@ -185,8 +185,8 @@ acpi_enter_sleep_state (
{
u32 PM1Acontrol;
u32 PM1Bcontrol;
acpi_bit_register_info *sleep_type_reg_info;
acpi_bit_register_info *sleep_enable_reg_info;
struct acpi_bit_register_info *sleep_type_reg_info;
struct acpi_bit_register_info *sleep_enable_reg_info;
u32 in_value;
acpi_status status;
......@@ -332,8 +332,8 @@ acpi_status
acpi_leave_sleep_state (
u8 sleep_state)
{
acpi_object_list arg_list;
acpi_object arg;
struct acpi_object_list arg_list;
union acpi_object arg;
acpi_status status;
......
......@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -128,7 +128,7 @@ acpi_get_timer_duration (
u32 *time_elapsed)
{
u32 delta_ticks = 0;
uint64_overlay normalized_ticks;
union uint64_overlay normalized_ticks;
acpi_status status;
acpi_integer out_quotient;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -28,19 +28,17 @@
#define ACPI_DEBUG_BUFFER_SIZE 4196
typedef struct command_info
struct command_info
{
char *name; /* Command Name */
u8 min_args; /* Minimum arguments required */
};
} COMMAND_INFO;
typedef struct argument_info
struct argument_info
{
char *name; /* Argument Name */
} ARGUMENT_INFO;
};
#define PARAM_LIST(pl) pl
......@@ -71,8 +69,8 @@ acpi_db_terminate (
acpi_status
acpi_db_single_step (
acpi_walk_state *walk_state,
acpi_parse_object *op,
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u32 op_type);
......@@ -92,17 +90,17 @@ acpi_db_unload_acpi_table (
void
acpi_db_set_method_breakpoint (
char *location,
acpi_walk_state *walk_state,
acpi_parse_object *op);
struct acpi_walk_state *walk_state,
union acpi_parse_object *op);
void
acpi_db_set_method_call_breakpoint (
acpi_parse_object *op);
union acpi_parse_object *op);
void
acpi_db_disassemble_aml (
char *statements,
acpi_parse_object *op);
union acpi_parse_object *op);
void
acpi_db_dump_namespace (
......@@ -189,7 +187,7 @@ acpi_db_walk_for_specific_objects (
void
acpi_db_display_method_info (
acpi_parse_object *op);
union acpi_parse_object *op);
void
acpi_db_decode_and_display_object (
......@@ -198,12 +196,12 @@ acpi_db_decode_and_display_object (
void
acpi_db_decode_node (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
void
acpi_db_display_result_object (
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state);
union acpi_operand_object *obj_desc,
struct acpi_walk_state *walk_state);
acpi_status
acpi_db_display_all_methods (
......@@ -211,8 +209,8 @@ acpi_db_display_all_methods (
void
acpi_db_display_internal_object (
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state);
union acpi_operand_object *obj_desc,
struct acpi_walk_state *walk_state);
void
acpi_db_display_arguments (
......@@ -232,12 +230,12 @@ acpi_db_display_calling_tree (
void
acpi_db_display_argument_object (
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state);
union acpi_operand_object *obj_desc,
struct acpi_walk_state *walk_state);
void
acpi_db_dump_parser_descriptor (
acpi_parse_object *op);
union acpi_parse_object *op);
void *
acpi_db_get_pointer (
......@@ -245,7 +243,7 @@ acpi_db_get_pointer (
void
acpi_db_decode_internal_object (
acpi_operand_object *obj_desc);
union acpi_operand_object *obj_desc);
/*
......@@ -266,12 +264,12 @@ acpi_db_create_execution_threads (
acpi_status
acpi_db_execute_method (
acpi_db_method_info *info,
acpi_buffer *return_obj);
struct acpi_db_method_info *info,
struct acpi_buffer *return_obj);
void
acpi_db_execute_setup (
acpi_db_method_info *info);
struct acpi_db_method_info *info);
u32
acpi_db_get_outstanding_allocations (
......@@ -289,11 +287,11 @@ acpi_db_method_thread (
acpi_object_type
acpi_db_match_argument (
char *user_argument,
ARGUMENT_INFO *arguments);
struct argument_info *arguments);
acpi_status
ae_local_load_table (
acpi_table_header *table_ptr);
struct acpi_table_header *table_ptr);
void
acpi_db_close_debug_file (
......@@ -334,8 +332,8 @@ acpi_db_get_from_history (
acpi_status
acpi_db_command_dispatch (
char *input_buffer,
acpi_walk_state *walk_state,
acpi_parse_object *op);
struct acpi_walk_state *walk_state,
union acpi_parse_object *op);
void ACPI_SYSTEM_XFACE
acpi_db_execute_thread (
......@@ -344,7 +342,7 @@ acpi_db_execute_thread (
acpi_status
acpi_db_user_commands (
char prompt,
acpi_parse_object *op);
union acpi_parse_object *op);
void
acpi_db_display_help (
......@@ -374,7 +372,7 @@ acpi_db_single_thread (
void
acpi_db_generate_statistics (
acpi_parse_object *root,
union acpi_parse_object *root,
u8 is_method);
......@@ -395,7 +393,7 @@ acpi_db_count_namespace_objects (
void
acpi_db_enumerate_object (
acpi_operand_object *obj_desc);
union acpi_operand_object *obj_desc);
/*
......@@ -412,7 +410,7 @@ acpi_db_dump_buffer (
void
acpi_db_dump_object (
acpi_object *obj_desc,
union acpi_object *obj_desc,
u32 level);
void
......@@ -422,9 +420,9 @@ acpi_db_prep_namestring (
acpi_status
acpi_db_second_pass_parse (
acpi_parse_object *root);
union acpi_parse_object *root);
acpi_namespace_node *
struct acpi_namespace_node *
acpi_db_local_ns_lookup (
char *name);
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -58,7 +58,7 @@ acpi_ev_fixed_event_dispatch (
u8
acpi_ev_is_notify_object (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
acpi_status
acpi_ev_acquire_global_lock(
......@@ -82,7 +82,7 @@ acpi_ev_get_gpe_number_index (
acpi_status
acpi_ev_queue_notify_request (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
u32 notify_value);
void ACPI_SYSTEM_XFACE
......@@ -120,7 +120,7 @@ acpi_ev_init_address_spaces (
acpi_status
acpi_ev_address_space_dispatch (
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u32 function,
acpi_physical_address address,
u32 bit_width,
......@@ -135,13 +135,13 @@ acpi_ev_addr_handler_helper (
acpi_status
acpi_ev_attach_region (
acpi_operand_object *handler_obj,
acpi_operand_object *region_obj,
union acpi_operand_object *handler_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_is_locked);
void
acpi_ev_detach_region (
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_is_locked);
......@@ -193,7 +193,7 @@ acpi_ev_default_region_setup (
acpi_status
acpi_ev_initialize_region (
acpi_operand_object *region_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_locked);
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -72,12 +72,12 @@ extern u32 acpi_gbl_nesting_level;
*/
ACPI_EXTERN u32 acpi_gbl_table_flags;
ACPI_EXTERN u32 acpi_gbl_rsdt_table_count;
ACPI_EXTERN rsdp_descriptor *acpi_gbl_RSDP;
ACPI_EXTERN xsdt_descriptor *acpi_gbl_XSDT;
ACPI_EXTERN struct rsdp_descriptor *acpi_gbl_RSDP;
ACPI_EXTERN XSDT_DESCRIPTOR *acpi_gbl_XSDT;
ACPI_EXTERN FADT_DESCRIPTOR *acpi_gbl_FADT;
ACPI_EXTERN acpi_table_header *acpi_gbl_DSDT;
ACPI_EXTERN struct acpi_table_header *acpi_gbl_DSDT;
ACPI_EXTERN FACS_DESCRIPTOR *acpi_gbl_FACS;
ACPI_EXTERN acpi_common_facs acpi_gbl_common_fACS;
ACPI_EXTERN struct acpi_common_facs acpi_gbl_common_fACS;
/*
* Handle both ACPI 1.0 and ACPI 2.0 Integer widths
......@@ -96,15 +96,15 @@ ACPI_EXTERN u8 acpi_gbl_integer_byte_width;
/*
* ACPI Table info arrays
*/
extern acpi_table_desc acpi_gbl_acpi_tables[NUM_ACPI_TABLES];
extern ACPI_TABLE_SUPPORT acpi_gbl_acpi_table_data[NUM_ACPI_TABLES];
extern struct acpi_table_desc acpi_gbl_acpi_tables[NUM_ACPI_TABLES];
extern struct acpi_table_support acpi_gbl_acpi_table_data[NUM_ACPI_TABLES];
/*
* Predefined mutex objects. This array contains the
* actual OS mutex handles, indexed by the local ACPI_MUTEX_HANDLEs.
* (The table maps local handles to the real OS handles)
*/
ACPI_EXTERN acpi_mutex_info acpi_gbl_acpi_mutex_info [NUM_MTX];
ACPI_EXTERN struct acpi_mutex_info acpi_gbl_acpi_mutex_info [NUM_MTX];
/*****************************************************************************
......@@ -114,11 +114,11 @@ ACPI_EXTERN acpi_mutex_info acpi_gbl_acpi_mutex_info [NUM_MTX];
****************************************************************************/
ACPI_EXTERN acpi_memory_list acpi_gbl_memory_lists[ACPI_NUM_MEM_LISTS];
ACPI_EXTERN acpi_object_notify_handler acpi_gbl_drv_notify;
ACPI_EXTERN acpi_object_notify_handler acpi_gbl_sys_notify;
ACPI_EXTERN struct acpi_memory_list acpi_gbl_memory_lists[ACPI_NUM_MEM_LISTS];
ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_drv_notify;
ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_sys_notify;
ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;
ACPI_EXTERN acpi_walk_state *acpi_gbl_breakpoint_walk;
ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;
ACPI_EXTERN acpi_handle acpi_gbl_global_lock_semaphore;
ACPI_EXTERN u32 acpi_gbl_global_lock_thread_count;
......@@ -141,7 +141,7 @@ extern u8 acpi_gbl_shutdown;
extern u32 acpi_gbl_startup_flags;
extern const u8 acpi_gbl_decode_to8bit[8];
extern const char *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT];
extern const acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
......@@ -159,11 +159,11 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINE
#define NUM_PREDEFINED_NAMES 9
#endif
ACPI_EXTERN acpi_namespace_node acpi_gbl_root_node_struct;
ACPI_EXTERN acpi_namespace_node *acpi_gbl_root_node;
ACPI_EXTERN struct acpi_namespace_node acpi_gbl_root_node_struct;
ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_root_node;
extern const u8 acpi_gbl_ns_properties[NUM_NS_TYPES];
extern const acpi_predefined_names acpi_gbl_pre_defined_names [NUM_PREDEFINED_NAMES];
extern const struct acpi_predefined_names acpi_gbl_pre_defined_names [NUM_PREDEFINED_NAMES];
#ifdef ACPI_DEBUG_OUTPUT
ACPI_EXTERN u32 acpi_gbl_current_node_count;
......@@ -181,7 +181,7 @@ ACPI_EXTERN u32 acpi_gbl_deepest_nesting;
****************************************************************************/
ACPI_EXTERN acpi_thread_state *acpi_gbl_current_walk_list;
ACPI_EXTERN struct acpi_thread_state *acpi_gbl_current_walk_list;
/* Control method single step flag */
......@@ -194,7 +194,7 @@ ACPI_EXTERN u8 acpi_gbl_cm_single_step;
*
****************************************************************************/
ACPI_EXTERN acpi_parse_object *acpi_gbl_parsed_namespace_root;
ACPI_EXTERN union acpi_parse_object *acpi_gbl_parsed_namespace_root;
/*****************************************************************************
*
......@@ -202,7 +202,7 @@ ACPI_EXTERN acpi_parse_object *acpi_gbl_parsed_namespace_root;
*
****************************************************************************/
extern acpi_bit_register_info acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
extern struct acpi_bit_register_info acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
ACPI_EXTERN u8 acpi_gbl_sleep_type_a;
ACPI_EXTERN u8 acpi_gbl_sleep_type_b;
......@@ -213,15 +213,15 @@ ACPI_EXTERN u8 acpi_gbl_sleep_type_b;
*
****************************************************************************/
extern acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];
ACPI_EXTERN acpi_fixed_event_handler acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
extern struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];
ACPI_EXTERN struct acpi_fixed_event_handler acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
ACPI_EXTERN acpi_handle acpi_gbl_gpe_obj_handle;
ACPI_EXTERN u32 acpi_gbl_gpe_register_count;
ACPI_EXTERN u32 acpi_gbl_gpe_number_max;
ACPI_EXTERN acpi_gpe_register_info *acpi_gbl_gpe_register_info;
ACPI_EXTERN acpi_gpe_number_info *acpi_gbl_gpe_number_info;
ACPI_EXTERN acpi_gpe_block_info acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLOCKS];
ACPI_EXTERN struct acpi_gpe_register_info *acpi_gbl_gpe_register_info;
ACPI_EXTERN struct acpi_gpe_number_info *acpi_gbl_gpe_number_info;
ACPI_EXTERN struct acpi_gpe_block_info acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLOCKS];
/*
* GPE translation table
......@@ -230,7 +230,7 @@ ACPI_EXTERN acpi_gpe_block_info acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLO
* This table is needed because the GPE numbers supported by block 1 do not
* have to be contiguous with the GPE numbers supported by block 0.
*/
ACPI_EXTERN acpi_gpe_index_info *acpi_gbl_gpe_number_to_index;
ACPI_EXTERN struct acpi_gpe_index_info *acpi_gbl_gpe_number_to_index;
/*****************************************************************************
......@@ -273,8 +273,8 @@ ACPI_EXTERN char *acpi_gbl_db_buffer;
ACPI_EXTERN char *acpi_gbl_db_filename;
ACPI_EXTERN u32 acpi_gbl_db_debug_level;
ACPI_EXTERN u32 acpi_gbl_db_console_debug_level;
ACPI_EXTERN acpi_table_header *acpi_gbl_db_table_ptr;
ACPI_EXTERN acpi_namespace_node *acpi_gbl_db_scope_node;
ACPI_EXTERN struct acpi_table_header *acpi_gbl_db_table_ptr;
ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node;
/*
* Statistic globals
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -59,7 +59,7 @@ acpi_hw_get_mode_capabilities (
/* Register I/O Prototypes */
acpi_bit_register_info *
struct acpi_bit_register_info *
acpi_hw_get_bit_register_info (
u32 register_id);
......@@ -79,14 +79,14 @@ acpi_status
acpi_hw_low_level_read (
u32 width,
u32 *value,
acpi_generic_address *reg,
struct acpi_generic_address *reg,
u32 offset);
acpi_status
acpi_hw_low_level_write (
u32 width,
u32 value,
acpi_generic_address *reg,
struct acpi_generic_address *reg,
u32 offset);
acpi_status
......
This diff is collapsed.
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -67,7 +67,7 @@
* Full 64-bit address/integer on both 32-bit and 64-bit platforms
*/
#define ACPI_LODWORD(l) ((u32)(u64)(l))
#define ACPI_HIDWORD(l) ((u32)(((*(uint64_struct *)(void *)(&l))).hi))
#define ACPI_HIDWORD(l) ((u32)(((*(struct uint64_struct *)(void *)(&l))).hi))
#define ACPI_GET_ADDRESS(a) (a)
#define ACPI_STORE_ADDRESS(a,b) ((a)=(acpi_physical_address)(b))
......@@ -249,19 +249,19 @@
#define ACPI_REGISTER_INSERT_VALUE(reg, pos, mask, val) reg = (reg & (~(mask))) | ACPI_REGISTER_PREPARE_BITS(val, pos, mask)
/*
* An acpi_namespace_node * can appear in some contexts,
* where a pointer to an acpi_operand_object can also
* An struct acpi_namespace_node * can appear in some contexts,
* where a pointer to an union acpi_operand_object can also
* appear. This macro is used to distinguish them.
*
* The "Descriptor" field is the first field in both structures.
*/
#define ACPI_GET_DESCRIPTOR_TYPE(d) (((acpi_descriptor *)(void *)(d))->descriptor_id)
#define ACPI_SET_DESCRIPTOR_TYPE(d,t) (((acpi_descriptor *)(void *)(d))->descriptor_id = t)
#define ACPI_GET_DESCRIPTOR_TYPE(d) (((union acpi_descriptor *)(void *)(d))->descriptor_id)
#define ACPI_SET_DESCRIPTOR_TYPE(d,t) (((union acpi_descriptor *)(void *)(d))->descriptor_id = t)
/* Macro to test the object type */
#define ACPI_GET_OBJECT_TYPE(d) (((acpi_operand_object *)(void *)(d))->common.type)
#define ACPI_GET_OBJECT_TYPE(d) (((union acpi_operand_object *)(void *)(d))->common.type)
/* Macro to check the table flags for SINGLE or MULTIPLE tables are allowed */
......@@ -389,7 +389,7 @@
* as a local string ("_proc_name) so that it can be also used by the function exit macros below.
*/
#define ACPI_FUNCTION_NAME(a) acpi_debug_print_info _dbg; \
#define ACPI_FUNCTION_NAME(a) struct acpi_debug_print_info _dbg; \
_dbg.component_id = _COMPONENT; \
_dbg.proc_name = a; \
_dbg.module_name = _THIS_MODULE;
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -101,11 +101,11 @@ acpi_ns_walk_namespace (
void *context,
void **return_value);
acpi_namespace_node *
struct acpi_namespace_node *
acpi_ns_get_next_node (
acpi_object_type type,
acpi_namespace_node *parent,
acpi_namespace_node *child);
struct acpi_namespace_node *parent,
struct acpi_namespace_node *child);
void
acpi_ns_delete_namespace_by_owner (
......@@ -117,17 +117,17 @@ acpi_ns_delete_namespace_by_owner (
acpi_status
acpi_ns_one_complete_parse (
u32 pass_number,
acpi_table_desc *table_desc);
struct acpi_table_desc *table_desc);
acpi_status
acpi_ns_parse_table (
acpi_table_desc *table_desc,
acpi_namespace_node *scope);
struct acpi_table_desc *table_desc,
struct acpi_namespace_node *scope);
acpi_status
acpi_ns_load_table (
acpi_table_desc *table_desc,
acpi_namespace_node *node);
struct acpi_table_desc *table_desc,
struct acpi_namespace_node *node);
acpi_status
acpi_ns_load_table_by_type (
......@@ -144,38 +144,38 @@ acpi_ns_root_initialize (
acpi_status
acpi_ns_lookup (
acpi_generic_state *scope_info,
union acpi_generic_state *scope_info,
char *name,
acpi_object_type type,
acpi_interpreter_mode interpreter_mode,
u32 flags,
acpi_walk_state *walk_state,
acpi_namespace_node **ret_node);
struct acpi_walk_state *walk_state,
struct acpi_namespace_node **ret_node);
/*
* Named object allocation/deallocation - nsalloc
*/
acpi_namespace_node *
struct acpi_namespace_node *
acpi_ns_create_node (
u32 name);
void
acpi_ns_delete_node (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
void
acpi_ns_delete_namespace_subtree (
acpi_namespace_node *parent_handle);
struct acpi_namespace_node *parent_handle);
void
acpi_ns_detach_object (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
void
acpi_ns_delete_children (
acpi_namespace_node *parent);
struct acpi_namespace_node *parent);
int
acpi_ns_compare_names (
......@@ -254,33 +254,33 @@ acpi_ns_dump_objects (
acpi_status
acpi_ns_evaluate_by_handle (
acpi_namespace_node *prefix_node,
acpi_operand_object **params,
acpi_operand_object **return_object);
struct acpi_namespace_node *prefix_node,
union acpi_operand_object **params,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_evaluate_by_name (
char *pathname,
acpi_operand_object **params,
acpi_operand_object **return_object);
union acpi_operand_object **params,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_evaluate_relative (
acpi_namespace_node *prefix_node,
struct acpi_namespace_node *prefix_node,
char *pathname,
acpi_operand_object **params,
acpi_operand_object **return_object);
union acpi_operand_object **params,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_execute_control_method (
acpi_namespace_node *method_node,
acpi_operand_object **params,
acpi_operand_object **return_obj_desc);
struct acpi_namespace_node *method_node,
union acpi_operand_object **params,
union acpi_operand_object **return_obj_desc);
acpi_status
acpi_ns_get_object_value (
acpi_namespace_node *object_node,
acpi_operand_object **return_obj_desc);
struct acpi_namespace_node *object_node,
union acpi_operand_object **return_obj_desc);
/*
......@@ -289,7 +289,7 @@ acpi_ns_get_object_value (
acpi_name
acpi_ns_find_parent_name (
acpi_namespace_node *node_to_search);
struct acpi_namespace_node *node_to_search);
/*
......@@ -302,38 +302,38 @@ acpi_ns_opens_scope (
void
acpi_ns_build_external_path (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
acpi_size size,
char *name_buffer);
char *
acpi_ns_get_external_pathname (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
char *
acpi_ns_name_of_current_scope (
acpi_walk_state *walk_state);
struct acpi_walk_state *walk_state);
acpi_status
acpi_ns_handle_to_pathname (
acpi_handle target_handle,
acpi_buffer *buffer);
struct acpi_buffer *buffer);
u8
acpi_ns_pattern_match (
acpi_namespace_node *obj_node,
struct acpi_namespace_node *obj_node,
char *search_for);
acpi_status
acpi_ns_get_node_by_path (
char *external_pathname,
acpi_namespace_node *in_prefix_node,
struct acpi_namespace_node *in_prefix_node,
u32 flags,
acpi_namespace_node **out_node);
struct acpi_namespace_node **out_node);
acpi_size
acpi_ns_get_pathname_length (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
/*
......@@ -342,32 +342,32 @@ acpi_ns_get_pathname_length (
acpi_status
acpi_ns_attach_object (
acpi_namespace_node *node,
acpi_operand_object *object,
struct acpi_namespace_node *node,
union acpi_operand_object *object,
acpi_object_type type);
acpi_operand_object *
union acpi_operand_object *
acpi_ns_get_attached_object (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
acpi_operand_object *
union acpi_operand_object *
acpi_ns_get_secondary_object (
acpi_operand_object *obj_desc);
union acpi_operand_object *obj_desc);
acpi_status
acpi_ns_attach_data (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
acpi_object_handler handler,
void *data);
acpi_status
acpi_ns_detach_data (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
acpi_object_handler handler);
acpi_status
acpi_ns_get_attached_data (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
acpi_object_handler handler,
void **data);
......@@ -379,25 +379,25 @@ acpi_ns_get_attached_data (
acpi_status
acpi_ns_search_and_enter (
u32 entry_name,
acpi_walk_state *walk_state,
acpi_namespace_node *node,
struct acpi_walk_state *walk_state,
struct acpi_namespace_node *node,
acpi_interpreter_mode interpreter_mode,
acpi_object_type type,
u32 flags,
acpi_namespace_node **ret_node);
struct acpi_namespace_node **ret_node);
acpi_status
acpi_ns_search_node (
u32 entry_name,
acpi_namespace_node *node,
struct acpi_namespace_node *node,
acpi_object_type type,
acpi_namespace_node **ret_node);
struct acpi_namespace_node **ret_node);
void
acpi_ns_install_node (
acpi_walk_state *walk_state,
acpi_namespace_node *parent_node,
acpi_namespace_node *node,
struct acpi_walk_state *walk_state,
struct acpi_namespace_node *parent_node,
struct acpi_namespace_node *node,
acpi_object_type type);
......@@ -415,7 +415,7 @@ acpi_ns_valid_path_separator (
acpi_object_type
acpi_ns_get_type (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
u32
acpi_ns_local (
......@@ -435,22 +435,22 @@ acpi_ns_report_method_error (
u32 line_number,
u32 component_id,
char *message,
acpi_namespace_node *node,
struct acpi_namespace_node *node,
char *path,
acpi_status lookup_status);
void
acpi_ns_print_node_pathname (
acpi_namespace_node *node,
struct acpi_namespace_node *node,
char *msg);
acpi_status
acpi_ns_build_internal_name (
acpi_namestring_info *info);
struct acpi_namestring_info *info);
void
acpi_ns_get_internal_name_length (
acpi_namestring_info *info);
struct acpi_namestring_info *info);
acpi_status
acpi_ns_internalize_name (
......@@ -464,26 +464,26 @@ acpi_ns_externalize_name (
u32 *converted_name_length,
char **converted_name);
acpi_namespace_node *
struct acpi_namespace_node *
acpi_ns_map_handle_to_node (
acpi_handle handle);
acpi_handle
acpi_ns_convert_entry_to_handle(
acpi_namespace_node *node);
struct acpi_namespace_node *node);
void
acpi_ns_terminate (
void);
acpi_namespace_node *
struct acpi_namespace_node *
acpi_ns_get_parent_node (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
acpi_namespace_node *
struct acpi_namespace_node *
acpi_ns_get_next_valid_node (
acpi_namespace_node *node);
struct acpi_namespace_node *node);
#endif /* __ACNAMESP_H__ */
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -9,7 +9,7 @@
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -49,13 +49,12 @@
#define ACPI_SIGNAL_FATAL 0
#define ACPI_SIGNAL_BREAKPOINT 1
typedef struct acpi_fatal_info
struct acpi_signal_fatal_info
{
u32 type;
u32 code;
u32 argument;
} acpi_signal_fatal_info;
};
/*
......@@ -91,12 +90,12 @@ acpi_os_terminate (
acpi_status
acpi_os_get_root_pointer (
u32 flags,
acpi_pointer *address);
struct acpi_pointer *address);
acpi_status
acpi_os_table_override (
acpi_table_header *existing_table,
acpi_table_header **new_table);
struct acpi_table_header *existing_table,
struct acpi_table_header **new_table);
/*
......@@ -234,15 +233,15 @@ acpi_os_write_memory (
acpi_status
acpi_os_read_pci_configuration (
acpi_pci_id *pci_id,
u32 reg,
struct acpi_pci_id *pci_id,
u32 register,
void *value,
u32 width);
acpi_status
acpi_os_write_pci_configuration (
acpi_pci_id *pci_id,
u32 reg,
struct acpi_pci_id *pci_id,
u32 register,
acpi_integer value,
u32 width);
......@@ -253,7 +252,7 @@ void
acpi_os_derive_pci_id(
acpi_handle rhandle,
acpi_handle chandle,
acpi_pci_id **pci_id);
struct acpi_pci_id **pci_id);
/*
* Miscellaneous
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -30,18 +30,18 @@
/*
* ACPI 1.0 Root System Description Table (RSDT)
*/
typedef struct
struct rsdt_descriptor_rev1
{
acpi_table_header header; /* ACPI Table header */
struct acpi_table_header header; /* ACPI Table header */
u32 table_offset_entry [1]; /* Array of pointers to other */
/* ACPI tables */
} RSDT_DESCRIPTOR_REV1;
};
/*
* ACPI 1.0 Firmware ACPI Control Structure (FACS)
*/
typedef struct
struct facs_descriptor_rev1
{
char signature[4]; /* ACPI Signature */
u32 length; /* Length of structure, in bytes */
......@@ -51,16 +51,15 @@ typedef struct
u32 S4bios_f : 1; /* Indicates if S4BIOS support is present */
u32 reserved1 : 31; /* Must be 0 */
u8 resverved3 [40]; /* Reserved - must be zero */
} facs_descriptor_rev1;
};
/*
* ACPI 1.0 Fixed ACPI Description Table (FADT)
*/
typedef struct
struct fadt_descriptor_rev1
{
acpi_table_header header; /* ACPI Table header */
struct acpi_table_header header; /* ACPI Table header */
u32 firmware_ctrl; /* Physical address of FACS */
u32 dsdt; /* Physical address of DSDT */
u8 model; /* System Interrupt Model */
......@@ -109,8 +108,7 @@ typedef struct
u32 rtcs4 : 1; /* RTC wakeup stat not possible from S4 */
u32 tmr_val_ext : 1; /* The tmr_val width is 32 bits (0 = 24 bits) */
u32 reserved5 : 23; /* Reserved - must be zero */
} fadt_descriptor_rev1;
};
#pragma pack()
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -7,7 +7,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2002, R. Byron Moore
* Copyright (C) 2000 - 2003, R. Byron Moore
*
* 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
......@@ -53,7 +53,7 @@ acpi_ns_dump_one_device (
void *context,
void **return_value)
{
acpi_device_info info;
struct acpi_device_info info;
acpi_status status;
u32 i;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment