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,15 +57,15 @@
acpi_status
acpi_ds_create_buffer_field (
acpi_parse_object *op,
acpi_walk_state *walk_state)
union acpi_parse_object *op,
struct acpi_walk_state *walk_state)
{
acpi_parse_object *arg;
acpi_namespace_node *node;
acpi_status status;
acpi_operand_object *obj_desc;
acpi_operand_object *second_desc = NULL;
u32 flags;
union acpi_parse_object *arg;
struct acpi_namespace_node *node;
acpi_status status;
union acpi_operand_object *obj_desc;
union acpi_operand_object *second_desc = NULL;
u32 flags;
ACPI_FUNCTION_TRACE ("ds_create_buffer_field");
......@@ -182,12 +182,12 @@ 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;
acpi_status status;
acpi_integer position;
ACPI_FUNCTION_TRACE_PTR ("ds_get_field_names", info);
......@@ -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;
acpi_status status;
union acpi_parse_object *arg;
struct acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("ds_create_field", op);
......@@ -368,13 +368,13 @@ 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;
u8 type = 0;
acpi_status status;
union acpi_parse_object *arg = NULL;
struct acpi_namespace_node *node;
u8 type = 0;
ACPI_FUNCTION_TRACE_PTR ("ds_init_field_objects", op);
......@@ -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;
acpi_status status;
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;
acpi_status status;
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
......@@ -56,14 +56,14 @@
acpi_status
acpi_ds_init_one_object (
acpi_handle obj_handle,
u32 level,
void *context,
void **return_value)
acpi_handle obj_handle,
u32 level,
void *context,
void **return_value)
{
acpi_object_type type;
acpi_status status;
acpi_init_walk_info *info = (acpi_init_walk_info *) context;
acpi_object_type type;
acpi_status status;
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;
acpi_status status;
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
......@@ -55,14 +55,14 @@
acpi_status
acpi_ds_parse_method (
acpi_handle obj_handle)
acpi_handle obj_handle)
{
acpi_status status;
acpi_operand_object *obj_desc;
acpi_parse_object *op;
acpi_namespace_node *node;
acpi_owner_id owner_id;
acpi_walk_state *walk_state;
acpi_status status;
union acpi_operand_object *obj_desc;
union acpi_parse_object *op;
struct acpi_namespace_node *node;
acpi_owner_id owner_id;
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,11 +177,11 @@ 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;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("ds_begin_method_execution", method_node);
......@@ -242,15 +242,15 @@ 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;
u32 i;
acpi_status status;
struct acpi_namespace_node *method_node;
union acpi_operand_object *obj_desc;
struct acpi_walk_state *next_walk_state;
u32 i;
ACPI_FUNCTION_TRACE_PTR ("ds_call_control_method", this_walk_state);
......@@ -376,10 +376,10 @@ 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;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_restart_control_method", walk_state);
......@@ -431,11 +431,11 @@ 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;
acpi_status status;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *method_node;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_terminate_control_method", 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
......@@ -57,9 +57,9 @@
void
acpi_ds_method_data_init (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
u32 i;
ACPI_FUNCTION_TRACE ("ds_method_data_init");
......@@ -107,9 +107,9 @@ 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;
u32 index;
ACPI_FUNCTION_TRACE ("ds_method_data_delete_all");
......@@ -163,12 +163,12 @@ acpi_ds_method_data_delete_all (
acpi_status
acpi_ds_method_data_init_args (
acpi_operand_object **params,
u32 max_param_count,
acpi_walk_state *walk_state)
union acpi_operand_object **params,
u32 max_param_count,
struct acpi_walk_state *walk_state)
{
acpi_status status;
u32 index = 0;
acpi_status status;
u32 index = 0;
ACPI_FUNCTION_TRACE_PTR ("ds_method_data_init_args", params);
......@@ -215,10 +215,10 @@ acpi_ds_method_data_init_args (
acpi_status
acpi_ds_method_data_get_node (
u16 opcode,
u32 index,
acpi_walk_state *walk_state,
acpi_namespace_node **node)
u16 opcode,
u32 index,
struct acpi_walk_state *walk_state,
struct acpi_namespace_node **node)
{
ACPI_FUNCTION_TRACE ("ds_method_data_get_node");
......@@ -280,14 +280,14 @@ acpi_ds_method_data_get_node (
acpi_status
acpi_ds_method_data_set_value (
u16 opcode,
u32 index,
acpi_operand_object *object,
acpi_walk_state *walk_state)
u16 opcode,
u32 index,
union acpi_operand_object *object,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *new_desc = object;
acpi_status status;
struct acpi_namespace_node *node;
union acpi_operand_object *new_desc = object;
ACPI_FUNCTION_TRACE ("ds_method_data_set_value");
......@@ -347,13 +347,13 @@ acpi_ds_method_data_set_value (
acpi_object_type
acpi_ds_method_data_get_type (
u16 opcode,
u32 index,
acpi_walk_state *walk_state)
u16 opcode,
u32 index,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *object;
acpi_status status;
struct acpi_namespace_node *node;
union acpi_operand_object *object;
ACPI_FUNCTION_TRACE ("ds_method_data_get_type");
......@@ -401,14 +401,14 @@ acpi_ds_method_data_get_type (
acpi_status
acpi_ds_method_data_get_value (
u16 opcode,
u32 index,
acpi_walk_state *walk_state,
acpi_operand_object **dest_desc)
u16 opcode,
u32 index,
struct acpi_walk_state *walk_state,
union acpi_operand_object **dest_desc)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *object;
acpi_status status;
struct acpi_namespace_node *node;
union acpi_operand_object *object;
ACPI_FUNCTION_TRACE ("ds_method_data_get_value");
......@@ -490,13 +490,13 @@ acpi_ds_method_data_get_value (
void
acpi_ds_method_data_delete_value (
u16 opcode,
u32 index,
acpi_walk_state *walk_state)
u16 opcode,
u32 index,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_namespace_node *node;
acpi_operand_object *object;
acpi_status status;
struct acpi_namespace_node *node;
union acpi_operand_object *object;
ACPI_FUNCTION_TRACE ("ds_method_data_delete_value");
......@@ -553,14 +553,14 @@ acpi_ds_method_data_delete_value (
acpi_status
acpi_ds_store_object_to_local (
u16 opcode,
u32 index,
acpi_operand_object *obj_desc,
acpi_walk_state *walk_state)
u16 opcode,
u32 index,
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;
acpi_status status;
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,12 +52,12 @@
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;
acpi_status status;
union acpi_operand_object *obj_desc;
acpi_status status;
ACPI_FUNCTION_TRACE ("ds_build_internal_object");
......@@ -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,15 +119,15 @@ acpi_ds_build_internal_object (
acpi_status
acpi_ds_build_internal_buffer_obj (
acpi_walk_state *walk_state,
acpi_parse_object *op,
u32 buffer_length,
acpi_operand_object **obj_desc_ptr)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u32 buffer_length,
union acpi_operand_object **obj_desc_ptr)
{
acpi_parse_object *arg;
acpi_operand_object *obj_desc;
acpi_parse_object *byte_list;
u32 byte_list_length = 0;
union acpi_parse_object *arg;
union acpi_operand_object *obj_desc;
union acpi_parse_object *byte_list;
u32 byte_list_length = 0;
ACPI_FUNCTION_TRACE ("ds_build_internal_buffer_obj");
......@@ -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,17 +227,17 @@ acpi_ds_build_internal_buffer_obj (
acpi_status
acpi_ds_build_internal_package_obj (
acpi_walk_state *walk_state,
acpi_parse_object *op,
u32 package_length,
acpi_operand_object **obj_desc_ptr)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u32 package_length,
union acpi_operand_object **obj_desc_ptr)
{
acpi_parse_object *arg;
acpi_parse_object *parent;
acpi_operand_object *obj_desc = NULL;
u32 package_list_length;
acpi_status status = AE_OK;
u32 i;
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;
ACPI_FUNCTION_TRACE ("ds_build_internal_package_obj");
......@@ -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;
acpi_status status;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("ds_create_node", op);
......@@ -413,14 +413,14 @@ acpi_ds_create_node (
acpi_status
acpi_ds_init_object_from_op (
acpi_walk_state *walk_state,
acpi_parse_object *op,
u16 opcode,
acpi_operand_object **ret_obj_desc)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
u16 opcode,
union acpi_operand_object **ret_obj_desc)
{
const acpi_opcode_info *op_info;
acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
const struct acpi_opcode_info *op_info;
union acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ds_init_object_from_op");
......@@ -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,
u32 aml_length,
u8 *aml_start)
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;
acpi_status status;
union acpi_parse_object *op;
struct acpi_walk_state *walk_state;
union acpi_parse_object *arg;
ACPI_FUNCTION_TRACE ("acpi_ds_execute_arguments");
......@@ -153,11 +153,11 @@ 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;
acpi_status status;
union acpi_operand_object *extra_desc;
struct acpi_namespace_node *node;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_get_buffer_field_arguments", obj_desc);
......@@ -199,10 +199,10 @@ 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;
acpi_status status;
struct acpi_namespace_node *node;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_get_buffer_arguments", obj_desc);
......@@ -246,10 +246,10 @@ 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;
acpi_status status;
struct acpi_namespace_node *node;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_get_package_arguments", obj_desc);
......@@ -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;
acpi_status status;
acpi_operand_object *extra_desc;
struct acpi_namespace_node *node;
acpi_status status;
union acpi_operand_object *extra_desc;
ACPI_FUNCTION_TRACE_PTR ("ds_get_region_arguments", obj_desc);
......@@ -342,10 +342,10 @@ acpi_ds_get_region_arguments (
acpi_status
acpi_ds_initialize_region (
acpi_handle obj_handle)
acpi_handle obj_handle)
{
acpi_operand_object *obj_desc;
acpi_status status;
union acpi_operand_object *obj_desc;
acpi_status status;
obj_desc = acpi_ns_get_attached_object (obj_handle);
......@@ -376,18 +376,18 @@ 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)
u16 aml_opcode,
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;
u32 bit_count;
u8 field_flags;
acpi_status status;
u32 offset;
u32 bit_offset;
u32 bit_count;
u8 field_flags;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_init_buffer_field", obj_desc);
......@@ -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;
acpi_status status;
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;
acpi_status status;
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,13 +743,13 @@ 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;
u32 length;
acpi_status status;
union acpi_operand_object *arg_desc;
u32 length;
ACPI_FUNCTION_TRACE ("ds_eval_data_object_operands");
......@@ -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;
acpi_status status = AE_OK;
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;
acpi_status status = AE_OK;
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,12 +200,12 @@ 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;
acpi_status status;
union acpi_operand_object *obj_desc;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ds_delete_result_if_not_used", result_obj);
......@@ -251,10 +251,10 @@ 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;
u32 i;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("ds_resolve_operands", walk_state);
......@@ -289,9 +289,9 @@ acpi_ds_resolve_operands (
void
acpi_ds_clear_operands (
acpi_walk_state *walk_state)
struct acpi_walk_state *walk_state)
{
u32 i;
u32 i;
ACPI_FUNCTION_TRACE_PTR ("acpi_ds_clear_operands", walk_state);
......@@ -333,18 +333,18 @@ acpi_ds_clear_operands (
acpi_status
acpi_ds_create_operand (
acpi_walk_state *walk_state,
acpi_parse_object *arg,
u32 arg_index)
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;
u16 opcode;
acpi_interpreter_mode interpreter_mode;
const acpi_opcode_info *op_info;
acpi_status status = AE_OK;
char *name_string;
u32 name_length;
union acpi_operand_object *obj_desc;
union acpi_parse_object *parent_op;
u16 opcode;
acpi_interpreter_mode interpreter_mode;
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,12 +543,12 @@ 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;
u32 arg_count = 0;
acpi_status status = AE_OK;
union acpi_parse_object *arg;
u32 arg_count = 0;
ACPI_FUNCTION_TRACE_PTR ("ds_create_operands", first_arg);
......
......@@ -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) {
acpi_status status = AE_OK;
acpi_operand_object *obj_desc;
struct acpi_walk_state *walk_state,
union acpi_operand_object *result_obj) {
acpi_status status = AE_OK;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("ds_get_predicate_value", walk_state);
......@@ -179,12 +179,12 @@ 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;
acpi_status status = AE_OK;
u32 opcode_class;
union acpi_parse_object *op;
acpi_status status = AE_OK;
u32 opcode_class;
ACPI_FUNCTION_TRACE_PTR ("ds_exec_begin_op", walk_state);
......@@ -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;
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 *op;
acpi_status status = AE_OK;
u32 op_type;
u32 op_class;
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,8 +51,8 @@
acpi_status
acpi_ds_init_callbacks (
acpi_walk_state *walk_state,
u32 pass_number)
struct acpi_walk_state *walk_state,
u32 pass_number)
{
switch (pass_number) {
......@@ -100,15 +100,15 @@ 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;
acpi_status status;
acpi_object_type object_type;
char *path;
u32 flags;
union acpi_parse_object *op;
struct acpi_namespace_node *node;
acpi_status status;
acpi_object_type object_type;
char *path;
u32 flags;
ACPI_FUNCTION_NAME ("ds_load1_begin_op");
......@@ -303,11 +303,11 @@ 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;
acpi_object_type object_type;
acpi_status status = AE_OK;
union acpi_parse_object *op;
acpi_object_type object_type;
acpi_status status = AE_OK;
ACPI_FUNCTION_NAME ("ds_load1_end_op");
......@@ -415,14 +415,14 @@ 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;
acpi_status status;
acpi_object_type object_type;
char *buffer_ptr;
union acpi_parse_object *op;
struct acpi_namespace_node *node;
acpi_status status;
acpi_object_type object_type;
char *buffer_ptr;
ACPI_FUNCTION_TRACE ("ds_load2_begin_op");
......@@ -627,16 +627,16 @@ 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;
acpi_status status = AE_OK;
acpi_object_type object_type;
acpi_namespace_node *node;
acpi_parse_object *arg;
acpi_namespace_node *new_node;
union acpi_parse_object *op;
acpi_status status = AE_OK;
acpi_object_type object_type;
struct acpi_namespace_node *node;
union acpi_parse_object *arg;
struct acpi_namespace_node *new_node;
#ifndef ACPI_NO_METHOD_EXECUTION
u32 i;
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,
acpi_object_type type,
acpi_walk_state *walk_state)
struct acpi_namespace_node *node,
acpi_object_type type,
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
......@@ -47,11 +47,11 @@
acpi_status
acpi_ds_result_insert (
void *object,
u32 index,
acpi_walk_state *walk_state)
void *object,
u32 index,
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,
u32 index,
acpi_walk_state *walk_state)
union acpi_operand_object **object,
u32 index,
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;
acpi_native_uint index;
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;
acpi_native_uint index;
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,9 +429,9 @@ 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;
u32 i;
ACPI_FUNCTION_TRACE_PTR ("ds_obj_stack_delete_all", walk_state);
......@@ -465,8 +465,8 @@ acpi_ds_obj_stack_delete_all (
acpi_status
acpi_ds_obj_stack_push (
void *object,
acpi_walk_state *walk_state)
void *object,
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");
......@@ -569,10 +569,10 @@ acpi_ds_obj_stack_pop_object (
acpi_status
acpi_ds_obj_stack_pop (
u32 pop_count,
acpi_walk_state *walk_state)
u32 pop_count,
struct acpi_walk_state *walk_state)
{
u32 i;
u32 i;
ACPI_FUNCTION_NAME ("ds_obj_stack_pop");
......@@ -616,11 +616,11 @@ acpi_ds_obj_stack_pop (
acpi_status
acpi_ds_obj_stack_pop_and_delete (
u32 pop_count,
acpi_walk_state *walk_state)
u32 pop_count,
struct acpi_walk_state *walk_state)
{
u32 i;
acpi_operand_object *obj_desc;
u32 i;
union acpi_operand_object *obj_desc;
ACPI_FUNCTION_NAME ("ds_obj_stack_pop_and_delete");
......@@ -669,8 +669,8 @@ acpi_ds_obj_stack_pop_and_delete (
void *
acpi_ds_obj_stack_get_value (
u32 index,
acpi_walk_state *walk_state)
u32 index,
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,15 +809,15 @@ 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)
acpi_owner_id owner_id,
union acpi_parse_object *origin,
union acpi_operand_object *mth_desc,
struct acpi_thread_state *thread)
{
acpi_walk_state *walk_state;
acpi_status status;
struct acpi_walk_state *walk_state;
acpi_status status;
ACPI_FUNCTION_TRACE ("ds_create_walk_state");
......@@ -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,
u8 *aml_start,
u32 aml_length,
acpi_operand_object **params,
acpi_operand_object **return_obj_desc,
u32 pass_number)
struct acpi_walk_state *walk_state,
union acpi_parse_object *op,
struct acpi_namespace_node *method_node,
u8 *aml_start,
u32 aml_length,
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;
acpi_status status;
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);
......
......@@ -79,14 +79,14 @@ static struct acpi_driver acpi_ec_driver = {
};
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;
unsigned long global_lock;
spinlock_t lock;
acpi_handle handle;
unsigned long uid;
unsigned long gpe_bit;
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;
};
/* If we find an EC via the ECDT, we need to keep a ptr to its context */
......@@ -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
......@@ -45,7 +45,7 @@ acpi_status
acpi_ev_initialize (
void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_initialize");
......@@ -99,7 +99,7 @@ acpi_status
acpi_ev_handler_initialize (
void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_handler_initialize");
......@@ -156,8 +156,8 @@ acpi_status
acpi_ev_fixed_event_initialize (
void)
{
acpi_native_uint i;
acpi_status status;
acpi_native_uint i;
acpi_status status;
/*
......@@ -199,10 +199,10 @@ u32
acpi_ev_fixed_event_detect (
void)
{
u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
u32 fixed_status;
u32 fixed_enable;
acpi_native_uint i;
u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
u32 fixed_status;
u32 fixed_enable;
acpi_native_uint i;
ACPI_FUNCTION_NAME ("ev_fixed_event_detect");
......@@ -252,7 +252,7 @@ acpi_ev_fixed_event_detect (
u32
acpi_ev_fixed_event_dispatch (
u32 event)
u32 event)
{
......
......@@ -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
......@@ -45,14 +45,14 @@
acpi_status
acpi_ev_gpe_initialize (void)
{
acpi_native_uint i;
acpi_native_uint j;
u32 gpe_block;
u32 gpe_register;
u32 gpe_number_index;
u32 gpe_number;
acpi_gpe_register_info *gpe_register_info;
acpi_status status;
acpi_native_uint i;
acpi_native_uint j;
u32 gpe_block;
u32 gpe_register;
u32 gpe_number_index;
u32 gpe_number;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_gpe_initialize");
......@@ -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;
......@@ -301,16 +301,16 @@ acpi_ev_gpe_initialize (void)
static acpi_status
acpi_ev_save_method_info (
acpi_handle obj_handle,
u32 level,
void *obj_desc,
void **return_value)
acpi_handle obj_handle,
u32 level,
void *obj_desc,
void **return_value)
{
u32 gpe_number;
u32 gpe_number_index;
char name[ACPI_NAME_SIZE + 1];
u8 type;
acpi_status status;
u32 gpe_number;
u32 gpe_number_index;
char name[ACPI_NAME_SIZE + 1];
u8 type;
acpi_status status;
ACPI_FUNCTION_NAME ("ev_save_method_info");
......@@ -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)
......@@ -401,7 +401,7 @@ acpi_ev_save_method_info (
acpi_status
acpi_ev_init_gpe_control_methods (void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_init_gpe_control_methods");
......@@ -440,14 +440,14 @@ acpi_ev_init_gpe_control_methods (void)
u32
acpi_ev_gpe_detect (void)
{
u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
u32 i;
u32 j;
u8 enabled_status_byte;
u8 bit_mask;
acpi_gpe_register_info *gpe_register_info;
u32 in_value;
acpi_status status;
u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
u32 i;
u32 j;
u8 enabled_status_byte;
u8 bit_mask;
struct acpi_gpe_register_info *gpe_register_info;
u32 in_value;
acpi_status status;
ACPI_FUNCTION_NAME ("ev_gpe_detect");
......@@ -528,12 +528,12 @@ acpi_ev_gpe_detect (void)
static void ACPI_SYSTEM_XFACE
acpi_ev_asynch_execute_gpe_method (
void *context)
void *context)
{
u32 gpe_number = (u32) ACPI_TO_INTEGER (context);
u32 gpe_number_index;
acpi_gpe_number_info gpe_info;
acpi_status status;
u32 gpe_number = (u32) ACPI_TO_INTEGER (context);
u32 gpe_number_index;
struct acpi_gpe_number_info gpe_info;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_asynch_execute_gpe_method");
......@@ -607,11 +607,11 @@ acpi_ev_asynch_execute_gpe_method (
u32
acpi_ev_gpe_dispatch (
u32 gpe_number)
u32 gpe_number)
{
u32 gpe_number_index;
acpi_gpe_number_info *gpe_info;
acpi_status status;
u32 gpe_number_index;
struct acpi_gpe_number_info *gpe_info;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_gpe_dispatch");
......
......@@ -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:
......@@ -80,7 +80,7 @@ acpi_ev_is_notify_object (
u32
acpi_ev_get_gpe_register_index (
u32 gpe_number)
u32 gpe_number)
{
if (gpe_number > acpi_gbl_gpe_number_max) {
......@@ -106,7 +106,7 @@ acpi_ev_get_gpe_register_index (
u32
acpi_ev_get_gpe_number_index (
u32 gpe_number)
u32 gpe_number)
{
if (gpe_number > acpi_gbl_gpe_number_max) {
......@@ -132,13 +132,13 @@ acpi_ev_get_gpe_number_index (
acpi_status
acpi_ev_queue_notify_request (
acpi_namespace_node *node,
u32 notify_value)
struct acpi_namespace_node *node,
u32 notify_value)
{
acpi_operand_object *obj_desc;
acpi_operand_object *handler_obj = NULL;
acpi_generic_state *notify_info;
acpi_status status = AE_OK;
union acpi_operand_object *obj_desc;
union acpi_operand_object *handler_obj = NULL;
union acpi_generic_state *notify_info;
acpi_status status = AE_OK;
ACPI_FUNCTION_NAME ("ev_queue_notify_request");
......@@ -250,12 +250,12 @@ acpi_ev_queue_notify_request (
void ACPI_SYSTEM_XFACE
acpi_ev_notify_dispatch (
void *context)
void *context)
{
acpi_generic_state *notify_info = (acpi_generic_state *) context;
acpi_notify_handler global_handler = NULL;
void *global_context = NULL;
acpi_operand_object *handler_obj;
union acpi_generic_state *notify_info = (union acpi_generic_state *) context;
acpi_notify_handler global_handler = NULL;
void *global_context = NULL;
union acpi_operand_object *handler_obj;
ACPI_FUNCTION_ENTRY ();
......@@ -316,9 +316,9 @@ acpi_ev_notify_dispatch (
static void ACPI_SYSTEM_XFACE
acpi_ev_global_lock_thread (
void *context)
void *context)
{
acpi_status status;
acpi_status status;
/* Signal threads that are waiting for the lock */
......@@ -349,10 +349,10 @@ acpi_ev_global_lock_thread (
static u32
acpi_ev_global_lock_handler (
void *context)
void *context)
{
u8 acquired = FALSE;
acpi_status status;
u8 acquired = FALSE;
acpi_status status;
/*
......@@ -395,7 +395,7 @@ acpi_ev_global_lock_handler (
acpi_status
acpi_ev_init_global_lock_handler (void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_init_global_lock_handler");
......@@ -433,10 +433,10 @@ acpi_ev_init_global_lock_handler (void)
acpi_status
acpi_ev_acquire_global_lock (
u16 timeout)
u16 timeout)
{
acpi_status status = AE_OK;
u8 acquired = FALSE;
acpi_status status = AE_OK;
u8 acquired = FALSE;
ACPI_FUNCTION_TRACE ("ev_acquire_global_lock");
......@@ -499,8 +499,8 @@ acpi_ev_acquire_global_lock (
acpi_status
acpi_ev_release_global_lock (void)
{
u8 pending = FALSE;
acpi_status status = AE_OK;
u8 pending = FALSE;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ev_release_global_lock");
......@@ -554,8 +554,8 @@ acpi_ev_release_global_lock (void)
void
acpi_ev_terminate (void)
{
acpi_native_uint i;
acpi_status status;
acpi_native_uint i;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_terminate");
......
......@@ -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,7 +48,7 @@ acpi_status
acpi_ev_init_address_spaces (
void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_init_address_spaces");
......@@ -121,12 +121,12 @@ acpi_ev_init_address_spaces (
static acpi_status
acpi_ev_execute_reg_method (
acpi_operand_object *region_obj,
u32 function)
union acpi_operand_object *region_obj,
u32 function)
{
acpi_operand_object *params[3];
acpi_operand_object *region_obj2;
acpi_status status;
union acpi_operand_object *params[3];
union acpi_operand_object *region_obj2;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_execute_reg_method");
......@@ -203,19 +203,19 @@ acpi_ev_execute_reg_method (
acpi_status
acpi_ev_address_space_dispatch (
acpi_operand_object *region_obj,
u32 function,
acpi_physical_address address,
u32 bit_width,
void *value)
union acpi_operand_object *region_obj,
u32 function,
acpi_physical_address address,
u32 bit_width,
void *value)
{
acpi_status status;
acpi_status status2;
acpi_adr_space_handler handler;
acpi_adr_space_setup region_setup;
acpi_operand_object *handler_desc;
acpi_operand_object *region_obj2;
void *region_context = NULL;
acpi_status status;
acpi_status status2;
acpi_adr_space_handler handler;
acpi_adr_space_setup region_setup;
union acpi_operand_object *handler_desc;
union acpi_operand_object *region_obj2;
void *region_context = NULL;
ACPI_FUNCTION_TRACE ("ev_address_space_dispatch");
......@@ -352,16 +352,16 @@ acpi_ev_address_space_dispatch (
void
acpi_ev_detach_region(
acpi_operand_object *region_obj,
u8 acpi_ns_is_locked)
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;
acpi_adr_space_setup region_setup;
void *region_context;
acpi_operand_object *region_obj2;
acpi_status status;
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;
union acpi_operand_object *region_obj2;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_detach_region");
......@@ -498,12 +498,12 @@ acpi_ev_detach_region(
acpi_status
acpi_ev_attach_region (
acpi_operand_object *handler_obj,
acpi_operand_object *region_obj,
u8 acpi_ns_is_locked)
union acpi_operand_object *handler_obj,
union acpi_operand_object *region_obj,
u8 acpi_ns_is_locked)
{
acpi_status status;
acpi_status status2;
acpi_status status;
acpi_status status2;
ACPI_FUNCTION_TRACE ("ev_attach_region");
......@@ -570,22 +570,22 @@ acpi_ev_attach_region (
acpi_status
acpi_ev_addr_handler_helper (
acpi_handle obj_handle,
u32 level,
void *context,
void **return_value)
acpi_handle obj_handle,
u32 level,
void *context,
void **return_value)
{
acpi_operand_object *handler_obj;
acpi_operand_object *tmp_obj;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
acpi_status status;
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
......@@ -48,13 +48,13 @@
acpi_status
acpi_ev_system_memory_region_setup (
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
acpi_handle handle,
u32 function,
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);
}
......@@ -102,10 +102,10 @@ acpi_ev_system_memory_region_setup (
acpi_status
acpi_ev_io_space_region_setup (
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
{
ACPI_FUNCTION_TRACE ("ev_io_space_region_setup");
......@@ -140,18 +140,18 @@ acpi_ev_io_space_region_setup (
acpi_status
acpi_ev_pci_config_region_setup (
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
{
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;
acpi_status status = AE_OK;
acpi_integer temp;
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);
}
......@@ -297,10 +297,10 @@ acpi_ev_pci_config_region_setup (
acpi_status
acpi_ev_pci_bar_region_setup (
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
{
ACPI_FUNCTION_TRACE ("ev_pci_bar_region_setup");
......@@ -328,10 +328,10 @@ acpi_ev_pci_bar_region_setup (
acpi_status
acpi_ev_cmos_region_setup (
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
{
ACPI_FUNCTION_TRACE ("ev_cmos_region_setup");
......@@ -357,10 +357,10 @@ acpi_ev_cmos_region_setup (
acpi_status
acpi_ev_default_region_setup (
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
acpi_handle handle,
u32 function,
void *handler_context,
void **region_context)
{
ACPI_FUNCTION_TRACE ("ev_default_region_setup");
......@@ -400,17 +400,17 @@ acpi_ev_default_region_setup (
acpi_status
acpi_ev_initialize_region (
acpi_operand_object *region_obj,
u8 acpi_ns_locked)
union acpi_operand_object *region_obj,
u8 acpi_ns_locked)
{
acpi_operand_object *handler_obj;
acpi_operand_object *obj_desc;
acpi_adr_space_type space_id;
acpi_namespace_node *node;
acpi_status status;
acpi_namespace_node *method_node;
acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
acpi_operand_object *region_obj2;
union acpi_operand_object *handler_obj;
union acpi_operand_object *obj_desc;
acpi_adr_space_type space_id;
struct acpi_namespace_node *node;
acpi_status status;
struct acpi_namespace_node *method_node;
acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
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
......@@ -47,11 +47,11 @@
static u32 ACPI_SYSTEM_XFACE
acpi_ev_sci_handler (
void *context)
void *context)
{
u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
u32 value;
acpi_status status;
u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
u32 value;
acpi_status status;
ACPI_FUNCTION_TRACE("ev_sci_handler");
......@@ -105,7 +105,7 @@ acpi_ev_sci_handler (
u32
acpi_ev_install_sci_handler (void)
{
u32 status = AE_OK;
u32 status = AE_OK;
ACPI_FUNCTION_TRACE ("ev_install_sci_handler");
......@@ -139,7 +139,7 @@ acpi_ev_install_sci_handler (void)
acpi_status
acpi_ev_remove_sci_handler (void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ev_remove_sci_handler");
......
......@@ -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,11 +50,11 @@
acpi_status
acpi_install_fixed_event_handler (
u32 event,
acpi_event_handler handler,
void *context)
u32 event,
acpi_event_handler handler,
void *context)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("acpi_install_fixed_event_handler");
......@@ -119,10 +119,10 @@ acpi_install_fixed_event_handler (
acpi_status
acpi_remove_fixed_event_handler (
u32 event,
acpi_event_handler handler)
u32 event,
acpi_event_handler handler)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("acpi_remove_fixed_event_handler");
......@@ -180,15 +180,15 @@ acpi_remove_fixed_event_handler (
acpi_status
acpi_install_notify_handler (
acpi_handle device,
u32 handler_type,
acpi_notify_handler handler,
void *context)
acpi_handle device,
u32 handler_type,
acpi_notify_handler handler,
void *context)
{
acpi_operand_object *obj_desc;
acpi_operand_object *notify_obj;
acpi_namespace_node *node;
acpi_status status;
union acpi_operand_object *obj_desc;
union acpi_operand_object *notify_obj;
struct acpi_namespace_node *node;
acpi_status status;
ACPI_FUNCTION_TRACE ("acpi_install_notify_handler");
......@@ -335,14 +335,14 @@ acpi_install_notify_handler (
acpi_status
acpi_remove_notify_handler (
acpi_handle device,
u32 handler_type,
acpi_notify_handler handler)
acpi_handle device,
u32 handler_type,
acpi_notify_handler handler)
{
acpi_operand_object *notify_obj;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
acpi_status status;
union acpi_operand_object *notify_obj;
union acpi_operand_object *obj_desc;
struct acpi_namespace_node *node;
acpi_status status;
ACPI_FUNCTION_TRACE ("acpi_remove_notify_handler");
......@@ -467,13 +467,13 @@ acpi_remove_notify_handler (
acpi_status
acpi_install_gpe_handler (
u32 gpe_number,
u32 type,
acpi_gpe_handler handler,
void *context)
u32 gpe_number,
u32 type,
acpi_gpe_handler handler,
void *context)
{
acpi_status status;
u32 gpe_number_index;
acpi_status status;
u32 gpe_number_index;
ACPI_FUNCTION_TRACE ("acpi_install_gpe_handler");
......@@ -541,11 +541,11 @@ acpi_install_gpe_handler (
acpi_status
acpi_remove_gpe_handler (
u32 gpe_number,
acpi_gpe_handler handler)
u32 gpe_number,
acpi_gpe_handler handler)
{
acpi_status status;
u32 gpe_number_index;
acpi_status status;
u32 gpe_number_index;
ACPI_FUNCTION_TRACE ("acpi_remove_gpe_handler");
......@@ -611,10 +611,10 @@ acpi_remove_gpe_handler (
acpi_status
acpi_acquire_global_lock (
u16 timeout,
u32 *handle)
u16 timeout,
u32 *handle)
{
acpi_status status;
acpi_status status;
if (!handle) {
......@@ -652,9 +652,9 @@ acpi_acquire_global_lock (
acpi_status
acpi_release_global_lock (
u32 handle)
u32 handle)
{
acpi_status status;
acpi_status status;
if (handle != acpi_gbl_global_lock_handle) {
......
......@@ -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
......@@ -45,7 +45,7 @@
acpi_status
acpi_enable (void)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("acpi_enable");
......@@ -92,7 +92,7 @@ acpi_enable (void)
acpi_status
acpi_disable (void)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("acpi_disable");
......@@ -138,12 +138,12 @@ acpi_disable (void)
acpi_status
acpi_enable_event (
u32 event,
u32 type,
u32 flags)
u32 event,
u32 type,
u32 flags)
{
acpi_status status = AE_OK;
u32 value;
acpi_status status = AE_OK;
u32 value;
ACPI_FUNCTION_TRACE ("acpi_enable_event");
......@@ -232,12 +232,12 @@ acpi_enable_event (
acpi_status
acpi_disable_event (
u32 event,
u32 type,
u32 flags)
u32 event,
u32 type,
u32 flags)
{
acpi_status status = AE_OK;
u32 value;
acpi_status status = AE_OK;
u32 value;
ACPI_FUNCTION_TRACE ("acpi_disable_event");
......@@ -323,10 +323,10 @@ acpi_disable_event (
acpi_status
acpi_clear_event (
u32 event,
u32 type)
u32 event,
u32 type)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("acpi_clear_event");
......@@ -391,11 +391,11 @@ acpi_clear_event (
acpi_status
acpi_get_event_status (
u32 event,
u32 type,
acpi_event_status *event_status)
u32 event,
u32 type,
acpi_event_status *event_status)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("acpi_get_event_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
......@@ -51,18 +51,18 @@
acpi_status
acpi_install_address_space_handler (
acpi_handle device,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler,
acpi_adr_space_setup setup,
void *context)
acpi_handle device,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler,
acpi_adr_space_setup setup,
void *context)
{
acpi_operand_object *obj_desc;
acpi_operand_object *handler_obj;
acpi_namespace_node *node;
acpi_status status;
acpi_object_type type;
u16 flags = 0;
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;
ACPI_FUNCTION_TRACE ("acpi_install_address_space_handler");
......@@ -281,16 +281,16 @@ acpi_install_address_space_handler (
acpi_status
acpi_remove_address_space_handler (
acpi_handle device,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler)
acpi_handle device,
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;
acpi_status status;
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;
ACPI_FUNCTION_TRACE ("acpi_remove_address_space_handler");
......
......@@ -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;
acpi_status status;
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;
acpi_status status;
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,17 +253,17 @@ 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;
u8 *table_data_ptr;
acpi_table_header table_header;
u32 i;
acpi_status status;
union acpi_operand_object *ddb_handle;
union acpi_operand_object *buffer_desc = NULL;
struct acpi_table_header *table_ptr = NULL;
u8 *table_data_ptr;
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;
acpi_status status = AE_NOT_IMPLEMENTED;
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,16 +48,16 @@
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;
u32 count;
u8 *pointer;
acpi_integer result;
acpi_status status;
u32 i;
union acpi_operand_object *ret_desc;
u32 count;
u8 *pointer;
acpi_integer result;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ex_convert_to_integer", obj_desc);
......@@ -182,13 +182,13 @@ 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;
u32 i;
u8 *new_buf;
union acpi_operand_object *ret_desc;
u32 i;
u8 *new_buf;
ACPI_FUNCTION_TRACE_PTR ("ex_convert_to_buffer", obj_desc);
......@@ -283,19 +283,19 @@ acpi_ex_convert_to_buffer (
u32
acpi_ex_convert_to_ascii (
acpi_integer integer,
u32 base,
u8 *string,
u8 data_width)
acpi_integer integer,
u32 base,
u8 *string,
u8 data_width)
{
u32 i;
u32 j;
u32 k = 0;
char hex_digit;
acpi_integer digit;
u32 remainder;
u32 length;
u8 leading_zero;
u32 i;
u32 j;
u32 k = 0;
char hex_digit;
acpi_integer digit;
u32 remainder;
u32 length;
u8 leading_zero;
ACPI_FUNCTION_ENTRY ();
......@@ -389,17 +389,17 @@ acpi_ex_convert_to_ascii (
acpi_status
acpi_ex_convert_to_string (
acpi_operand_object *obj_desc,
acpi_operand_object **result_desc,
u32 base,
u32 max_length,
acpi_walk_state *walk_state)
union acpi_operand_object *obj_desc,
union acpi_operand_object **result_desc,
u32 base,
u32 max_length,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *ret_desc;
u32 i;
u32 string_length;
u8 *new_buf;
u8 *pointer;
union acpi_operand_object *ret_desc;
u32 i;
u32 string_length;
u8 *new_buf;
u8 *pointer;
ACPI_FUNCTION_TRACE_PTR ("ex_convert_to_string", obj_desc);
......@@ -553,12 +553,12 @@ 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)
acpi_object_type destination_type,
union acpi_operand_object *source_desc,
union acpi_operand_object **result_desc,
struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_convert_to_target_type");
......
......@@ -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,11 +50,11 @@
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;
acpi_status status = AE_OK;
struct acpi_namespace_node *target_node;
struct acpi_namespace_node *alias_node;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_create_alias");
......@@ -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;
acpi_status status;
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;
acpi_status status = AE_OK;
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);
......@@ -253,15 +253,15 @@ acpi_ex_create_mutex (
acpi_status
acpi_ex_create_region (
u8 *aml_start,
u32 aml_length,
u8 region_space,
acpi_walk_state *walk_state)
u8 *aml_start,
u32 aml_length,
u8 region_space,
struct acpi_walk_state *walk_state)
{
acpi_status status;
acpi_operand_object *obj_desc;
acpi_namespace_node *node;
acpi_operand_object *region_obj2;
acpi_status status;
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;
acpi_status status;
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,11 +441,11 @@ 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;
acpi_status status;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *obj_desc;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ex_create_processor", walk_state);
......@@ -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];
acpi_status status;
acpi_operand_object *obj_desc;
union acpi_operand_object **operand = &walk_state->operands[0];
acpi_status status;
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);
......@@ -546,14 +546,14 @@ acpi_ex_create_power_resource (
acpi_status
acpi_ex_create_method (
u8 *aml_start,
u32 aml_length,
acpi_walk_state *walk_state)
u8 *aml_start,
u32 aml_length,
struct acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
acpi_operand_object *obj_desc;
acpi_status status;
u8 method_flags;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *obj_desc;
acpi_status status;
u8 method_flags;
ACPI_FUNCTION_TRACE_PTR ("ex_create_method", walk_state);
......@@ -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,12 +53,12 @@
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;
u16 element_index;
u8 *buf = NULL;
u32 length;
union acpi_operand_object **element;
u16 element_index;
ACPI_FUNCTION_NAME ("ex_dump_operand")
......@@ -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,16 +383,16 @@ acpi_ex_dump_operand (
void
acpi_ex_dump_operands (
acpi_operand_object **operands,
acpi_interpreter_mode interpreter_mode,
char *ident,
u32 num_levels,
char *note,
char *module_name,
u32 line_number)
union acpi_operand_object **operands,
acpi_interpreter_mode interpreter_mode,
char *ident,
u32 num_levels,
char *note,
char *module_name,
u32 line_number)
{
acpi_native_uint i;
acpi_operand_object **obj_desc;
acpi_native_uint i;
union acpi_operand_object **obj_desc;
ACPI_FUNCTION_NAME ("ex_dump_operands");
......@@ -443,32 +443,32 @@ acpi_ex_dump_operands (
void
acpi_ex_out_string (
char *title,
char *value)
char *title,
char *value)
{
acpi_os_printf ("%20s : %s\n", title, value);
}
void
acpi_ex_out_pointer (
char *title,
void *value)
char *title,
void *value)
{
acpi_os_printf ("%20s : %p\n", title, value);
}
void
acpi_ex_out_integer (
char *title,
u32 value)
char *title,
u32 value)
{
acpi_os_printf ("%20s : %X\n", title, value);
}
void
acpi_ex_out_address (
char *title,
acpi_physical_address value)
char *title,
acpi_physical_address value)
{
#if ACPI_MACHINE_WIDTH == 16
......@@ -493,8 +493,8 @@ acpi_ex_out_address (
void
acpi_ex_dump_node (
acpi_namespace_node *node,
u32 flags)
struct acpi_namespace_node *node,
u32 flags)
{
ACPI_FUNCTION_ENTRY ();
......@@ -531,10 +531,10 @@ acpi_ex_dump_node (
void
acpi_ex_dump_object_descriptor (
acpi_operand_object *obj_desc,
u32 flags)
union acpi_operand_object *obj_desc,
u32 flags)
{
u32 i;
u32 i;
ACPI_FUNCTION_TRACE ("ex_dump_object_descriptor");
......@@ -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,15 +49,15 @@
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;
acpi_size length;
void *buffer;
u8 locked;
acpi_status status;
union acpi_operand_object *buffer_desc;
acpi_size length;
void *buffer;
u8 locked;
ACPI_FUNCTION_TRACE_PTR ("ex_read_data_from_field", obj_desc);
......@@ -186,17 +186,17 @@ 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;
u32 required_length;
void *buffer;
void *new_buffer;
u8 locked;
acpi_operand_object *buffer_desc;
acpi_status status;
u32 length;
u32 required_length;
void *buffer;
void *new_buffer;
u8 locked;
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,
u32 field_datum_byte_offset)
union acpi_operand_object *obj_desc,
u32 field_datum_byte_offset)
{
acpi_status status = AE_OK;
acpi_operand_object *rgn_desc;
acpi_status status = AE_OK;
union acpi_operand_object *rgn_desc;
ACPI_FUNCTION_TRACE_U32 ("ex_setup_region", field_datum_byte_offset);
......@@ -147,14 +147,14 @@ acpi_ex_setup_region (
acpi_status
acpi_ex_access_region (
acpi_operand_object *obj_desc,
u32 field_datum_byte_offset,
acpi_integer *value,
u32 function)
union acpi_operand_object *obj_desc,
u32 field_datum_byte_offset,
acpi_integer *value,
u32 function)
{
acpi_status status;
acpi_operand_object *rgn_desc;
acpi_physical_address address;
acpi_status status;
union acpi_operand_object *rgn_desc;
acpi_physical_address address;
ACPI_FUNCTION_TRACE ("ex_access_region");
......@@ -240,8 +240,8 @@ acpi_ex_access_region (
u8
acpi_ex_register_overflow (
acpi_operand_object *obj_desc,
acpi_integer value)
union acpi_operand_object *obj_desc,
acpi_integer value)
{
if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
......@@ -286,13 +286,13 @@ acpi_ex_register_overflow (
acpi_status
acpi_ex_field_datum_io (
acpi_operand_object *obj_desc,
u32 field_datum_byte_offset,
acpi_integer *value,
u32 read_write)
union acpi_operand_object *obj_desc,
u32 field_datum_byte_offset,
acpi_integer *value,
u32 read_write)
{
acpi_status status;
acpi_integer local_value;
acpi_status status;
acpi_integer local_value;
ACPI_FUNCTION_TRACE_U32 ("ex_field_datum_io", field_datum_byte_offset);
......@@ -465,14 +465,14 @@ acpi_ex_field_datum_io (
acpi_status
acpi_ex_write_with_update_rule (
acpi_operand_object *obj_desc,
acpi_integer mask,
acpi_integer field_value,
u32 field_datum_byte_offset)
union acpi_operand_object *obj_desc,
acpi_integer mask,
acpi_integer field_value,
u32 field_datum_byte_offset)
{
acpi_status status = AE_OK;
acpi_integer merged_value;
acpi_integer current_value;
acpi_status status = AE_OK;
acpi_integer merged_value;
acpi_integer current_value;
ACPI_FUNCTION_TRACE_U32 ("ex_write_with_update_rule", mask);
......@@ -562,10 +562,10 @@ acpi_ex_write_with_update_rule (
void
acpi_ex_get_buffer_datum(
acpi_integer *datum,
void *buffer,
u32 byte_granularity,
u32 offset)
acpi_integer *datum,
void *buffer,
u32 byte_granularity,
u32 offset)
{
ACPI_FUNCTION_ENTRY ();
......@@ -618,10 +618,10 @@ acpi_ex_get_buffer_datum(
void
acpi_ex_set_buffer_datum (
acpi_integer merged_datum,
void *buffer,
u32 byte_granularity,
u32 offset)
acpi_integer merged_datum,
void *buffer,
u32 byte_granularity,
u32 offset)
{
ACPI_FUNCTION_ENTRY ();
......@@ -670,18 +670,18 @@ acpi_ex_set_buffer_datum (
acpi_status
acpi_ex_extract_from_field (
acpi_operand_object *obj_desc,
void *buffer,
u32 buffer_length)
union acpi_operand_object *obj_desc,
void *buffer,
u32 buffer_length)
{
acpi_status status;
u32 field_datum_byte_offset;
u32 datum_offset;
acpi_integer previous_raw_datum;
acpi_integer this_raw_datum = 0;
acpi_integer merged_datum = 0;
u32 byte_field_length;
u32 datum_count;
acpi_status status;
u32 field_datum_byte_offset;
u32 datum_offset;
acpi_integer previous_raw_datum;
acpi_integer this_raw_datum = 0;
acpi_integer merged_datum = 0;
u32 byte_field_length;
u32 datum_count;
ACPI_FUNCTION_TRACE ("ex_extract_from_field");
......@@ -846,19 +846,19 @@ acpi_ex_extract_from_field (
acpi_status
acpi_ex_insert_into_field (
acpi_operand_object *obj_desc,
void *buffer,
u32 buffer_length)
union acpi_operand_object *obj_desc,
void *buffer,
u32 buffer_length)
{
acpi_status status;
u32 field_datum_byte_offset;
u32 datum_offset;
acpi_integer mask;
acpi_integer merged_datum;
acpi_integer previous_raw_datum;
acpi_integer this_raw_datum;
u32 byte_field_length;
u32 datum_count;
acpi_status status;
u32 field_datum_byte_offset;
u32 datum_offset;
acpi_integer mask;
acpi_integer merged_datum;
acpi_integer previous_raw_datum;
acpi_integer this_raw_datum;
u32 byte_field_length;
u32 datum_count;
ACPI_FUNCTION_TRACE ("ex_insert_into_field");
......
......@@ -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,17 +142,17 @@ 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;
u8 *new_buf;
u8 *end_tag1;
u8 *end_tag2;
acpi_size length1;
acpi_size length2;
union acpi_operand_object *return_desc;
u8 *new_buf;
u8 *end_tag1;
u8 *end_tag2;
acpi_size length1;
acpi_size length2;
ACPI_FUNCTION_TRACE ("ex_concat_template");
......@@ -215,16 +215,16 @@ 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;
char *new_buf;
acpi_status status;
u32 i;
acpi_integer this_integer;
union acpi_operand_object *return_desc;
char *new_buf;
ACPI_FUNCTION_ENTRY ();
......@@ -363,9 +363,9 @@ acpi_ex_do_concatenate (
acpi_integer
acpi_ex_do_math_op (
u16 opcode,
acpi_integer operand0,
acpi_integer operand1)
u16 opcode,
acpi_integer operand0,
acpi_integer operand1)
{
......@@ -449,9 +449,9 @@ acpi_ex_do_math_op (
u8
acpi_ex_do_logical_op (
u16 opcode,
acpi_integer operand0,
acpi_integer operand1)
u16 opcode,
acpi_integer operand0,
acpi_integer operand1)
{
......
......@@ -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,11 +122,11 @@ 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;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ex_acquire_mutex", obj_desc);
......@@ -206,10 +206,10 @@ 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;
acpi_status status;
ACPI_FUNCTION_TRACE ("ex_release_mutex");
......@@ -297,11 +297,11 @@ 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;
acpi_status status;
union acpi_operand_object *next = thread->acquired_mutex_list;
union acpi_operand_object *this;
acpi_status status;
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
......@@ -58,12 +58,12 @@
char *
acpi_ex_allocate_name_string (
u32 prefix_count,
u32 num_name_segs)
u32 prefix_count,
u32 num_name_segs)
{
char *temp_ptr;
char *name_string;
u32 size_needed;
char *temp_ptr;
char *name_string;
u32 size_needed;
ACPI_FUNCTION_TRACE ("ex_allocate_name_string");
......@@ -143,13 +143,13 @@ acpi_ex_allocate_name_string (
acpi_status
acpi_ex_name_segment (
u8 **in_aml_address,
char *name_string)
u8 **in_aml_address,
char *name_string)
{
char *aml_address = (void *) *in_aml_address;
acpi_status status = AE_OK;
u32 index;
char char_buf[5];
char *aml_address = (void *) *in_aml_address;
acpi_status status = AE_OK;
u32 index;
char char_buf[5];
ACPI_FUNCTION_TRACE ("ex_name_segment");
......@@ -230,17 +230,17 @@ acpi_ex_name_segment (
acpi_status
acpi_ex_get_name_string (
acpi_object_type data_type,
u8 *in_aml_address,
char **out_name_string,
u32 *out_name_length)
acpi_object_type data_type,
u8 *in_aml_address,
char **out_name_string,
u32 *out_name_length)
{
acpi_status status = AE_OK;
u8 *aml_address = in_aml_address;
char *name_string = NULL;
u32 num_segments;
u32 prefix_count = 0;
u8 has_prefix = FALSE;
acpi_status status = AE_OK;
u8 *aml_address = in_aml_address;
char *name_string = NULL;
u32 num_segments;
u32 prefix_count = 0;
u8 has_prefix = FALSE;
ACPI_FUNCTION_TRACE_PTR ("ex_get_name_string", aml_address);
......
......@@ -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,10 +73,10 @@
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];
acpi_status status = AE_OK;
union acpi_operand_object **operand = &walk_state->operands[0];
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -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];
acpi_status status = AE_OK;
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,16 +195,16 @@ 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;
u32 temp32;
u32 i;
u32 j;
acpi_integer digit;
acpi_status status = AE_OK;
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;
acpi_integer digit;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_1T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -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,14 +486,14 @@ 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;
acpi_status status = AE_OK;
u32 type;
acpi_integer value;
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;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -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,11 +74,11 @@
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;
acpi_status status = AE_OK;
union acpi_operand_object **operand = &walk_state->operands[0];
struct acpi_namespace_node *node;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_2A_0T_0R",
......@@ -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,12 +142,12 @@ 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;
acpi_status status;
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;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_2A_2T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -239,14 +239,14 @@ 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;
u32 index;
acpi_status status = AE_OK;
acpi_size length;
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;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_2A_1T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -499,12 +499,12 @@ 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;
acpi_status status = AE_OK;
u8 logical_result = FALSE;
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;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_2A_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
......@@ -71,11 +71,11 @@
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;
acpi_status status = AE_OK;
union acpi_operand_object **operand = &walk_state->operands[0];
struct acpi_signal_fatal_info *fatal;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_3A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -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,14 +138,14 @@ 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;
char *buffer;
acpi_status status = AE_OK;
acpi_native_uint index;
acpi_size length;
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;
acpi_size length;
ACPI_FUNCTION_TRACE_STR ("ex_opcode_3A_1T_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
......@@ -73,9 +73,9 @@
u8
acpi_ex_do_match (
u32 match_op,
acpi_integer package_value,
acpi_integer match_value)
u32 match_op,
acpi_integer package_value,
acpi_integer match_value)
{
switch (match_op) {
......@@ -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;
acpi_status status = AE_OK;
u32 index;
acpi_operand_object *this_element;
union acpi_operand_object **operand = &walk_state->operands[0];
union acpi_operand_object *return_desc = NULL;
acpi_status status = AE_OK;
u32 index;
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,14 +50,14 @@
static u32
acpi_ex_decode_field_access (
acpi_operand_object *obj_desc,
u8 field_flags,
u32 *return_byte_alignment)
union acpi_operand_object *obj_desc,
u8 field_flags,
u32 *return_byte_alignment)
{
u32 access;
u8 byte_alignment;
u8 bit_length;
/* u32 Length; */
u32 access;
u8 byte_alignment;
u8 bit_length;
/* u32 Length; */
ACPI_FUNCTION_NAME ("ex_decode_field_access");
......@@ -171,15 +171,15 @@ acpi_ex_decode_field_access (
acpi_status
acpi_ex_prep_common_field_object (
acpi_operand_object *obj_desc,
u8 field_flags,
u8 field_attribute,
u32 field_bit_position,
u32 field_bit_length)
union acpi_operand_object *obj_desc,
u8 field_flags,
u8 field_attribute,
u32 field_bit_position,
u32 field_bit_length)
{
u32 access_bit_width;
u32 byte_alignment;
u32 nearest_byte_address;
u32 access_bit_width;
u32 byte_alignment;
u32 nearest_byte_address;
ACPI_FUNCTION_TRACE ("ex_prep_common_field_object");
......@@ -289,18 +289,18 @@ 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;
u32 type;
acpi_status status;
union acpi_operand_object *obj_desc;
u32 type;
acpi_status status;
ACPI_FUNCTION_TRACE ("ex_prep_field_value");
......
......@@ -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,20 +52,20 @@
acpi_status
acpi_ex_system_memory_space_handler (
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
{
acpi_status status = AE_OK;
void *logical_addr_ptr = NULL;
acpi_mem_space_context *mem_info = region_context;
u32 length;
acpi_size window_size;
acpi_status status = AE_OK;
void *logical_addr_ptr = NULL;
struct acpi_mem_space_context *mem_info = region_context;
u32 length;
acpi_size window_size;
#ifndef _HW_ALIGNMENT_SUPPORT
u32 remainder;
u32 remainder;
#endif
ACPI_FUNCTION_TRACE ("ex_system_memory_space_handler");
......@@ -256,14 +256,14 @@ acpi_ex_system_memory_space_handler (
acpi_status
acpi_ex_system_io_space_handler (
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_system_io_space_handler");
......@@ -316,16 +316,16 @@ acpi_ex_system_io_space_handler (
acpi_status
acpi_ex_pci_config_space_handler (
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
{
acpi_status status = AE_OK;
acpi_pci_id *pci_id;
u16 pci_register;
acpi_status status = AE_OK;
struct acpi_pci_id *pci_id;
u16 pci_register;
ACPI_FUNCTION_TRACE ("ex_pci_config_space_handler");
......@@ -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,
......@@ -393,14 +393,14 @@ acpi_ex_pci_config_space_handler (
acpi_status
acpi_ex_cmos_space_handler (
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_cmos_space_handler");
......@@ -430,14 +430,14 @@ acpi_ex_cmos_space_handler (
acpi_status
acpi_ex_pci_bar_space_handler (
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_pci_bar_space_handler");
......@@ -467,17 +467,17 @@ acpi_ex_pci_bar_space_handler (
acpi_status
acpi_ex_data_table_space_handler (
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
u32 function,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
void *region_context)
{
acpi_status status = AE_OK;
u32 byte_width = ACPI_DIV_8 (bit_width);
u32 i;
char *logical_addr_ptr;
acpi_status status = AE_OK;
u32 byte_width = ACPI_DIV_8 (bit_width);
u32 i;
char *logical_addr_ptr;
ACPI_FUNCTION_TRACE ("ex_data_table_space_handler");
......
......@@ -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,22 +62,22 @@
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;
acpi_object_type entry_type;
acpi_status status = AE_OK;
union acpi_operand_object *source_desc;
union acpi_operand_object *obj_desc = NULL;
struct acpi_namespace_node *node;
acpi_object_type entry_type;
ACPI_FUNCTION_TRACE ("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,10 +52,10 @@
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;
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("ex_resolve_to_value", stack_ptr);
......@@ -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,14 +113,14 @@ 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;
void *temp_node;
acpi_operand_object *obj_desc;
u16 opcode;
acpi_status status = AE_OK;
union acpi_operand_object *stack_desc;
void *temp_node;
union acpi_operand_object *obj_desc;
u16 opcode;
ACPI_FUNCTION_TRACE ("ex_resolve_object_to_value");
......@@ -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,14 +298,14 @@ acpi_ex_resolve_object_to_value (
acpi_status
acpi_ex_resolve_multiple (
acpi_walk_state *walk_state,
acpi_operand_object *operand,
acpi_object_type *return_type,
acpi_operand_object **return_desc)
struct acpi_walk_state *walk_state,
union acpi_operand_object *operand,
acpi_object_type *return_type,
union acpi_operand_object **return_desc)
{
acpi_operand_object *obj_desc = (void *) operand;
acpi_namespace_node *node;
acpi_object_type type;
union acpi_operand_object *obj_desc = (void *) operand;
struct acpi_namespace_node *node;
acpi_object_type type;
ACPI_FUNCTION_TRACE ("acpi_ex_resolve_multiple");
......
......@@ -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,9 +50,9 @@
acpi_status
acpi_ex_check_object_type (
acpi_object_type type_needed,
acpi_object_type this_type,
void *object)
acpi_object_type type_needed,
acpi_object_type this_type,
void *object)
{
ACPI_FUNCTION_NAME ("ex_check_object_type");
......@@ -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);
}
}
......@@ -111,18 +111,18 @@ acpi_ex_check_object_type (
acpi_status
acpi_ex_resolve_operands (
u16 opcode,
acpi_operand_object **stack_ptr,
acpi_walk_state *walk_state)
u16 opcode,
union acpi_operand_object **stack_ptr,
struct acpi_walk_state *walk_state)
{
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;
u32 this_arg_type;
acpi_object_type type_needed;
union acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
u8 object_type;
void *temp_node;
u32 arg_types;
const struct acpi_opcode_info *op_info;
u32 this_arg_type;
acpi_object_type type_needed;
ACPI_FUNCTION_TRACE_U32 ("ex_resolve_operands", opcode);
......@@ -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;
acpi_status status = AE_OK;
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,14 +237,14 @@ 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;
u8 value = 0;
acpi_status status = AE_OK;
union acpi_operand_object *obj_desc;
union acpi_operand_object *new_desc;
u8 value = 0;
ACPI_FUNCTION_TRACE ("ex_store_object_to_index");
......@@ -390,14 +390,14 @@ 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;
acpi_object_type target_type;
acpi_status status = AE_OK;
union acpi_operand_object *target_desc;
union acpi_operand_object *new_desc;
acpi_object_type target_type;
ACPI_FUNCTION_TRACE_PTR ("ex_store_object_to_node", source_desc);
......
......@@ -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,12 +50,12 @@
acpi_status
acpi_ex_resolve_object (
acpi_operand_object **source_desc_ptr,
acpi_object_type target_type,
acpi_walk_state *walk_state)
union acpi_operand_object **source_desc_ptr,
acpi_object_type target_type,
struct acpi_walk_state *walk_state)
{
acpi_operand_object *source_desc = *source_desc_ptr;
acpi_status status = AE_OK;
union acpi_operand_object *source_desc = *source_desc_ptr;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_resolve_object");
......@@ -171,13 +171,13 @@ 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;
acpi_status status = AE_OK;
union acpi_operand_object *actual_src_desc;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("ex_store_object_to_object", source_desc);
......
......@@ -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,11 +47,11 @@
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;
u32 length;
u8 *buffer;
ACPI_FUNCTION_TRACE_PTR ("ex_store_buffer_to_buffer", source_desc);
......@@ -121,11 +121,11 @@ 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;
u32 length;
u8 *buffer;
ACPI_FUNCTION_TRACE_PTR ("ex_store_string_to_string", source_desc);
......
......@@ -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
......@@ -49,11 +49,11 @@
acpi_status
acpi_ex_system_wait_semaphore (
acpi_handle semaphore,
u16 timeout)
acpi_handle semaphore,
u16 timeout)
{
acpi_status status;
acpi_status status2;
acpi_status status;
acpi_status status2;
ACPI_FUNCTION_TRACE ("ex_system_wait_semaphore");
......@@ -102,9 +102,9 @@ acpi_ex_system_wait_semaphore (
acpi_status
acpi_ex_system_do_stall (
u32 how_long)
u32 how_long)
{
acpi_status status = AE_OK;
acpi_status status = AE_OK;
ACPI_FUNCTION_ENTRY ();
......@@ -144,9 +144,9 @@ acpi_ex_system_do_stall (
acpi_status
acpi_ex_system_do_suspend (
u32 how_long)
u32 how_long)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_ENTRY ();
......@@ -183,10 +183,10 @@ 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;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("ex_system_acquire_mutex", obj_desc);
......@@ -227,9 +227,9 @@ 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;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_system_release_mutex");
......@@ -267,9 +267,9 @@ 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;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_system_signal_event");
......@@ -300,10 +300,10 @@ 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;
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("ex_system_wait_event");
......@@ -332,10 +332,10 @@ 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;
acpi_status status = AE_OK;
void *temp_semaphore;
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
......@@ -65,7 +65,7 @@
acpi_status
acpi_ex_enter_interpreter (void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ex_enter_interpreter");
......@@ -102,7 +102,7 @@ acpi_ex_enter_interpreter (void)
void
acpi_ex_exit_interpreter (void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ex_exit_interpreter");
......@@ -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 ();
......@@ -174,10 +174,10 @@ acpi_ex_truncate_for32bit_table (
u8
acpi_ex_acquire_global_lock (
u32 field_flags)
u32 field_flags)
{
u8 locked = FALSE;
acpi_status status;
u8 locked = FALSE;
acpi_status status;
ACPI_FUNCTION_TRACE ("ex_acquire_global_lock");
......@@ -217,9 +217,9 @@ acpi_ex_acquire_global_lock (
void
acpi_ex_release_global_lock (
u8 locked_by_me)
u8 locked_by_me)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("ex_release_global_lock");
......@@ -256,12 +256,12 @@ acpi_ex_release_global_lock (
u32
acpi_ex_digits_needed (
acpi_integer value,
u32 base)
acpi_integer value,
u32 base)
{
u32 num_digits;
acpi_integer current_value;
acpi_integer quotient;
u32 num_digits;
acpi_integer current_value;
acpi_integer quotient;
ACPI_FUNCTION_TRACE ("ex_digits_needed");
......@@ -296,10 +296,10 @@ acpi_ex_digits_needed (
void
acpi_ex_eisa_id_to_string (
u32 numeric_id,
char *out_string)
u32 numeric_id,
char *out_string)
{
u32 eisa_id;
u32 eisa_id;
ACPI_FUNCTION_ENTRY ();
......@@ -333,13 +333,13 @@ acpi_ex_eisa_id_to_string (
void
acpi_ex_unsigned_integer_to_string (
acpi_integer value,
char *out_string)
acpi_integer value,
char *out_string)
{
u32 count;
u32 digits_needed;
u32 remainder;
acpi_integer quotient;
u32 count;
u32 digits_needed;
u32 remainder;
acpi_integer quotient;
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
......@@ -47,7 +47,7 @@ acpi_status
acpi_hw_initialize (
void)
{
acpi_status status;
acpi_status status;
ACPI_FUNCTION_TRACE ("hw_initialize");
......@@ -86,11 +86,11 @@ acpi_hw_initialize (
acpi_status
acpi_hw_set_mode (
u32 mode)
u32 mode)
{
acpi_status status;
u32 retry;
acpi_status status;
u32 retry;
ACPI_FUNCTION_TRACE ("hw_set_mode");
......@@ -183,8 +183,8 @@ acpi_hw_set_mode (
u32
acpi_hw_get_mode (void)
{
acpi_status status;
u32 value;
acpi_status status;
u32 value;
ACPI_FUNCTION_TRACE ("hw_get_mode");
......
This diff is collapsed.
This diff is collapsed.
......@@ -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
......@@ -123,11 +123,11 @@ acpi_get_firmware_waking_vector (
acpi_status
acpi_enter_sleep_state_prep (
u8 sleep_state)
u8 sleep_state)
{
acpi_status status;
acpi_object_list arg_list;
acpi_object arg;
acpi_status status;
struct acpi_object_list arg_list;
union acpi_object arg;
ACPI_FUNCTION_TRACE ("acpi_enter_sleep_state_prep");
......@@ -181,14 +181,14 @@ acpi_enter_sleep_state_prep (
acpi_status
acpi_enter_sleep_state (
u8 sleep_state)
u8 sleep_state)
{
u32 PM1Acontrol;
u32 PM1Bcontrol;
acpi_bit_register_info *sleep_type_reg_info;
acpi_bit_register_info *sleep_enable_reg_info;
u32 in_value;
acpi_status status;
u32 PM1Acontrol;
u32 PM1Bcontrol;
struct acpi_bit_register_info *sleep_type_reg_info;
struct acpi_bit_register_info *sleep_enable_reg_info;
u32 in_value;
acpi_status status;
ACPI_FUNCTION_TRACE ("acpi_enter_sleep_state");
......@@ -330,11 +330,11 @@ acpi_enter_sleep_state (
acpi_status
acpi_leave_sleep_state (
u8 sleep_state)
u8 sleep_state)
{
acpi_object_list arg_list;
acpi_object arg;
acpi_status status;
struct acpi_object_list arg_list;
union acpi_object arg;
acpi_status status;
ACPI_FUNCTION_TRACE ("acpi_leave_sleep_state");
......
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.
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
......
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.
......@@ -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
......
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.
......@@ -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.
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.
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