ACPI: Remove typedefs in favor of using "struct" and "union" explicitly
authorAndy Grover <agrover@groveronline.com>
Tue, 7 Jan 2003 07:20:46 +0000 (23:20 -0800)
committerAndy Grover <agrover@groveronline.com>
Tue, 7 Jan 2003 07:20:46 +0000 (23:20 -0800)
153 files changed:
arch/i386/kernel/mpparse.c
drivers/acpi/acpi_bus.h
drivers/acpi/acpi_drivers.h
drivers/acpi/battery.c
drivers/acpi/bus.c
drivers/acpi/dispatcher/dsfield.c
drivers/acpi/dispatcher/dsinit.c
drivers/acpi/dispatcher/dsmethod.c
drivers/acpi/dispatcher/dsmthdat.c
drivers/acpi/dispatcher/dsobject.c
drivers/acpi/dispatcher/dsopcode.c
drivers/acpi/dispatcher/dsutils.c
drivers/acpi/dispatcher/dswexec.c
drivers/acpi/dispatcher/dswload.c
drivers/acpi/dispatcher/dswscope.c
drivers/acpi/dispatcher/dswstate.c
drivers/acpi/ec.c
drivers/acpi/events/evevent.c
drivers/acpi/events/evgpe.c
drivers/acpi/events/evmisc.c
drivers/acpi/events/evregion.c
drivers/acpi/events/evrgnini.c
drivers/acpi/events/evsci.c
drivers/acpi/events/evxface.c
drivers/acpi/events/evxfevnt.c
drivers/acpi/events/evxfregn.c
drivers/acpi/executer/exconfig.c
drivers/acpi/executer/exconvrt.c
drivers/acpi/executer/excreate.c
drivers/acpi/executer/exdump.c
drivers/acpi/executer/exfield.c
drivers/acpi/executer/exfldio.c
drivers/acpi/executer/exmisc.c
drivers/acpi/executer/exmutex.c
drivers/acpi/executer/exnames.c
drivers/acpi/executer/exoparg1.c
drivers/acpi/executer/exoparg2.c
drivers/acpi/executer/exoparg3.c
drivers/acpi/executer/exoparg6.c
drivers/acpi/executer/exprep.c
drivers/acpi/executer/exregion.c
drivers/acpi/executer/exresnte.c
drivers/acpi/executer/exresolv.c
drivers/acpi/executer/exresop.c
drivers/acpi/executer/exstore.c
drivers/acpi/executer/exstoren.c
drivers/acpi/executer/exstorob.c
drivers/acpi/executer/exsystem.c
drivers/acpi/executer/exutils.c
drivers/acpi/hardware/hwacpi.c
drivers/acpi/hardware/hwgpe.c
drivers/acpi/hardware/hwregs.c
drivers/acpi/hardware/hwsleep.c
drivers/acpi/hardware/hwtimer.c
drivers/acpi/include/acconfig.h
drivers/acpi/include/acdebug.h
drivers/acpi/include/acdispat.h
drivers/acpi/include/acevents.h
drivers/acpi/include/acexcep.h
drivers/acpi/include/acglobal.h
drivers/acpi/include/achware.h
drivers/acpi/include/acinterp.h
drivers/acpi/include/aclocal.h
drivers/acpi/include/acmacros.h
drivers/acpi/include/acnamesp.h
drivers/acpi/include/acobject.h
drivers/acpi/include/acoutput.h
drivers/acpi/include/acparser.h
drivers/acpi/include/acpi.h
drivers/acpi/include/acpiosxf.h
drivers/acpi/include/acpixf.h
drivers/acpi/include/acresrc.h
drivers/acpi/include/acstruct.h
drivers/acpi/include/actables.h
drivers/acpi/include/actbl.h
drivers/acpi/include/actbl1.h
drivers/acpi/include/actbl2.h
drivers/acpi/include/actbl71.h
drivers/acpi/include/actypes.h
drivers/acpi/include/acutils.h
drivers/acpi/include/amlcode.h
drivers/acpi/include/amlresrc.h
drivers/acpi/include/platform/acenv.h
drivers/acpi/include/platform/acgcc.h
drivers/acpi/include/platform/aclinux.h
drivers/acpi/namespace/nsaccess.c
drivers/acpi/namespace/nsalloc.c
drivers/acpi/namespace/nsdump.c
drivers/acpi/namespace/nsdumpdv.c
drivers/acpi/namespace/nseval.c
drivers/acpi/namespace/nsinit.c
drivers/acpi/namespace/nsload.c
drivers/acpi/namespace/nsnames.c
drivers/acpi/namespace/nsobject.c
drivers/acpi/namespace/nsparse.c
drivers/acpi/namespace/nssearch.c
drivers/acpi/namespace/nsutils.c
drivers/acpi/namespace/nswalk.c
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/namespace/nsxfname.c
drivers/acpi/namespace/nsxfobj.c
drivers/acpi/osl.c
drivers/acpi/parser/psargs.c
drivers/acpi/parser/psopcode.c
drivers/acpi/parser/psparse.c
drivers/acpi/parser/psscope.c
drivers/acpi/parser/pstree.c
drivers/acpi/parser/psutils.c
drivers/acpi/parser/pswalk.c
drivers/acpi/parser/psxface.c
drivers/acpi/pci_bind.c
drivers/acpi/pci_irq.c
drivers/acpi/pci_link.c
drivers/acpi/pci_root.c
drivers/acpi/power.c
drivers/acpi/processor.c
drivers/acpi/resources/rsaddr.c
drivers/acpi/resources/rscalc.c
drivers/acpi/resources/rscreate.c
drivers/acpi/resources/rsdump.c
drivers/acpi/resources/rsio.c
drivers/acpi/resources/rsirq.c
drivers/acpi/resources/rslist.c
drivers/acpi/resources/rsmemory.c
drivers/acpi/resources/rsmisc.c
drivers/acpi/resources/rsutils.c
drivers/acpi/resources/rsxface.c
drivers/acpi/scan.c
drivers/acpi/system.c
drivers/acpi/tables/tbconvrt.c
drivers/acpi/tables/tbget.c
drivers/acpi/tables/tbgetall.c
drivers/acpi/tables/tbinstal.c
drivers/acpi/tables/tbrsdt.c
drivers/acpi/tables/tbutils.c
drivers/acpi/tables/tbxface.c
drivers/acpi/tables/tbxfroot.c
drivers/acpi/thermal.c
drivers/acpi/toshiba_acpi.c
drivers/acpi/utilities/utalloc.c
drivers/acpi/utilities/utcopy.c
drivers/acpi/utilities/utdebug.c
drivers/acpi/utilities/utdelete.c
drivers/acpi/utilities/uteval.c
drivers/acpi/utilities/utglobal.c
drivers/acpi/utilities/utinit.c
drivers/acpi/utilities/utmath.c
drivers/acpi/utilities/utmisc.c
drivers/acpi/utilities/utobject.c
drivers/acpi/utilities/utxface.c
drivers/acpi/utils.c
drivers/hotplug/acpiphp_glue.c
include/linux/acpi.h

index a4fb679..f41b3f2 100644 (file)
@@ -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;
 
index 50c8374..21d6a65 100644 (file)
@@ -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
 
index ae17b0b..cf17969 100644 (file)
@@ -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*/
 
index c821ef4..da49406 100644 (file)
@@ -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");
 
index fc65450..0a201ee 100644 (file)
@@ -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");
 
index 1aea766..ba74608 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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);
index a4f58db..951e496 100644 (file)
@@ -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
 
 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");
index a4ae2fc..cb75dd5 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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);
index ce568ca..92ceb90 100644 (file)
@@ -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");
index a7f2037..7a6fcb4 100644 (file)
@@ -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
 
 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;
 
index fc17332..4206f27 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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");
index 6088703..acaed3e 100644 (file)
@@ -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
 
 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 @@ result_not_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);
index 88f8dd7..a1aa38e 100644 (file)
@@ -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 @@ cleanup:
 
 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);
index 4a02205..3bf87e5 100644 (file)
@@ -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
 
 
index 4173171..c2a4477 100644 (file)
@@ -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");
index 805b1b4..f51cb6b 100644 (file)
@@ -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
 
 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);
index 9210841..aaa2e95 100644 (file)
@@ -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;
 
index b62b3ef..c598840 100644 (file)
@@ -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)
 {
 
 
index 70cec76..6419956 100644 (file)
@@ -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
 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 @@ error_exit1:
 
 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");
index bd7d2a7..9013890 100644 (file)
@@ -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");
index b83bc48..79ae40c 100644 (file)
@@ -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 @@ cleanup:
 
 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 */
 
index 03c5dec..49f75fa 100644 (file)
@@ -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
 
 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);
index 9e47863..a18db61 100644 (file)
@@ -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
 
 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");
index 8914fc9..172aecf 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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 @@ unlock_and_exit:
 
 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 @@ unlock_and_exit:
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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) {
index b1375da..69c5ea7 100644 (file)
@@ -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");
index a2e6049..be53770 100644 (file)
@@ -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
 
 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 @@ unlock_and_exit:
 
 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");
index 945647d..c39443c 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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
index b278335..fe6e2ca 100644 (file)
@@ -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
 
 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");
index e2d9dca..f3b33c9 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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 */
index f109dbc..9d35a6e 100644 (file)
@@ -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
 
 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;
        }
 
index 7ac1146..be98ebb 100644 (file)
@@ -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
 
 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 @@ exit:
 
 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);
index a38dd56..31208e9 100644 (file)
@@ -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
 
 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");
index 2629767..0f6a03e 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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)
 {
 
 
index bac364f..d99de76 100644 (file)
@@ -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 ();
index fd81593..09b634c 100644 (file)
@@ -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
 
 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);
index 2f8a042..5817d8b 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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! */
index 3562e75..9f1e0d5 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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 @@ cleanup:
 
 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));
index f3cab18..32f4cad 100644 (file)
@@ -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
 
 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 @@ cleanup:
 
 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));
index 3260c23..c7edcbd 100644 (file)
@@ -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));
index 11ea877..61ea5bf 100644 (file)
@@ -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
 
 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");
index b77fa6b..d950461 100644 (file)
@@ -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
 
 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");
index e1510cf..8940f20 100644 (file)
@@ -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
 
 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;
index 0222d9c..92a5d4b 100644 (file)
@@ -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
  *
 
 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");
index 719cbd2..e9fc7af 100644 (file)
@@ -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;
 
 
index a22e0b2..6354546 100644 (file)
@@ -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
  *
 
 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);
index 222cc6b..baafa32 100644 (file)
@@ -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
 
 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);
index 496cf07..5492755 100644 (file)
@@ -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
 
 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);
index 6af31b0..31927d2 100644 (file)
@@ -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
 
 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 ();
index ecd2db9..0b5dbb3 100644 (file)
@@ -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 ();
index 0b1bf22..6fa3ad5 100644 (file)
@@ -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");
index 56507fd..c227eb8 100644 (file)
@@ -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
@@ -44,7 +44,7 @@
 
 u8
 acpi_hw_get_gpe_bit_mask (
-       u32                     gpe_number)
+       u32                             gpe_number)
 {
        return (acpi_gbl_gpe_number_info [acpi_ev_get_gpe_number_index (gpe_number)].bit_mask);
 }
@@ -64,12 +64,12 @@ acpi_hw_get_gpe_bit_mask (
 
 acpi_status
 acpi_hw_enable_gpe (
-       u32                     gpe_number)
+       u32                             gpe_number)
 {
-       u32                     in_byte;
-       u32                     register_index;
-       u8                      bit_mask;
-       acpi_status             status;
+       u32                             in_byte;
+       u32                             register_index;
+       u8                              bit_mask;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -115,10 +115,10 @@ acpi_hw_enable_gpe (
 
 void
 acpi_hw_enable_gpe_for_wakeup (
-       u32                     gpe_number)
+       u32                             gpe_number)
 {
-       u32                     register_index;
-       u8                      bit_mask;
+       u32                             register_index;
+       u8                              bit_mask;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -153,12 +153,12 @@ acpi_hw_enable_gpe_for_wakeup (
 
 acpi_status
 acpi_hw_disable_gpe (
-       u32                     gpe_number)
+       u32                             gpe_number)
 {
-       u32                     in_byte;
-       u32                     register_index;
-       u8                      bit_mask;
-       acpi_status             status;
+       u32                             in_byte;
+       u32                             register_index;
+       u8                              bit_mask;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -208,10 +208,10 @@ acpi_hw_disable_gpe (
 
 void
 acpi_hw_disable_gpe_for_wakeup (
-       u32                     gpe_number)
+       u32                             gpe_number)
 {
-       u32                     register_index;
-       u8                      bit_mask;
+       u32                             register_index;
+       u8                              bit_mask;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -246,11 +246,11 @@ acpi_hw_disable_gpe_for_wakeup (
 
 acpi_status
 acpi_hw_clear_gpe (
-       u32                     gpe_number)
+       u32                             gpe_number)
 {
-       u32                     register_index;
-       u8                      bit_mask;
-       acpi_status             status;
+       u32                             register_index;
+       u8                              bit_mask;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -289,14 +289,14 @@ acpi_hw_clear_gpe (
 
 acpi_status
 acpi_hw_get_gpe_status (
-       u32                     gpe_number,
-       acpi_event_status       *event_status)
+       u32                             gpe_number,
+       acpi_event_status               *event_status)
 {
-       u32                     in_byte = 0;
-       u32                     register_index = 0;
-       u8                      bit_mask = 0;
-       acpi_gpe_register_info  *gpe_register_info;
-       acpi_status             status;
+       u32                             in_byte = 0;
+       u32                             register_index = 0;
+       u8                              bit_mask = 0;
+       struct acpi_gpe_register_info   *gpe_register_info;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -368,10 +368,10 @@ acpi_status
 acpi_hw_disable_non_wakeup_gpes (
        void)
 {
-       u32                     i;
-       acpi_gpe_register_info  *gpe_register_info;
-       u32                     in_value;
-       acpi_status             status;
+       u32                             i;
+       struct acpi_gpe_register_info   *gpe_register_info;
+       u32                             in_value;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -421,9 +421,9 @@ acpi_status
 acpi_hw_enable_non_wakeup_gpes (
        void)
 {
-       u32                     i;
-       acpi_gpe_register_info  *gpe_register_info;
-       acpi_status             status;
+       u32                             i;
+       struct acpi_gpe_register_info   *gpe_register_info;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
index f32bddf..e609dd3 100644 (file)
@@ -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
@@ -47,9 +47,9 @@
 acpi_status
 acpi_hw_clear_acpi_status (void)
 {
-       acpi_native_uint        i;
-       acpi_native_uint        gpe_block;
-       acpi_status             status;
+       acpi_native_uint                i;
+       acpi_native_uint                gpe_block;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("hw_clear_acpi_status");
@@ -116,12 +116,12 @@ unlock_and_exit:
 
 acpi_status
 acpi_get_sleep_type_data (
-       u8                      sleep_state,
-       u8                      *sleep_type_a,
-       u8                      *sleep_type_b)
+       u8                              sleep_state,
+       u8                              *sleep_type_a,
+       u8                              *sleep_type_b)
 {
-       acpi_status             status = AE_OK;
-       acpi_operand_object     *obj_desc;
+       acpi_status                     status = AE_OK;
+       union acpi_operand_object       *obj_desc;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_sleep_type_data");
@@ -207,9 +207,9 @@ acpi_get_sleep_type_data (
  *
  ******************************************************************************/
 
-acpi_bit_register_info *
+struct acpi_bit_register_info *
 acpi_hw_get_bit_register_info (
-       u32                     register_id)
+       u32                             register_id)
 {
        ACPI_FUNCTION_NAME ("hw_get_bit_register_info");
 
@@ -239,13 +239,13 @@ acpi_hw_get_bit_register_info (
 
 acpi_status
 acpi_get_register (
-       u32                     register_id,
-       u32                     *return_value,
-       u32                     flags)
+       u32                             register_id,
+       u32                             *return_value,
+       u32                             flags)
 {
-       u32                     register_value = 0;
-       acpi_bit_register_info  *bit_reg_info;
-       acpi_status             status;
+       u32                             register_value = 0;
+       struct acpi_bit_register_info   *bit_reg_info;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_register");
@@ -304,13 +304,13 @@ acpi_get_register (
 
 acpi_status
 acpi_set_register (
-       u32                     register_id,
-       u32                     value,
-       u32                     flags)
+       u32                             register_id,
+       u32                             value,
+       u32                             flags)
 {
-       u32                     register_value = 0;
-       acpi_bit_register_info  *bit_reg_info;
-       acpi_status             status;
+       u32                             register_value = 0;
+       struct acpi_bit_register_info   *bit_reg_info;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE_U32 ("acpi_set_register", register_id);
@@ -454,14 +454,14 @@ unlock_and_exit:
 
 acpi_status
 acpi_hw_register_read (
-       u8                      use_lock,
-       u32                     register_id,
-       u32                     *return_value)
+       u8                              use_lock,
+       u32                             register_id,
+       u32                             *return_value)
 {
-       u32                     value1 = 0;
-       u32                     value2 = 0;
-       u32                     bank_offset;
-       acpi_status             status;
+       u32                             value1 = 0;
+       u32                             value2 = 0;
+       u32                             bank_offset;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("hw_register_read");
@@ -563,12 +563,12 @@ unlock_and_exit:
 
 acpi_status
 acpi_hw_register_write (
-       u8                      use_lock,
-       u32                     register_id,
-       u32                     value)
+       u8                              use_lock,
+       u32                             register_id,
+       u32                             value)
 {
-       u32                     bank_offset;
-       acpi_status             status;
+       u32                             bank_offset;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("hw_register_write");
@@ -678,16 +678,16 @@ unlock_and_exit:
 
 acpi_status
 acpi_hw_low_level_read (
-       u32                     width,
-       u32                     *value,
-       acpi_generic_address    *reg,
-       u32                     offset)
+       u32                             width,
+       u32                             *value,
+       struct acpi_generic_address     *reg,
+       u32                             offset)
 {
-       acpi_physical_address   mem_address;
-       acpi_io_address         io_address;
-       acpi_pci_id             pci_id;
-       u16                     pci_register;
-       acpi_status             status;
+       acpi_physical_address           mem_address;
+       acpi_io_address                 io_address;
+       struct acpi_pci_id              pci_id;
+       u16                             pci_register;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_NAME ("hw_low_level_read");
@@ -768,16 +768,16 @@ acpi_hw_low_level_read (
 
 acpi_status
 acpi_hw_low_level_write (
-       u32                     width,
-       u32                     value,
-       acpi_generic_address    *reg,
-       u32                     offset)
+       u32                             width,
+       u32                             value,
+       struct acpi_generic_address     *reg,
+       u32                             offset)
 {
-       acpi_physical_address   mem_address;
-       acpi_io_address         io_address;
-       acpi_pci_id             pci_id;
-       u16                     pci_register;
-       acpi_status             status;
+       acpi_physical_address           mem_address;
+       acpi_io_address                 io_address;
+       struct acpi_pci_id              pci_id;
+       u16                             pci_register;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_NAME ("hw_low_level_write");
index 475e624..aaab0ff 100644 (file)
@@ -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");
index 42f22de..b5651f4 100644 (file)
@@ -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
@@ -43,7 +43,7 @@
 
 acpi_status
 acpi_get_timer_resolution (
-       u32                     *resolution)
+       u32                             *resolution)
 {
        ACPI_FUNCTION_TRACE ("acpi_get_timer_resolution");
 
@@ -77,9 +77,9 @@ acpi_get_timer_resolution (
 
 acpi_status
 acpi_get_timer (
-       u32                     *ticks)
+       u32                             *ticks)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_timer");
@@ -123,14 +123,14 @@ acpi_get_timer (
 
 acpi_status
 acpi_get_timer_duration (
-       u32                     start_ticks,
-       u32                     end_ticks,
-       u32                     *time_elapsed)
+       u32                             start_ticks,
+       u32                             end_ticks,
+       u32                             *time_elapsed)
 {
-       u32                     delta_ticks = 0;
-       uint64_overlay          normalized_ticks;
-       acpi_status             status;
-       acpi_integer            out_quotient;
+       u32                             delta_ticks = 0;
+       union uint64_overlay            normalized_ticks;
+       acpi_status                     status;
+       acpi_integer                    out_quotient;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_timer_duration");
index 0458b93..3a52d9b 100644 (file)
@@ -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
index 3a3cc90..ed08890 100644 (file)
@@ -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
 
 #define ACPI_DEBUG_BUFFER_SIZE  4196
 
-typedef struct command_info
+struct command_info
 {
-       char                    *name;          /* Command Name */
-       u8                      min_args;       /* Minimum arguments required */
+       char                            *name;          /* Command Name */
+       u8                              min_args;       /* Minimum arguments required */
+};
 
-} COMMAND_INFO;
 
-
-typedef struct argument_info
+struct argument_info
 {
-       char                    *name;          /* Argument Name */
-
-} ARGUMENT_INFO;
+       char                            *name;          /* Argument Name */
+};
 
 
 #define PARAM_LIST(pl)                  pl
@@ -71,9 +69,9 @@ acpi_db_terminate (
 
 acpi_status
 acpi_db_single_step (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       u32                     op_type);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       u32                             op_type);
 
 
 /*
@@ -82,65 +80,65 @@ acpi_db_single_step (
 
 void
 acpi_db_display_table_info (
-       char                    *table_arg);
+       char                            *table_arg);
 
 void
 acpi_db_unload_acpi_table (
-       char                    *table_arg,
-       char                    *instance_arg);
+       char                            *table_arg,
+       char                            *instance_arg);
 
 void
 acpi_db_set_method_breakpoint (
-       char                    *location,
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op);
+       char                            *location,
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op);
 
 void
 acpi_db_set_method_call_breakpoint (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 void
 acpi_db_disassemble_aml (
-       char                    *statements,
-       acpi_parse_object       *op);
+       char                            *statements,
+       union acpi_parse_object         *op);
 
 void
 acpi_db_dump_namespace (
-       char                    *start_arg,
-       char                    *depth_arg);
+       char                            *start_arg,
+       char                            *depth_arg);
 
 void
 acpi_db_dump_namespace_by_owner (
-       char                    *owner_arg,
-       char                    *depth_arg);
+       char                            *owner_arg,
+       char                            *depth_arg);
 
 void
 acpi_db_send_notify (
-       char                    *name,
-       u32                     value);
+       char                            *name,
+       u32                             value);
 
 void
 acpi_db_set_method_data (
-       char                    *type_arg,
-       char                    *index_arg,
-       char                    *value_arg);
+       char                            *type_arg,
+       char                            *index_arg,
+       char                            *value_arg);
 
 acpi_status
 acpi_db_display_objects (
-       char                    *obj_type_arg,
-       char                    *display_count_arg);
+       char                            *obj_type_arg,
+       char                            *display_count_arg);
 
 acpi_status
 acpi_db_find_name_in_namespace (
-       char                    *name_arg);
+       char                            *name_arg);
 
 void
 acpi_db_set_scope (
-       char                    *name);
+       char                            *name);
 
 void
 acpi_db_find_references (
-       char                    *object_arg);
+       char                            *object_arg);
 
 void
 acpi_db_display_locks (void);
@@ -148,7 +146,7 @@ acpi_db_display_locks (void);
 
 void
 acpi_db_display_resources (
-       char                    *object_arg);
+       char                            *object_arg);
 
 void
 acpi_db_check_integrity (
@@ -156,31 +154,31 @@ acpi_db_check_integrity (
 
 acpi_status
 acpi_db_integrity_walk (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value);
 
 acpi_status
 acpi_db_walk_and_match_name (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value);
 
 acpi_status
 acpi_db_walk_for_references (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value);
 
 acpi_status
 acpi_db_walk_for_specific_objects (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value);
 
 
 /*
@@ -189,30 +187,30 @@ acpi_db_walk_for_specific_objects (
 
 void
 acpi_db_display_method_info (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 void
 acpi_db_decode_and_display_object (
-       char                    *target,
-       char                    *output_type);
+       char                            *target,
+       char                            *output_type);
 
 void
 acpi_db_decode_node (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 void
 acpi_db_display_result_object (
-       acpi_operand_object     *obj_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *obj_desc,
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_db_display_all_methods (
-       char                    *display_count_arg);
+       char                            *display_count_arg);
 
 void
 acpi_db_display_internal_object (
-       acpi_operand_object     *obj_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *obj_desc,
+       struct acpi_walk_state          *walk_state);
 
 void
 acpi_db_display_arguments (
@@ -232,20 +230,20 @@ acpi_db_display_calling_tree (
 
 void
 acpi_db_display_argument_object (
-       acpi_operand_object     *obj_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *obj_desc,
+       struct acpi_walk_state          *walk_state);
 
 void
 acpi_db_dump_parser_descriptor (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 void *
 acpi_db_get_pointer (
-       void                    *target);
+       void                            *target);
 
 void
 acpi_db_decode_internal_object (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 
 /*
@@ -254,24 +252,24 @@ acpi_db_decode_internal_object (
 
 void
 acpi_db_execute (
-       char                    *name,
-       char                    **args,
-       u32                     flags);
+       char                            *name,
+       char                            **args,
+       u32                             flags);
 
 void
 acpi_db_create_execution_threads (
-       char                    *num_threads_arg,
-       char                    *num_loops_arg,
-       char                    *method_name_arg);
+       char                            *num_threads_arg,
+       char                            *num_loops_arg,
+       char                            *method_name_arg);
 
 acpi_status
 acpi_db_execute_method (
-       acpi_db_method_info     *info,
-       acpi_buffer             *return_obj);
+       struct acpi_db_method_info      *info,
+       struct acpi_buffer              *return_obj);
 
 void
 acpi_db_execute_setup (
-       acpi_db_method_info     *info);
+       struct acpi_db_method_info      *info);
 
 u32
 acpi_db_get_outstanding_allocations (
@@ -279,7 +277,7 @@ acpi_db_get_outstanding_allocations (
 
 void ACPI_SYSTEM_XFACE
 acpi_db_method_thread (
-       void                    *context);
+       void                            *context);
 
 
 /*
@@ -288,12 +286,12 @@ acpi_db_method_thread (
 
 acpi_object_type
 acpi_db_match_argument (
-       char                    *user_argument,
-       ARGUMENT_INFO           *arguments);
+       char                            *user_argument,
+       struct argument_info            *arguments);
 
 acpi_status
 ae_local_load_table (
-       acpi_table_header       *table_ptr);
+       struct acpi_table_header        *table_ptr);
 
 void
 acpi_db_close_debug_file (
@@ -301,15 +299,15 @@ acpi_db_close_debug_file (
 
 void
 acpi_db_open_debug_file (
-       char                    *name);
+       char                            *name);
 
 acpi_status
 acpi_db_load_acpi_table (
-       char                    *filename);
+       char                            *filename);
 
 acpi_status
 acpi_db_get_acpi_table (
-       char                    *filename);
+       char                            *filename);
 
 /*
  * dbhistry - debugger HISTORY command
@@ -317,14 +315,14 @@ acpi_db_get_acpi_table (
 
 void
 acpi_db_add_to_history (
-       char                    *command_line);
+       char                            *command_line);
 
 void
 acpi_db_display_history (void);
 
 char *
 acpi_db_get_from_history (
-       char                    *command_num_arg);
+       char                            *command_num_arg);
 
 
 /*
@@ -333,35 +331,35 @@ acpi_db_get_from_history (
 
 acpi_status
 acpi_db_command_dispatch (
-       char                    *input_buffer,
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op);
+       char                            *input_buffer,
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op);
 
 void ACPI_SYSTEM_XFACE
 acpi_db_execute_thread (
-       void                    *context);
+       void                            *context);
 
 acpi_status
 acpi_db_user_commands (
-       char                    prompt,
-       acpi_parse_object       *op);
+       char                            prompt,
+       union acpi_parse_object         *op);
 
 void
 acpi_db_display_help (
-       char                    *help_type);
+       char                            *help_type);
 
 char *
 acpi_db_get_next_token (
-       char                    *string,
-       char                    **next);
+       char                            *string,
+       char                            **next);
 
 u32
 acpi_db_get_line (
-       char                    *input_buffer);
+       char                            *input_buffer);
 
 u32
 acpi_db_match_command (
-       char                    *user_command);
+       char                            *user_command);
 
 void
 acpi_db_single_thread (
@@ -374,20 +372,20 @@ acpi_db_single_thread (
 
 void
 acpi_db_generate_statistics (
-       acpi_parse_object       *root,
-       u8                      is_method);
+       union acpi_parse_object         *root,
+       u8                              is_method);
 
 
 acpi_status
 acpi_db_display_statistics (
-       char                    *type_arg);
+       char                            *type_arg);
 
 acpi_status
 acpi_db_classify_one_object (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value);
 
 void
 acpi_db_count_namespace_objects (
@@ -395,7 +393,7 @@ acpi_db_count_namespace_objects (
 
 void
 acpi_db_enumerate_object (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 
 /*
@@ -404,29 +402,29 @@ acpi_db_enumerate_object (
 
 void
 acpi_db_set_output_destination (
-       u32                     where);
+       u32                             where);
 
 void
 acpi_db_dump_buffer (
-       u32                     address);
+       u32                             address);
 
 void
 acpi_db_dump_object (
-       acpi_object             *obj_desc,
-       u32                     level);
+       union acpi_object               *obj_desc,
+       u32                             level);
 
 void
 acpi_db_prep_namestring (
-       char                    *name);
+       char                            *name);
 
 
 acpi_status
 acpi_db_second_pass_parse (
-       acpi_parse_object       *root);
+       union acpi_parse_object         *root);
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_db_local_ns_lookup (
-       char                    *name);
+       char                            *name);
 
 
 #endif  /* __ACDEBUG_H__ */
index 5332805..d007aba 100644 (file)
@@ -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
 
 acpi_status
 acpi_ds_obj_stack_push (
-       void                    *object,
-       acpi_walk_state         *walk_state);
+       void                            *object,
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ds_obj_stack_pop (
-       u32                     pop_count,
-       acpi_walk_state         *walk_state);
+       u32                             pop_count,
+       struct acpi_walk_state          *walk_state);
 
 void *
 acpi_ds_obj_stack_get_value (
-       u32                     index,
-       acpi_walk_state         *walk_state);
+       u32                             index,
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 
 /* dsopcode - support for late evaluation */
 
 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
 acpi_ds_get_buffer_field_arguments (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ds_get_region_arguments (
-       acpi_operand_object     *rgn_desc);
+       union acpi_operand_object       *rgn_desc);
 
 acpi_status
 acpi_ds_get_buffer_arguments (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ds_get_package_arguments (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 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);
 
 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
 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
 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
 acpi_ds_initialize_region (
-       acpi_handle             obj_handle);
+       acpi_handle                     obj_handle);
 
 
 /* dsctrl - Parser/Interpreter interface, control stack routines */
@@ -114,13 +114,13 @@ acpi_ds_initialize_region (
 
 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
 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);
 
 
 /* dsexec - Parser/Interpreter interface, method execution callbacks */
@@ -128,80 +128,80 @@ acpi_ds_exec_end_control_op (
 
 acpi_status
 acpi_ds_get_predicate_value (
-       acpi_walk_state         *walk_state,
-       acpi_operand_object     *result_obj);
+       struct acpi_walk_state          *walk_state,
+       union acpi_operand_object       *result_obj);
 
 acpi_status
 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_status
 acpi_ds_exec_end_op (
-       acpi_walk_state         *state);
+       struct acpi_walk_state          *state);
 
 
 /* dsfield - Parser/Interpreter interface for AML fields */
 
 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
 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
 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
 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
 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_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);
 
 
 /* dsload - Parser/Interpreter interface, namespace load 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_status
 acpi_ds_load1_end_op (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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_status
 acpi_ds_load2_end_op (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ds_init_callbacks (
-       acpi_walk_state         *walk_state,
-       u32                     pass_number);
+       struct acpi_walk_state          *walk_state,
+       u32                             pass_number);
 
 
 /* dsmthdat - method data (locals/args) */
@@ -209,177 +209,177 @@ acpi_ds_init_callbacks (
 
 acpi_status
 acpi_ds_store_object_to_local (
-       u16                     opcode,
-       u32                     index,
-       acpi_operand_object     *src_desc,
-       acpi_walk_state         *walk_state);
+       u16                             opcode,
+       u32                             index,
+       union acpi_operand_object       *src_desc,
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ds_method_data_get_entry (
-       u16                     opcode,
-       u32                     index,
-       acpi_walk_state         *walk_state,
-       acpi_operand_object     ***node);
+       u16                             opcode,
+       u32                             index,
+       struct acpi_walk_state          *walk_state,
+       union acpi_operand_object       ***node);
 
 void
 acpi_ds_method_data_delete_all (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 u8
 acpi_ds_is_method_value (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 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
 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);
 
 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
 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
 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);
 
 void
 acpi_ds_method_data_init (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 
 /* dsmethod - Parser/Interpreter interface - control method parsing */
 
 acpi_status
 acpi_ds_parse_method (
-       acpi_handle             obj_handle);
+       acpi_handle                     obj_handle);
 
 acpi_status
 acpi_ds_call_control_method (
-       acpi_thread_state       *thread,
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op);
+       struct acpi_thread_state        *thread,
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op);
 
 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
 acpi_ds_terminate_control_method (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 
 /* dsobj - Parser/Interpreter interface - object initialization and conversion */
 
 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_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
 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_status
 acpi_ds_build_internal_package_obj (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       u32                     package_length,
-       acpi_operand_object     **obj_desc);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       u32                             package_length,
+       union acpi_operand_object       **obj_desc);
 
 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_status
 acpi_ds_init_object_from_op (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       u16                     opcode,
-       acpi_operand_object     **obj_desc);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       u16                             opcode,
+       union acpi_operand_object       **obj_desc);
 
 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);
 
 
 /* dsutils - Parser/Interpreter interface utility routines */
 
 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);
 
 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_status
 acpi_ds_create_operand (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *arg,
-       u32                     args_remaining);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *arg,
+       u32                             args_remaining);
 
 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
 acpi_ds_resolve_operands (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 void
 acpi_ds_clear_operands (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 
 /*
@@ -388,77 +388,77 @@ acpi_ds_clear_operands (
 
 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_status
 acpi_ds_scope_stack_pop (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 void
 acpi_ds_scope_stack_clear (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 
 /* dswstate - parser WALK_STATE management routines */
 
-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_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
 acpi_ds_obj_stack_delete_all (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 void
 acpi_ds_delete_walk_state (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
-acpi_walk_state *
+struct acpi_walk_state *
 acpi_ds_pop_walk_state (
-       acpi_thread_state       *thread);
+       struct acpi_thread_state        *thread);
 
 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_status
 acpi_ds_result_stack_pop (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ds_result_stack_push (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ds_result_stack_clear (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
-acpi_walk_state *
+struct acpi_walk_state *
 acpi_ds_get_current_walk_state (
-       acpi_thread_state       *thread);
+       struct acpi_thread_state        *thread);
 
 void
 acpi_ds_delete_walk_state_cache (
@@ -466,29 +466,29 @@ acpi_ds_delete_walk_state_cache (
 
 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_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_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_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_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);
 
 #endif /* _ACDISPAT_H_ */
index 68bb50b..ab3949a 100644 (file)
@@ -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,7 +49,7 @@ acpi_ev_fixed_event_detect (
 
 u32
 acpi_ev_fixed_event_dispatch (
-       u32                     event);
+       u32                             event);
 
 
 /*
@@ -58,11 +58,11 @@ acpi_ev_fixed_event_dispatch (
 
 u8
 acpi_ev_is_notify_object (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 acpi_status
 acpi_ev_acquire_global_lock(
-       u16                     timeout);
+       u16                             timeout);
 
 acpi_status
 acpi_ev_release_global_lock(
@@ -74,20 +74,20 @@ acpi_ev_init_global_lock_handler (
 
 u32
 acpi_ev_get_gpe_register_index (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 u32
 acpi_ev_get_gpe_number_index (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 acpi_status
 acpi_ev_queue_notify_request (
-       acpi_namespace_node     *node,
-       u32                     notify_value);
+       struct acpi_namespace_node      *node,
+       u32                             notify_value);
 
 void ACPI_SYSTEM_XFACE
 acpi_ev_notify_dispatch (
-       void                    *context);
+       void                            *context);
 
 
 /*
@@ -104,7 +104,7 @@ acpi_ev_init_gpe_control_methods (
 
 u32
 acpi_ev_gpe_dispatch (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 u32
 acpi_ev_gpe_detect (
@@ -120,29 +120,29 @@ acpi_ev_init_address_spaces (
 
 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
 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_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);
 
 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);
 
 
 /*
@@ -151,50 +151,50 @@ acpi_ev_detach_region (
 
 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_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_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
 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_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_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_status
 acpi_ev_initialize_region (
-       acpi_operand_object     *region_obj,
-       u8                      acpi_ns_locked);
+       union acpi_operand_object       *region_obj,
+       u8                              acpi_ns_locked);
 
 
 /*
@@ -211,7 +211,7 @@ acpi_ev_remove_sci_handler (
 
 u32
 acpi_ev_initialize_sCI (
-       u32                     program_sCI);
+       u32                             program_sCI);
 
 void
 acpi_ev_terminate (
index 5db7e41..f531a80 100644 (file)
@@ -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
index d32632d..a52f1ce 100644 (file)
@@ -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
 
 /* Runtime configuration of debug print levels */
 
-extern      u32                         acpi_dbg_level;
-extern      u32                         acpi_dbg_layer;
+extern      u32                                 acpi_dbg_level;
+extern      u32                                 acpi_dbg_layer;
 
 /* Procedure nesting level for debug output */
 
-extern      u32                         acpi_gbl_nesting_level;
+extern      u32                                 acpi_gbl_nesting_level;
 
 
 /*****************************************************************************
@@ -70,22 +70,22 @@ extern      u32                         acpi_gbl_nesting_level;
  * of each in the system.  Each global points to the actual table.
  *
  */
-ACPI_EXTERN u32                         acpi_gbl_table_flags;
-ACPI_EXTERN u32                         acpi_gbl_rsdt_table_count;
-ACPI_EXTERN rsdp_descriptor            *acpi_gbl_RSDP;
-ACPI_EXTERN xsdt_descriptor            *acpi_gbl_XSDT;
+ACPI_EXTERN u32                                 acpi_gbl_table_flags;
+ACPI_EXTERN u32                                 acpi_gbl_rsdt_table_count;
+ACPI_EXTERN struct rsdp_descriptor             *acpi_gbl_RSDP;
+ACPI_EXTERN XSDT_DESCRIPTOR            *acpi_gbl_XSDT;
 ACPI_EXTERN FADT_DESCRIPTOR            *acpi_gbl_FADT;
-ACPI_EXTERN acpi_table_header          *acpi_gbl_DSDT;
+ACPI_EXTERN struct acpi_table_header           *acpi_gbl_DSDT;
 ACPI_EXTERN FACS_DESCRIPTOR            *acpi_gbl_FACS;
-ACPI_EXTERN acpi_common_facs            acpi_gbl_common_fACS;
+ACPI_EXTERN struct acpi_common_facs             acpi_gbl_common_fACS;
 
 /*
  * Handle both ACPI 1.0 and ACPI 2.0 Integer widths
  * If we are running a method that exists in a 32-bit ACPI table.
  * Use only 32 bits of the Integer for conversion.
  */
-ACPI_EXTERN u8                          acpi_gbl_integer_bit_width;
-ACPI_EXTERN u8                          acpi_gbl_integer_byte_width;
+ACPI_EXTERN u8                                  acpi_gbl_integer_bit_width;
+ACPI_EXTERN u8                                  acpi_gbl_integer_byte_width;
 
 /*
  * Since there may be multiple SSDTs and PSDTS, a single pointer is not
@@ -96,15 +96,15 @@ ACPI_EXTERN u8                          acpi_gbl_integer_byte_width;
 /*
  * ACPI Table info arrays
  */
-extern      acpi_table_desc             acpi_gbl_acpi_tables[NUM_ACPI_TABLES];
-extern      ACPI_TABLE_SUPPORT          acpi_gbl_acpi_table_data[NUM_ACPI_TABLES];
+extern      struct acpi_table_desc              acpi_gbl_acpi_tables[NUM_ACPI_TABLES];
+extern      struct acpi_table_support           acpi_gbl_acpi_table_data[NUM_ACPI_TABLES];
 
 /*
  * Predefined mutex objects.  This array contains the
  * actual OS mutex handles, indexed by the local ACPI_MUTEX_HANDLEs.
  * (The table maps local handles to the real OS handles)
  */
-ACPI_EXTERN acpi_mutex_info             acpi_gbl_acpi_mutex_info [NUM_MTX];
+ACPI_EXTERN struct acpi_mutex_info              acpi_gbl_acpi_mutex_info [NUM_MTX];
 
 
 /*****************************************************************************
@@ -114,35 +114,35 @@ ACPI_EXTERN acpi_mutex_info             acpi_gbl_acpi_mutex_info [NUM_MTX];
  ****************************************************************************/
 
 
-ACPI_EXTERN acpi_memory_list            acpi_gbl_memory_lists[ACPI_NUM_MEM_LISTS];
-ACPI_EXTERN acpi_object_notify_handler  acpi_gbl_drv_notify;
-ACPI_EXTERN acpi_object_notify_handler  acpi_gbl_sys_notify;
-ACPI_EXTERN acpi_init_handler           acpi_gbl_init_handler;
-ACPI_EXTERN acpi_walk_state            *acpi_gbl_breakpoint_walk;
-ACPI_EXTERN acpi_handle                 acpi_gbl_global_lock_semaphore;
-
-ACPI_EXTERN u32                         acpi_gbl_global_lock_thread_count;
-ACPI_EXTERN u32                         acpi_gbl_original_mode;
-ACPI_EXTERN u32                         acpi_gbl_rsdp_original_location;
-ACPI_EXTERN u32                         acpi_gbl_ns_lookup_count;
-ACPI_EXTERN u32                         acpi_gbl_ps_find_count;
-ACPI_EXTERN u16                         acpi_gbl_pm1_enable_register_save;
-ACPI_EXTERN u16                         acpi_gbl_next_table_owner_id;
-ACPI_EXTERN u16                         acpi_gbl_next_method_owner_id;
-ACPI_EXTERN u16                         acpi_gbl_global_lock_handle;
-ACPI_EXTERN u8                          acpi_gbl_debugger_configuration;
-ACPI_EXTERN u8                          acpi_gbl_global_lock_acquired;
-ACPI_EXTERN u8                          acpi_gbl_step_to_next_call;
-ACPI_EXTERN u8                          acpi_gbl_acpi_hardware_present;
-ACPI_EXTERN u8                          acpi_gbl_global_lock_present;
-ACPI_EXTERN u8                          acpi_gbl_events_initialized;
-
-extern u8                               acpi_gbl_shutdown;
-extern u32                              acpi_gbl_startup_flags;
-extern const u8                         acpi_gbl_decode_to8bit[8];
-extern const char                      *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT];
-extern const acpi_opcode_info           acpi_gbl_aml_op_info[AML_NUM_OPCODES];
-extern const char                      *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
+ACPI_EXTERN struct acpi_memory_list             acpi_gbl_memory_lists[ACPI_NUM_MEM_LISTS];
+ACPI_EXTERN struct acpi_object_notify_handler   acpi_gbl_drv_notify;
+ACPI_EXTERN struct acpi_object_notify_handler   acpi_gbl_sys_notify;
+ACPI_EXTERN acpi_init_handler                   acpi_gbl_init_handler;
+ACPI_EXTERN struct acpi_walk_state             *acpi_gbl_breakpoint_walk;
+ACPI_EXTERN acpi_handle                         acpi_gbl_global_lock_semaphore;
+
+ACPI_EXTERN u32                                 acpi_gbl_global_lock_thread_count;
+ACPI_EXTERN u32                                 acpi_gbl_original_mode;
+ACPI_EXTERN u32                                 acpi_gbl_rsdp_original_location;
+ACPI_EXTERN u32                                 acpi_gbl_ns_lookup_count;
+ACPI_EXTERN u32                                 acpi_gbl_ps_find_count;
+ACPI_EXTERN u16                                 acpi_gbl_pm1_enable_register_save;
+ACPI_EXTERN u16                                 acpi_gbl_next_table_owner_id;
+ACPI_EXTERN u16                                 acpi_gbl_next_method_owner_id;
+ACPI_EXTERN u16                                 acpi_gbl_global_lock_handle;
+ACPI_EXTERN u8                                  acpi_gbl_debugger_configuration;
+ACPI_EXTERN u8                                  acpi_gbl_global_lock_acquired;
+ACPI_EXTERN u8                                  acpi_gbl_step_to_next_call;
+ACPI_EXTERN u8                                  acpi_gbl_acpi_hardware_present;
+ACPI_EXTERN u8                                  acpi_gbl_global_lock_present;
+ACPI_EXTERN u8                                  acpi_gbl_events_initialized;
+
+extern u8                                       acpi_gbl_shutdown;
+extern u32                                      acpi_gbl_startup_flags;
+extern const u8                                 acpi_gbl_decode_to8bit[8];
+extern const char                              *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT];
+extern const struct acpi_opcode_info            acpi_gbl_aml_op_info[AML_NUM_OPCODES];
+extern const char                              *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
 
 /*****************************************************************************
@@ -159,19 +159,19 @@ extern const char                      *acpi_gbl_region_types[ACPI_NUM_PREDEFINE
 #define NUM_PREDEFINED_NAMES            9
 #endif
 
-ACPI_EXTERN acpi_namespace_node         acpi_gbl_root_node_struct;
-ACPI_EXTERN acpi_namespace_node        *acpi_gbl_root_node;
+ACPI_EXTERN struct acpi_namespace_node          acpi_gbl_root_node_struct;
+ACPI_EXTERN struct acpi_namespace_node         *acpi_gbl_root_node;
 
-extern const u8                         acpi_gbl_ns_properties[NUM_NS_TYPES];
-extern const acpi_predefined_names      acpi_gbl_pre_defined_names [NUM_PREDEFINED_NAMES];
+extern const u8                                 acpi_gbl_ns_properties[NUM_NS_TYPES];
+extern const struct acpi_predefined_names       acpi_gbl_pre_defined_names [NUM_PREDEFINED_NAMES];
 
 #ifdef ACPI_DEBUG_OUTPUT
-ACPI_EXTERN u32                         acpi_gbl_current_node_count;
-ACPI_EXTERN u32                         acpi_gbl_current_node_size;
-ACPI_EXTERN u32                         acpi_gbl_max_concurrent_node_count;
-ACPI_EXTERN acpi_size                   acpi_gbl_entry_stack_pointer;
-ACPI_EXTERN acpi_size                   acpi_gbl_lowest_stack_pointer;
-ACPI_EXTERN u32                         acpi_gbl_deepest_nesting;
+ACPI_EXTERN u32                                 acpi_gbl_current_node_count;
+ACPI_EXTERN u32                                 acpi_gbl_current_node_size;
+ACPI_EXTERN u32                                 acpi_gbl_max_concurrent_node_count;
+ACPI_EXTERN acpi_size                           acpi_gbl_entry_stack_pointer;
+ACPI_EXTERN acpi_size                           acpi_gbl_lowest_stack_pointer;
+ACPI_EXTERN u32                                 acpi_gbl_deepest_nesting;
 #endif
 
 /*****************************************************************************
@@ -181,11 +181,11 @@ ACPI_EXTERN u32                         acpi_gbl_deepest_nesting;
  ****************************************************************************/
 
 
-ACPI_EXTERN acpi_thread_state           *acpi_gbl_current_walk_list;
+ACPI_EXTERN struct acpi_thread_state            *acpi_gbl_current_walk_list;
 
 /* Control method single step flag */
 
-ACPI_EXTERN u8                          acpi_gbl_cm_single_step;
+ACPI_EXTERN u8                                  acpi_gbl_cm_single_step;
 
 
 /*****************************************************************************
@@ -194,7 +194,7 @@ ACPI_EXTERN u8                          acpi_gbl_cm_single_step;
  *
  ****************************************************************************/
 
-ACPI_EXTERN acpi_parse_object           *acpi_gbl_parsed_namespace_root;
+ACPI_EXTERN union acpi_parse_object             *acpi_gbl_parsed_namespace_root;
 
 /*****************************************************************************
  *
@@ -202,9 +202,9 @@ ACPI_EXTERN acpi_parse_object           *acpi_gbl_parsed_namespace_root;
  *
  ****************************************************************************/
 
-extern      acpi_bit_register_info      acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
-ACPI_EXTERN u8                          acpi_gbl_sleep_type_a;
-ACPI_EXTERN u8                          acpi_gbl_sleep_type_b;
+extern      struct acpi_bit_register_info       acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
+ACPI_EXTERN u8                                  acpi_gbl_sleep_type_a;
+ACPI_EXTERN u8                                  acpi_gbl_sleep_type_b;
 
 
 /*****************************************************************************
@@ -213,15 +213,15 @@ ACPI_EXTERN u8                          acpi_gbl_sleep_type_b;
  *
  ****************************************************************************/
 
-extern      acpi_fixed_event_info       acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];
-ACPI_EXTERN acpi_fixed_event_handler    acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
+extern      struct acpi_fixed_event_info        acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];
+ACPI_EXTERN struct acpi_fixed_event_handler     acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
 
-ACPI_EXTERN acpi_handle                 acpi_gbl_gpe_obj_handle;
-ACPI_EXTERN u32                         acpi_gbl_gpe_register_count;
-ACPI_EXTERN u32                         acpi_gbl_gpe_number_max;
-ACPI_EXTERN acpi_gpe_register_info     *acpi_gbl_gpe_register_info;
-ACPI_EXTERN acpi_gpe_number_info       *acpi_gbl_gpe_number_info;
-ACPI_EXTERN acpi_gpe_block_info         acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLOCKS];
+ACPI_EXTERN acpi_handle                         acpi_gbl_gpe_obj_handle;
+ACPI_EXTERN u32                                 acpi_gbl_gpe_register_count;
+ACPI_EXTERN u32                                 acpi_gbl_gpe_number_max;
+ACPI_EXTERN struct acpi_gpe_register_info      *acpi_gbl_gpe_register_info;
+ACPI_EXTERN struct acpi_gpe_number_info        *acpi_gbl_gpe_number_info;
+ACPI_EXTERN struct acpi_gpe_block_info          acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLOCKS];
 
 /*
  * GPE translation table
@@ -230,7 +230,7 @@ ACPI_EXTERN acpi_gpe_block_info         acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLO
  * This table is needed because the GPE numbers supported by block 1 do not
  * have to be contiguous with the GPE numbers supported by block 0.
  */
-ACPI_EXTERN acpi_gpe_index_info        *acpi_gbl_gpe_number_to_index;
+ACPI_EXTERN struct acpi_gpe_index_info         *acpi_gbl_gpe_number_to_index;
 
 
 /*****************************************************************************
@@ -240,57 +240,57 @@ ACPI_EXTERN acpi_gpe_index_info        *acpi_gbl_gpe_number_to_index;
  ****************************************************************************/
 
 
-ACPI_EXTERN u8                          acpi_gbl_db_output_flags;
+ACPI_EXTERN u8                                  acpi_gbl_db_output_flags;
 
 #ifdef ACPI_DISASSEMBLER
 
-ACPI_EXTERN u8                          acpi_gbl_db_opt_disasm;
-ACPI_EXTERN u8                          acpi_gbl_db_opt_verbose;
+ACPI_EXTERN u8                                  acpi_gbl_db_opt_disasm;
+ACPI_EXTERN u8                                  acpi_gbl_db_opt_verbose;
 #endif
 
 
 #ifdef ACPI_DEBUGGER
 
-extern      u8                          acpi_gbl_method_executing;
-extern      u8                          acpi_gbl_abort_method;
-extern      u8                          acpi_gbl_db_terminate_threads;
+extern      u8                                  acpi_gbl_method_executing;
+extern      u8                                  acpi_gbl_abort_method;
+extern      u8                                  acpi_gbl_db_terminate_threads;
 
-ACPI_EXTERN int                         optind;
-ACPI_EXTERN char                       *optarg;
+ACPI_EXTERN int                                 optind;
+ACPI_EXTERN char                               *optarg;
 
-ACPI_EXTERN u8                          acpi_gbl_db_opt_tables;
-ACPI_EXTERN u8                          acpi_gbl_db_opt_stats;
-ACPI_EXTERN u8                          acpi_gbl_db_opt_ini_methods;
+ACPI_EXTERN u8                                  acpi_gbl_db_opt_tables;
+ACPI_EXTERN u8                                  acpi_gbl_db_opt_stats;
+ACPI_EXTERN u8                                  acpi_gbl_db_opt_ini_methods;
 
 
-ACPI_EXTERN char                       *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN char                        acpi_gbl_db_line_buf[80];
-ACPI_EXTERN char                        acpi_gbl_db_parsed_buf[80];
-ACPI_EXTERN char                        acpi_gbl_db_scope_buf[40];
-ACPI_EXTERN char                        acpi_gbl_db_debug_filename[40];
-ACPI_EXTERN u8                          acpi_gbl_db_output_to_file;
-ACPI_EXTERN char                       *acpi_gbl_db_buffer;
-ACPI_EXTERN char                       *acpi_gbl_db_filename;
-ACPI_EXTERN u32                         acpi_gbl_db_debug_level;
-ACPI_EXTERN u32                         acpi_gbl_db_console_debug_level;
-ACPI_EXTERN acpi_table_header          *acpi_gbl_db_table_ptr;
-ACPI_EXTERN acpi_namespace_node        *acpi_gbl_db_scope_node;
+ACPI_EXTERN char                               *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
+ACPI_EXTERN char                                acpi_gbl_db_line_buf[80];
+ACPI_EXTERN char                                acpi_gbl_db_parsed_buf[80];
+ACPI_EXTERN char                                acpi_gbl_db_scope_buf[40];
+ACPI_EXTERN char                                acpi_gbl_db_debug_filename[40];
+ACPI_EXTERN u8                                  acpi_gbl_db_output_to_file;
+ACPI_EXTERN char                               *acpi_gbl_db_buffer;
+ACPI_EXTERN char                               *acpi_gbl_db_filename;
+ACPI_EXTERN u32                                 acpi_gbl_db_debug_level;
+ACPI_EXTERN u32                                 acpi_gbl_db_console_debug_level;
+ACPI_EXTERN struct acpi_table_header           *acpi_gbl_db_table_ptr;
+ACPI_EXTERN struct acpi_namespace_node         *acpi_gbl_db_scope_node;
 
 /*
  * Statistic globals
  */
-ACPI_EXTERN u16                         acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX+1];
-ACPI_EXTERN u16                         acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX+1];
-ACPI_EXTERN u16                         acpi_gbl_obj_type_count_misc;
-ACPI_EXTERN u16                         acpi_gbl_node_type_count_misc;
-ACPI_EXTERN u32                         acpi_gbl_num_nodes;
-ACPI_EXTERN u32                         acpi_gbl_num_objects;
-
-
-ACPI_EXTERN u32                         acpi_gbl_size_of_parse_tree;
-ACPI_EXTERN u32                         acpi_gbl_size_of_method_trees;
-ACPI_EXTERN u32                         acpi_gbl_size_of_node_entries;
-ACPI_EXTERN u32                         acpi_gbl_size_of_acpi_objects;
+ACPI_EXTERN u16                                 acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX+1];
+ACPI_EXTERN u16                                 acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX+1];
+ACPI_EXTERN u16                                 acpi_gbl_obj_type_count_misc;
+ACPI_EXTERN u16                                 acpi_gbl_node_type_count_misc;
+ACPI_EXTERN u32                                 acpi_gbl_num_nodes;
+ACPI_EXTERN u32                                 acpi_gbl_num_objects;
+
+
+ACPI_EXTERN u32                                 acpi_gbl_size_of_parse_tree;
+ACPI_EXTERN u32                                 acpi_gbl_size_of_method_trees;
+ACPI_EXTERN u32                                 acpi_gbl_size_of_node_entries;
+ACPI_EXTERN u32                                 acpi_gbl_size_of_acpi_objects;
 
 #endif /* ACPI_DEBUGGER */
 
index 57469b2..4916993 100644 (file)
@@ -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 @@ acpi_hw_initialize_system_info (
 
 acpi_status
 acpi_hw_set_mode (
-       u32                     mode);
+       u32                             mode);
 
 u32
 acpi_hw_get_mode (
@@ -59,35 +59,35 @@ acpi_hw_get_mode_capabilities (
 
 /* Register I/O Prototypes */
 
-acpi_bit_register_info *
+struct acpi_bit_register_info *
 acpi_hw_get_bit_register_info (
-       u32                     register_id);
+       u32                             register_id);
 
 acpi_status
 acpi_hw_register_read (
-       u8                      use_lock,
-       u32                     register_id,
-       u32                     *return_value);
+       u8                              use_lock,
+       u32                             register_id,
+       u32                             *return_value);
 
 acpi_status
 acpi_hw_register_write (
-       u8                      use_lock,
-       u32                     register_id,
-       u32                     value);
+       u8                              use_lock,
+       u32                             register_id,
+       u32                             value);
 
 acpi_status
 acpi_hw_low_level_read (
-       u32                     width,
-       u32                     *value,
-       acpi_generic_address    *reg,
-       u32                     offset);
+       u32                             width,
+       u32                             *value,
+       struct acpi_generic_address     *reg,
+       u32                             offset);
 
 acpi_status
 acpi_hw_low_level_write (
-       u32                     width,
-       u32                     value,
-       acpi_generic_address    *reg,
-       u32                     offset);
+       u32                             width,
+       u32                             value,
+       struct acpi_generic_address     *reg,
+       u32                             offset);
 
 acpi_status
 acpi_hw_clear_acpi_status (
@@ -98,32 +98,32 @@ acpi_hw_clear_acpi_status (
 
 u8
 acpi_hw_get_gpe_bit_mask (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 acpi_status
 acpi_hw_enable_gpe (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 void
 acpi_hw_enable_gpe_for_wakeup (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 acpi_status
 acpi_hw_disable_gpe (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 void
 acpi_hw_disable_gpe_for_wakeup (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 acpi_status
 acpi_hw_clear_gpe (
-       u32                     gpe_number);
+       u32                             gpe_number);
 
 acpi_status
 acpi_hw_get_gpe_status (
-       u32                     gpe_number,
-       acpi_event_status       *event_status);
+       u32                             gpe_number,
+       acpi_event_status               *event_status);
 
 acpi_status
 acpi_hw_disable_non_wakeup_gpes (
@@ -138,17 +138,17 @@ acpi_hw_enable_non_wakeup_gpes (
 
 acpi_status
 acpi_get_timer_resolution (
-       u32                     *resolution);
+       u32                             *resolution);
 
 acpi_status
 acpi_get_timer (
-       u32                     *ticks);
+       u32                             *ticks);
 
 acpi_status
 acpi_get_timer_duration (
-       u32                     start_ticks,
-       u32                     end_ticks,
-       u32                     *time_elapsed);
+       u32                             start_ticks,
+       u32                             end_ticks,
+       u32                             *time_elapsed);
 
 
 #endif /* __ACHWARE_H__ */
index 7831616..cd00608 100644 (file)
@@ -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
 
 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_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);
 
 /*
  * exxface - External interpreter interfaces
@@ -47,13 +47,13 @@ acpi_ex_check_object_type (
 
 acpi_status
 acpi_ex_load_table (
-       acpi_table_type         table_id);
+       acpi_table_type                 table_id);
 
 acpi_status
 acpi_ex_execute_method (
-       acpi_namespace_node     *method_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_obj_desc);
+       struct acpi_namespace_node      *method_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_obj_desc);
 
 
 /*
@@ -62,37 +62,37 @@ acpi_ex_execute_method (
 
 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);
 
 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_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_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);
 
 u32
 acpi_ex_convert_to_ascii (
-       acpi_integer            integer,
-       u32                     base,
-       u8                      *string,
-       u8                      max_length);
+       acpi_integer                    integer,
+       u32                             base,
+       u8                              *string,
+       u8                              max_length);
 
 /*
  * exfield - ACPI AML (p-code) execution - field manipulation
@@ -100,72 +100,72 @@ acpi_ex_convert_to_ascii (
 
 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
 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
 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
 acpi_ex_access_region (
-       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);
 
 u8
 acpi_ex_register_overflow (
-       acpi_operand_object     *obj_desc,
-       acpi_integer            value);
+       union acpi_operand_object       *obj_desc,
+       acpi_integer                    value);
 
 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
 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);
 
 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);
 
 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_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
 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);
 
 /*
  * exmisc - ACPI AML (p-code) execution - specific opcodes
@@ -173,97 +173,97 @@ acpi_ex_write_data_to_field (
 
 acpi_status
 acpi_ex_opcode_3A_0T_0R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_3A_1T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_6A_0T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 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_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_status
 acpi_ex_concat_template (
-       acpi_operand_object     *obj_desc,
-       acpi_operand_object     *obj_desc2,
-       acpi_operand_object     **actual_return_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *obj_desc,
+       union acpi_operand_object       *obj_desc2,
+       union acpi_operand_object       **actual_return_desc,
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_do_concatenate (
-       acpi_operand_object     *obj_desc,
-       acpi_operand_object     *obj_desc2,
-       acpi_operand_object     **actual_return_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *obj_desc,
+       union acpi_operand_object       *obj_desc2,
+       union acpi_operand_object       **actual_return_desc,
+       struct acpi_walk_state          *walk_state);
 
 u8
 acpi_ex_do_logical_op (
-       u16                     opcode,
-       acpi_integer            operand0,
-       acpi_integer            operand1);
+       u16                             opcode,
+       acpi_integer                    operand0,
+       acpi_integer                    operand1);
 
 acpi_integer
 acpi_ex_do_math_op (
-       u16                     opcode,
-       acpi_integer            operand0,
-       acpi_integer            operand1);
+       u16                             opcode,
+       acpi_integer                    operand0,
+       acpi_integer                    operand1);
 
 acpi_status
 acpi_ex_create_mutex (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_create_processor (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_create_power_resource (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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
 acpi_ex_create_table_region (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_create_event (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_create_alias (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 
 /*
@@ -272,24 +272,24 @@ acpi_ex_create_method (
 
 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
 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
 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
 acpi_ex_unload_table (
-       acpi_operand_object     *ddb_handle);
+       union acpi_operand_object       *ddb_handle);
 
 
 /*
@@ -298,27 +298,27 @@ acpi_ex_unload_table (
 
 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
 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);
 
 void
 acpi_ex_release_all_mutexes (
-       acpi_thread_state       *thread);
+       struct acpi_thread_state        *thread);
 
 void
 acpi_ex_unlink_mutex (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 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);
 
 /*
  * exprep - ACPI AML (p-code) execution - prep utilities
@@ -326,15 +326,15 @@ acpi_ex_link_mutex (
 
 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);
 
 acpi_status
 acpi_ex_prep_field_value (
-       acpi_create_field_info  *info);
+       struct acpi_create_field_info   *info);
 
 /*
  * exsystem - Interface to OS services
@@ -342,43 +342,43 @@ acpi_ex_prep_field_value (
 
 acpi_status
 acpi_ex_system_do_notify_op (
-       acpi_operand_object     *value,
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *value,
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ex_system_do_suspend(
-       u32                     time);
+       u32                             time);
 
 acpi_status
 acpi_ex_system_do_stall (
-       u32                     time);
+       u32                             time);
 
 acpi_status
 acpi_ex_system_acquire_mutex(
-       acpi_operand_object     *time,
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *time,
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ex_system_release_mutex(
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ex_system_signal_event(
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ex_system_wait_event(
-       acpi_operand_object     *time,
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *time,
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ex_system_reset_event(
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ex_system_wait_semaphore (
-       acpi_handle             semaphore,
-       u16                     timeout);
+       acpi_handle                     semaphore,
+       u16                             timeout);
 
 
 /*
@@ -387,19 +387,19 @@ acpi_ex_system_wait_semaphore (
 
 acpi_status
 acpi_ex_opcode_1A_0T_0R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_1A_0T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_1A_1T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_1A_1T_0R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 /*
  * exdyadic - ACPI AML (p-code) execution, dyadic operators
@@ -407,19 +407,19 @@ acpi_ex_opcode_1A_1T_0R (
 
 acpi_status
 acpi_ex_opcode_2A_0T_0R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_2A_0T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_2A_1T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_opcode_2A_2T_1R (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 
 /*
@@ -428,18 +428,18 @@ acpi_ex_opcode_2A_2T_1R (
 
 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
 acpi_ex_resolve_node_to_value (
-       acpi_namespace_node     **stack_ptr,
-       acpi_walk_state         *walk_state);
+       struct acpi_namespace_node      **stack_ptr,
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 
 /*
@@ -448,47 +448,47 @@ acpi_ex_resolve_object_to_value (
 
 void
 acpi_ex_dump_operand (
-       acpi_operand_object     *entry_desc);
+       union acpi_operand_object       *entry_desc);
 
 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);
 
 void
 acpi_ex_dump_object_descriptor (
-       acpi_operand_object     *object,
-       u32                     flags);
+       union acpi_operand_object       *object,
+       u32                             flags);
 
 void
 acpi_ex_dump_node (
-       acpi_namespace_node     *node,
-       u32                     flags);
+       struct acpi_namespace_node      *node,
+       u32                             flags);
 
 void
 acpi_ex_out_string (
-       char                    *title,
-       char                    *value);
+       char                            *title,
+       char                            *value);
 
 void
 acpi_ex_out_pointer (
-       char                    *title,
-       void                    *value);
+       char                            *title,
+       void                            *value);
 
 void
 acpi_ex_out_integer (
-       char                    *title,
-       u32                     value);
+       char                            *title,
+       u32                             value);
 
 void
 acpi_ex_out_address (
-       char                    *title,
-       acpi_physical_address   value);
+       char                            *title,
+       acpi_physical_address           value);
 
 
 /*
@@ -497,29 +497,29 @@ acpi_ex_out_address (
 
 char *
 acpi_ex_allocate_name_string (
-       u32                     prefix_count,
-       u32                     num_name_segs);
+       u32                             prefix_count,
+       u32                             num_name_segs);
 
 u32
 acpi_ex_good_char (
-       u32                     character);
+       u32                             character);
 
 acpi_status
 acpi_ex_name_segment (
-       u8                      **in_aml_address,
-       char                    *name_string);
+       u8                              **in_aml_address,
+       char                            *name_string);
 
 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
 acpi_ex_do_name (
-       acpi_object_type        data_type,
-       acpi_interpreter_mode   load_exec_mode);
+       acpi_object_type                data_type,
+       acpi_interpreter_mode           load_exec_mode);
 
 
 /*
@@ -528,21 +528,21 @@ acpi_ex_do_name (
 
 acpi_status
 acpi_ex_store (
-       acpi_operand_object     *val_desc,
-       acpi_operand_object     *dest_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *val_desc,
+       union acpi_operand_object       *dest_desc,
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ex_store_object_to_index (
-       acpi_operand_object     *val_desc,
-       acpi_operand_object     *dest_desc,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *val_desc,
+       union acpi_operand_object       *dest_desc,
+       struct acpi_walk_state          *walk_state);
 
 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);
 
 
 /*
@@ -551,16 +551,16 @@ acpi_ex_store_object_to_node (
 
 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_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);
 
 
 /*
@@ -569,33 +569,33 @@ acpi_ex_store_object_to_object (
 
 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);
 
 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);
 
 acpi_status
 acpi_ex_copy_integer_to_index_field (
-       acpi_operand_object     *source_desc,
-       acpi_operand_object     *target_desc);
+       union acpi_operand_object       *source_desc,
+       union acpi_operand_object       *target_desc);
 
 acpi_status
 acpi_ex_copy_integer_to_bank_field (
-       acpi_operand_object     *source_desc,
-       acpi_operand_object     *target_desc);
+       union acpi_operand_object       *source_desc,
+       union acpi_operand_object       *target_desc);
 
 acpi_status
 acpi_ex_copy_data_to_named_field (
-       acpi_operand_object     *source_desc,
-       acpi_namespace_node     *node);
+       union acpi_operand_object       *source_desc,
+       struct acpi_namespace_node      *node);
 
 acpi_status
 acpi_ex_copy_integer_to_buffer_field (
-       acpi_operand_object     *source_desc,
-       acpi_operand_object     *target_desc);
+       union acpi_operand_object       *source_desc,
+       union acpi_operand_object       *target_desc);
 
 /*
  * exutils - interpreter/scanner utilities
@@ -611,30 +611,30 @@ acpi_ex_exit_interpreter (
 
 void
 acpi_ex_truncate_for32bit_table (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 u8
 acpi_ex_acquire_global_lock (
-       u32                     rule);
+       u32                             rule);
 
 void
 acpi_ex_release_global_lock (
-       u8                      locked);
+       u8                              locked);
 
 u32
 acpi_ex_digits_needed (
-       acpi_integer            value,
-       u32                     base);
+       acpi_integer                    value,
+       u32                             base);
 
 void
 acpi_ex_eisa_id_to_string (
-       u32                     numeric_id,
-       char                    *out_string);
+       u32                             numeric_id,
+       char                            *out_string);
 
 void
 acpi_ex_unsigned_integer_to_string (
-       acpi_integer            value,
-       char                    *out_string);
+       acpi_integer                    value,
+       char                            *out_string);
 
 
 /*
@@ -643,75 +643,75 @@ acpi_ex_unsigned_integer_to_string (
 
 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
 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
 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
 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
 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
 acpi_ex_embedded_controller_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
 acpi_ex_sm_bus_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
 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);
 
 #endif /* __INTERP_H__ */
index c4c39b1..1e3e964 100644 (file)
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 - 2002, R. Byron Moore
+ *  Copyright (C) 2000 - 2003, R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@
 
 #define ACPI_WAIT_FOREVER               0xFFFF  /* u16, as per ACPI spec */
 
-typedef void*                           acpi_mutex;
-typedef u32                             acpi_mutex_handle;
+typedef void *                                  acpi_mutex;
+typedef u32                                     acpi_mutex_handle;
 
 
 /* Total number of aml opcodes defined */
@@ -77,7 +77,7 @@ typedef u32                             acpi_mutex_handle;
 
 /* Names for the mutexes used in the subsystem */
 
-static char                 *acpi_gbl_mutex_names[] =
+static char                         *acpi_gbl_mutex_names[] =
 {
        "ACPI_MTX_Execute",
        "ACPI_MTX_Interpreter",
@@ -100,13 +100,12 @@ static char                 *acpi_gbl_mutex_names[] =
 
 /* Table for the global mutexes */
 
-typedef struct acpi_mutex_info
+struct acpi_mutex_info
 {
-       acpi_mutex                  mutex;
-       u32                         use_count;
-       u32                         owner_id;
-
-} acpi_mutex_info;
+       acpi_mutex                          mutex;
+       u32                                 use_count;
+       u32                                 owner_id;
+};
 
 /* This owner ID means that the mutex is not in use (unlocked) */
 
@@ -119,7 +118,7 @@ typedef struct acpi_mutex_info
 #define ACPI_MTX_LOCK                   1
 
 
-typedef u16                             acpi_owner_id;
+typedef u16                                     acpi_owner_id;
 #define ACPI_OWNER_TYPE_TABLE           0x0
 #define ACPI_OWNER_TYPE_METHOD          0x1
 #define ACPI_FIRST_METHOD_ID            0x0000
@@ -163,27 +162,26 @@ typedef enum
  * be the first byte in this structure.
  */
 
-typedef union acpi_name_union
+union acpi_name_union
 {
-       u32                     integer;
-       char                    ascii[4];
-} acpi_name_union;
+       u32                                 integer;
+       char                                ascii[4];
+};
 
-typedef struct acpi_node
+struct acpi_namespace_node
 {
-       u8                      descriptor;     /* Used to differentiate object descriptor types */
-       u8                      type;           /* Type associated with this name */
-       u16                     owner_id;
-       acpi_name_union         name;           /* ACPI Name, always 4 chars per ACPI spec */
+       u8                                  descriptor;     /* Used to differentiate object descriptor types */
+       u8                                  type;           /* Type associated with this name */
+       u16                                 owner_id;
+       union acpi_name_union               name;           /* ACPI Name, always 4 chars per ACPI spec */
 
 
-       union acpi_operand_obj  *object;        /* Pointer to attached ACPI object (optional) */
-       struct acpi_node        *child;         /* first child */
-       struct acpi_node        *peer;          /* Next peer*/
-       u16                     reference_count; /* Current count of references and children */
-       u8                      flags;
-
-} acpi_namespace_node;
+       union acpi_operand_object           *object;        /* Pointer to attached ACPI object (optional) */
+       struct acpi_namespace_node          *child;         /* first child */
+       struct acpi_namespace_node          *peer;          /* Next peer*/
+       u16                                 reference_count; /* Current count of references and children */
+       u8                                  flags;
+};
 
 
 #define ACPI_ENTRY_NOT_FOUND            NULL
@@ -205,50 +203,47 @@ typedef struct acpi_node
 /*
  * ACPI Table Descriptor.  One per ACPI table
  */
-typedef struct acpi_table_desc
-{
-       struct acpi_table_desc  *prev;
-       struct acpi_table_desc  *next;
-       struct acpi_table_desc  *installed_desc;
-       acpi_table_header       *pointer;
-       u8                      *aml_start;
-       u64                     physical_address;
-       u32                     aml_length;
-       acpi_size               length;
-       u32                     count;
-       acpi_owner_id           table_id;
-       u8                      type;
-       u8                      allocation;
-       u8                      loaded_into_namespace;
-
-} acpi_table_desc;
+struct acpi_table_desc
+{
+       struct acpi_table_desc          *prev;
+       struct acpi_table_desc          *next;
+       struct acpi_table_desc          *installed_desc;
+       struct acpi_table_header        *pointer;
+       u8                              *aml_start;
+       u64                             physical_address;
+       u32                             aml_length;
+       acpi_size                       length;
+       u32                             count;
+       acpi_owner_id                   table_id;
+       u8                              type;
+       u8                              allocation;
+       u8                              loaded_into_namespace;
+};
 
 
-typedef struct
+struct acpi_find_context
 {
-       char                    *search_for;
-       acpi_handle             *list;
-       u32                     *count;
-
-} acpi_find_context;
+       char                            *search_for;
+       acpi_handle                     *list;
+       u32                             *count;
+};
 
 
-typedef struct
+struct acpi_ns_search_data
 {
-       acpi_namespace_node     *node;
-} acpi_ns_search_data;
+       struct acpi_namespace_node      *node;
+};
 
 
 /*
  * Predefined Namespace items
  */
-typedef struct
+struct acpi_predefined_names
 {
-       char                    *name;
-       u8                      type;
-       char                    *val;
-
-} acpi_predefined_names;
+       char                            *name;
+       u8                              type;
+       char                            *val;
+};
 
 
 /* Object types used during package copies */
@@ -259,35 +254,33 @@ typedef struct
 
 /* Info structure used to convert external<->internal namestrings */
 
-typedef struct acpi_namestring_info
+struct acpi_namestring_info
 {
-       char                    *external_name;
-       char                    *next_external_char;
-       char                    *internal_name;
-       u32                     length;
-       u32                     num_segments;
-       u32                     num_carats;
-       u8                      fully_qualified;
-
-} acpi_namestring_info;
+       char                            *external_name;
+       char                            *next_external_char;
+       char                            *internal_name;
+       u32                             length;
+       u32                             num_segments;
+       u32                             num_carats;
+       u8                              fully_qualified;
+};
 
 
 /* Field creation info */
 
-typedef struct
-{
-       acpi_namespace_node     *region_node;
-       acpi_namespace_node     *field_node;
-       acpi_namespace_node     *register_node;
-       acpi_namespace_node     *data_register_node;
-       u32                     bank_value;
-       u32                     field_bit_position;
-       u32                     field_bit_length;
-       u8                      field_flags;
-       u8                      attribute;
-       u8                      field_type;
-
-} acpi_create_field_info;
+struct acpi_create_field_info
+{
+       struct acpi_namespace_node      *region_node;
+       struct acpi_namespace_node      *field_node;
+       struct acpi_namespace_node      *register_node;
+       struct acpi_namespace_node      *data_register_node;
+       u32                             bank_value;
+       u32                             field_bit_position;
+       u32                             field_bit_length;
+       u8                              field_flags;
+       u8                              attribute;
+       u8                              field_type;
+};
 
 
 /*****************************************************************************
@@ -298,26 +291,24 @@ typedef struct
 
 /* Information about each GPE register block */
 
-typedef struct
+struct acpi_gpe_block_info
 {
-       acpi_generic_address    *block_address;
-       u16                     register_count;
-       u8                      block_base_number;
-
-} acpi_gpe_block_info;
+       struct acpi_generic_address     *block_address;
+       u16                             register_count;
+       u8                              block_base_number;
+};
 
 /* Information about a particular GPE register pair */
 
-typedef struct
+struct acpi_gpe_register_info
 {
-       acpi_generic_address    status_address; /* Address of status reg */
-       acpi_generic_address    enable_address; /* Address of enable reg */
-       u8                      status;         /* Current value of status reg */
-       u8                      enable;         /* Current value of enable reg */
-       u8                      wake_enable;    /* Mask of bits to keep enabled when sleeping */
-       u8                      base_gpe_number; /* Base GPE number for this register */
-
-} acpi_gpe_register_info;
+       struct acpi_generic_address     status_address; /* Address of status reg */
+       struct acpi_generic_address     enable_address; /* Address of enable reg */
+       u8                              status;         /* Current value of status reg */
+       u8                              enable;         /* Current value of enable reg */
+       u8                              wake_enable;    /* Mask of bits to keep enabled when sleeping */
+       u8                              base_gpe_number; /* Base GPE number for this register */
+};
 
 
 #define ACPI_GPE_LEVEL_TRIGGERED        1
@@ -326,52 +317,46 @@ typedef struct
 
 /* Information about each particular GPE level */
 
-typedef struct
+struct acpi_gpe_number_info
 {
-       acpi_namespace_node     *method_node;   /* Method node for this GPE level */
-       acpi_gpe_handler        handler;        /* Address of handler, if any */
-       void                    *context;       /* Context to be passed to handler */
-       u8                      type;           /* Level or Edge */
-       u8                      bit_mask;
-
-
-} acpi_gpe_number_info;
+       struct acpi_namespace_node      *method_node;   /* Method node for this GPE level */
+       acpi_gpe_handler                handler;        /* Address of handler, if any */
+       void                            *context;       /* Context to be passed to handler */
+       u8                              type;           /* Level or Edge */
+       u8                              bit_mask;
+};
 
 
-typedef struct
+struct acpi_gpe_index_info
 {
-       u8                      number_index;
-
-} acpi_gpe_index_info;
+       u8                              number_index;
+};
 
 /* Information about each particular fixed event */
 
-typedef struct
+struct acpi_fixed_event_handler
 {
-       acpi_event_handler      handler;        /* Address of handler. */
-       void                    *context;       /* Context to be passed to handler */
-
-} acpi_fixed_event_handler;
+       acpi_event_handler              handler;        /* Address of handler. */
+       void                            *context;       /* Context to be passed to handler */
+};
 
 
-typedef struct
+struct acpi_fixed_event_info
 {
-       u8                      status_register_id;
-       u8                      enable_register_id;
-       u16                     status_bit_mask;
-       u16                     enable_bit_mask;
-
-} acpi_fixed_event_info;
+       u8                              status_register_id;
+       u8                              enable_register_id;
+       u16                             status_bit_mask;
+       u16                             enable_bit_mask;
+};
 
 /* Information used during field processing */
 
-typedef struct
+struct acpi_field_info
 {
-       u8                      skip_field;
-       u8                      field_flag;
-       u32                     pkg_length;
-
-} acpi_field_info;
+       u8                              skip_field;
+       u8                              field_flag;
+       u32                             pkg_length;
+};
 
 
 /*****************************************************************************
@@ -389,157 +374,148 @@ typedef struct
 
 
 /* Forward declarations */
-struct acpi_walk_state;
+struct acpi_walk_state        ;
 struct acpi_obj_mutex;
-union acpi_parse_obj;
+union acpi_parse_object        ;
 
 
 #define ACPI_STATE_COMMON                  /* Two 32-bit fields and a pointer */\
-       u8                      data_type;          /* To differentiate various internal objs */\
-       u8                      flags;      \
-       u16                     value;      \
-       u16                     state;      \
-       u16                     reserved;   \
-       void                    *next;      \
+       u8                                  data_type;          /* To differentiate various internal objs */\
+       u8                                  flags;      \
+       u16                                 value;      \
+       u16                                 state;      \
+       u16                                 reserved;   \
+       void                                *next;      \
 
-typedef struct acpi_common_state
+struct acpi_common_state
 {
        ACPI_STATE_COMMON
-} acpi_common_state;
+};
 
 
 /*
  * Update state - used to traverse complex objects such as packages
  */
-typedef struct acpi_update_state
+struct acpi_update_state
 {
        ACPI_STATE_COMMON
-       union acpi_operand_obj  *object;
-
-} acpi_update_state;
+       union acpi_operand_object           *object;
+};
 
 
 /*
  * Pkg state - used to traverse nested package structures
  */
-typedef struct acpi_pkg_state
+struct acpi_pkg_state
 {
        ACPI_STATE_COMMON
-       union acpi_operand_obj  *source_object;
-       union acpi_operand_obj  *dest_object;
-       struct acpi_walk_state  *walk_state;
-       void                    *this_target_obj;
-       u32                     num_packages;
-       u16                     index;
-
-} acpi_pkg_state;
+       union acpi_operand_object           *source_object;
+       union acpi_operand_object           *dest_object;
+       struct acpi_walk_state              *walk_state;
+       void                                *this_target_obj;
+       u32                                 num_packages;
+       u16                                 index;
+};
 
 
 /*
  * Control state - one per if/else and while constructs.
  * Allows nesting of these constructs
  */
-typedef struct acpi_control_state
+struct acpi_control_state
 {
        ACPI_STATE_COMMON
-       union acpi_parse_obj    *predicate_op;
-       u8                      *aml_predicate_start;   /* Start of if/while predicate */
-       u8                      *package_end;           /* End of if/while block */
-       u16                     opcode;
-
-} acpi_control_state;
+       union acpi_parse_object             *predicate_op;
+       u8                                  *aml_predicate_start;   /* Start of if/while predicate */
+       u8                                  *package_end;           /* End of if/while block */
+       u16                                 opcode;
+};
 
 
 /*
  * Scope state - current scope during namespace lookups
  */
-typedef struct acpi_scope_state
+struct acpi_scope_state
 {
        ACPI_STATE_COMMON
-       acpi_namespace_node     *node;
-
-} acpi_scope_state;
+       struct acpi_namespace_node          *node;
+};
 
 
-typedef struct acpi_pscope_state
+struct acpi_pscope_state
 {
        ACPI_STATE_COMMON
-       union acpi_parse_obj    *op;                    /* current op being parsed */
-       u8                      *arg_end;               /* current argument end */
-       u8                      *pkg_end;               /* current package end */
-       u32                     arg_list;               /* next argument to parse */
-       u32                     arg_count;              /* Number of fixed arguments */
-
-} acpi_pscope_state;
+       union acpi_parse_object             *op;                    /* current op being parsed */
+       u8                                  *arg_end;               /* current argument end */
+       u8                                  *pkg_end;               /* current package end */
+       u32                                 arg_list;               /* next argument to parse */
+       u32                                 arg_count;              /* Number of fixed arguments */
+};
 
 
 /*
  * Thread state - one per thread across multiple walk states.  Multiple walk
  * states are created when there are nested control methods executing.
  */
-typedef struct acpi_thread_state
+struct acpi_thread_state
 {
        ACPI_STATE_COMMON
-       struct acpi_walk_state  *walk_state_list;       /* Head of list of walk_states for this thread */
-       union acpi_operand_obj  *acquired_mutex_list;   /* List of all currently acquired mutexes */
-       u32                     thread_id;              /* Running thread ID */
-       u16                     current_sync_level;     /* Mutex Sync (nested acquire) level */
-
-} acpi_thread_state;
+       struct acpi_walk_state              *walk_state_list;       /* Head of list of walk_states for this thread */
+       union acpi_operand_object           *acquired_mutex_list;   /* List of all currently acquired mutexes */
+       u32                                 thread_id;              /* Running thread ID */
+       u16                                 current_sync_level;     /* Mutex Sync (nested acquire) level */
+};
 
 
 /*
  * Result values - used to accumulate the results of nested
  * AML arguments
  */
-typedef struct acpi_result_values
+struct acpi_result_values
 {
        ACPI_STATE_COMMON
-       union acpi_operand_obj  *obj_desc [ACPI_OBJ_NUM_OPERANDS];
-       u8                      num_results;
-       u8                      last_insert;
-
-} acpi_result_values;
+       union acpi_operand_object           *obj_desc [ACPI_OBJ_NUM_OPERANDS];
+       u8                                  num_results;
+       u8                                  last_insert;
+};
 
 
 typedef
 acpi_status (*acpi_parse_downwards) (
-       struct acpi_walk_state  *walk_state,
-       union acpi_parse_obj    **out_op);
+       struct acpi_walk_state              *walk_state,
+       union acpi_parse_object             **out_op);
 
 typedef
 acpi_status (*acpi_parse_upwards) (
-       struct acpi_walk_state  *walk_state);
+       struct acpi_walk_state              *walk_state);
 
 
 /*
  * Notify info - used to pass info to the deferred notify
  * handler/dispatcher.
  */
-typedef struct acpi_notify_info
+struct acpi_notify_info
 {
        ACPI_STATE_COMMON
-       acpi_namespace_node     *node;
-       union acpi_operand_obj  *handler_obj;
-
-} acpi_notify_info;
+       struct acpi_namespace_node          *node;
+       union acpi_operand_object           *handler_obj;
+};
 
 
 /* Generic state is union of structs above */
 
-typedef union acpi_gen_state
-{
-       acpi_common_state       common;
-       acpi_control_state      control;
-       acpi_update_state       update;
-       acpi_scope_state        scope;
-       acpi_pscope_state       parse_scope;
-       acpi_pkg_state          pkg;
-       acpi_thread_state       thread;
-       acpi_result_values      results;
-       acpi_notify_info        notify;
-
-} acpi_generic_state;
+union acpi_generic_state
+{
+       struct acpi_common_state            common;
+       struct acpi_control_state           control;
+       struct acpi_update_state            update;
+       struct acpi_scope_state             scope;
+       struct acpi_pscope_state            parse_scope;
+       struct acpi_pkg_state               pkg;
+       struct acpi_thread_state            thread;
+       struct acpi_result_values           results;
+       struct acpi_notify_info             notify;
+};
 
 
 /*****************************************************************************
@@ -550,7 +526,7 @@ typedef union acpi_gen_state
 
 typedef
 acpi_status (*ACPI_EXECUTE_OP) (
-       struct acpi_walk_state  *walk_state);
+       struct acpi_walk_state              *walk_state);
 
 
 /*****************************************************************************
@@ -562,51 +538,50 @@ acpi_status (*ACPI_EXECUTE_OP) (
 /*
  * AML opcode, name, and argument layout
  */
-typedef struct acpi_opcode_info
+struct acpi_opcode_info
 {
 #if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
-       char                    *name;          /* Opcode name (disassembler/debug only) */
+       char                                *name;          /* Opcode name (disassembler/debug only) */
 #endif
-       u32                     parse_args;     /* Grammar/Parse time arguments */
-       u32                     runtime_args;   /* Interpret time arguments */
-       u32                     flags;          /* Misc flags */
-       u8                      object_type;    /* Corresponding internal object type */
-       u8                      class;          /* Opcode class */
-       u8                      type;           /* Opcode type */
-
-} acpi_opcode_info;
+       u32                                 parse_args;     /* Grammar/Parse time arguments */
+       u32                                 runtime_args;   /* Interpret time arguments */
+       u32                                 flags;          /* Misc flags */
+       u8                                  object_type;    /* Corresponding internal object type */
+       u8                                  class;          /* Opcode class */
+       u8                                  type;           /* Opcode type */
+};
 
 
-typedef union acpi_parse_val
+union acpi_parse_value
 {
-       acpi_integer            integer;        /* integer constant (Up to 64 bits) */
-       uint64_struct           integer64;      /* Structure overlay for 2 32-bit Dwords */
-       u32                     integer32;      /* integer constant, 32 bits only */
-       u16                     integer16;      /* integer constant, 16 bits only */
-       u8                      integer8;       /* integer constant, 8 bits only */
-       u32                     size;           /* bytelist or field size */
-       char                    *string;        /* NULL terminated string */
-       u8                      *buffer;        /* buffer or string */
-       char                    *name;          /* NULL terminated string */
-       union acpi_parse_obj    *arg;           /* arguments and contained ops */
-
-} acpi_parse_value;
+       acpi_integer                        integer;        /* integer constant (Up to 64 bits) */
+       struct uint64_struct                integer64;      /* Structure overlay for 2 32-bit Dwords */
+       u32                                 integer32;      /* integer constant, 32 bits only */
+       u16                                 integer16;      /* integer constant, 16 bits only */
+       u8                                  integer8;       /* integer constant, 8 bits only */
+       u32                                 size;           /* bytelist or field size */
+       char                                *string;        /* NULL terminated string */
+       u8                                  *buffer;        /* buffer or string */
+       char                                *name;          /* NULL terminated string */
+       union acpi_parse_object             *arg;           /* arguments and contained ops */
+};
 
 
 #define ACPI_PARSE_COMMON \
-       u8                      data_type;      /* To differentiate various internal objs */\
-       u8                      flags;          /* Type of Op */\
-       u16                     aml_opcode;     /* AML opcode */\
-       u32                     aml_offset;     /* offset of declaration in AML */\
-       union acpi_parse_obj    *parent;        /* parent op */\
-       union acpi_parse_obj    *next;          /* next op */\
+       u8                                  data_type;      /* To differentiate various internal objs */\
+       u8                                  flags;          /* Type of Op */\
+       u16                                 aml_opcode;     /* AML opcode */\
+       u32                                 aml_offset;     /* offset of declaration in AML */\
+       union acpi_parse_object             *parent;        /* parent op */\
+       union acpi_parse_object             *next;          /* next op */\
        ACPI_DISASM_ONLY_MEMBERS (\
-       u8                      disasm_flags;   /* Used during AML disassembly */\
-       u8                      disasm_opcode;  /* Subtype used for disassembly */\
-       char                    aml_op_name[16]) /* op name (debug only) */\
-                         /* NON-DEBUG members below: */\
-       acpi_namespace_node     *node;          /* for use by interpreter */\
-       acpi_parse_value        value;          /* Value or args associated with the opcode */\
+       u8                                  disasm_flags;   /* Used during AML disassembly */\
+       u8                                  disasm_opcode;  /* Subtype used for disassembly */\
+       char                                aml_op_name[16]) /* op name (debug only) */\
+                          /* NON-DEBUG members below: */\
+       struct acpi_namespace_node          *node;          /* for use by interpreter */\
+       union acpi_parse_value              value;          /* Value or args associated with the opcode */\
+
 
 #define ACPI_DASM_BUFFER        0x00
 #define ACPI_DASM_RESOURCE      0x01
@@ -618,90 +593,83 @@ typedef union acpi_parse_val
 /*
  * generic operation (for example:  If, While, Store)
  */
-typedef struct acpi_parseobj_common
+struct acpi_parse_obj_common
 {
        ACPI_PARSE_COMMON
-} acpi_parse_obj_common;
+};
 
 
 /*
  * Extended Op for named ops (Scope, Method, etc.), deferred ops (Methods and op_regions),
  * and bytelists.
  */
-typedef struct acpi_parseobj_named
+struct acpi_parse_obj_named
 {
        ACPI_PARSE_COMMON
-       u8                      *path;
-       u8                      *data;          /* AML body or bytelist data */
-       u32                     length;         /* AML length */
-       u32                     name;           /* 4-byte name or zero if no name */
-
-} acpi_parse_obj_named;
+       u8                                  *path;
+       u8                                  *data;          /* AML body or bytelist data */
+       u32                                 length;         /* AML length */
+       u32                                 name;           /* 4-byte name or zero if no name */
+};
 
 
 /* The parse node is the fundamental element of the parse tree */
 
-typedef struct acpi_parseobj_asl
+struct acpi_parse_obj_asl
 {
        ACPI_PARSE_COMMON
-
-       union acpi_parse_obj        *child;
-
-
-       union acpi_parse_obj        *parent_method;
-       char                        *filename;
-       char                        *external_name;
-       char                        *namepath;
-       char                        name_seg[4];
-       u32                         extra_value;
-       u32                         column;
-       u32                         line_number;
-       u32                         logical_line_number;
-       u32                         logical_byte_offset;
-       u32                         end_line;
-       u32                         end_logical_line;
-       u32                         acpi_btype;
-       u32                         aml_length;
-       u32                         aml_subtree_length;
-       u32                         final_aml_length;
-       u32                         final_aml_offset;
-       u32                         compile_flags;
-       u16                         parse_opcode;
-       u8                          aml_opcode_length;
-       u8                          aml_pkg_len_bytes;
-       u8                          extra;
-       char                        parse_op_name[12];
-
-} acpi_parse_obj_asl;
+       union acpi_parse_object             *child;
+       union acpi_parse_object             *parent_method;
+       char                                *filename;
+       char                                *external_name;
+       char                                *namepath;
+       char                                name_seg[4];
+       u32                                 extra_value;
+       u32                                 column;
+       u32                                 line_number;
+       u32                                 logical_line_number;
+       u32                                 logical_byte_offset;
+       u32                                 end_line;
+       u32                                 end_logical_line;
+       u32                                 acpi_btype;
+       u32                                 aml_length;
+       u32                                 aml_subtree_length;
+       u32                                 final_aml_length;
+       u32                                 final_aml_offset;
+       u32                                 compile_flags;
+       u16                                 parse_opcode;
+       u8                                  aml_opcode_length;
+       u8                                  aml_pkg_len_bytes;
+       u8                                  extra;
+       char                                parse_op_name[12];
+};
 
 
-typedef union acpi_parse_obj
+union acpi_parse_object
 {
-       acpi_parse_obj_common       common;
-       acpi_parse_obj_named        named;
-       acpi_parse_obj_asl          asl;
-
-} acpi_parse_object;
+       struct acpi_parse_obj_common        common;
+       struct acpi_parse_obj_named         named;
+       struct acpi_parse_obj_asl           asl;
+};
 
 
 /*
  * Parse state - one state per parser invocation and each control
  * method.
  */
-typedef struct acpi_parse_state
-{
-       u32                     aml_size;
-       u8                      *aml_start;     /* first AML byte */
-       u8                      *aml;           /* next AML byte */
-       u8                      *aml_end;       /* (last + 1) AML byte */
-       u8                      *pkg_start;     /* current package begin */
-       u8                      *pkg_end;       /* current package end */
-       union acpi_parse_obj    *start_op;      /* root of parse tree */
-       struct acpi_node        *start_node;
-       union acpi_gen_state    *scope;         /* current scope */
-       union acpi_parse_obj    *start_scope;
-
-} acpi_parse_state;
+struct acpi_parse_state
+{
+       u32                                 aml_size;
+       u8                                  *aml_start;     /* first AML byte */
+       u8                                  *aml;           /* next AML byte */
+       u8                                  *aml_end;       /* (last + 1) AML byte */
+       u8                                  *pkg_start;     /* current package begin */
+       u8                                  *pkg_end;       /* current package end */
+       union acpi_parse_object             *start_op;      /* root of parse tree */
+       struct acpi_namespace_node          *start_node;
+       union acpi_generic_state            *scope;         /* current scope */
+       union acpi_parse_object             *start_scope;
+};
 
 
 /* Parse object flags */
@@ -728,13 +696,12 @@ typedef struct acpi_parse_state
 
 #define PCI_ROOT_HID_STRING         "PNP0A03"
 
-typedef struct
+struct acpi_bit_register_info
 {
-       u8                      parent_register;
-       u8                      bit_position;
-       u16                     access_bit_mask;
-
-} acpi_bit_register_info;
+       u8                                  parent_register;
+       u8                                  bit_position;
+       u16                                 access_bit_mask;
+};
 
 
 /*
@@ -864,11 +831,10 @@ typedef struct
 
 #define ACPI_DEVICE_ID_LENGTH                   0x09
 
-typedef struct
+struct acpi_device_id
 {
-       char            buffer[ACPI_DEVICE_ID_LENGTH];
-
-} acpi_device_id;
+       char                    buffer[ACPI_DEVICE_ID_LENGTH];
+};
 
 
 /*****************************************************************************
@@ -886,16 +852,21 @@ typedef struct
  *
  ****************************************************************************/
 
-typedef struct dbmethodinfo
+struct acpi_db_method_info
 {
-       acpi_handle             thread_gate;
-       char                    *name;
-       char                    **args;
-       u32                     flags;
-       u32                     num_loops;
-       char                    pathname[128];
+       acpi_handle                     thread_gate;
+       char                            *name;
+       char                            **args;
+       u32                             flags;
+       u32                             num_loops;
+       char                            pathname[128];
+};
 
-} acpi_db_method_info;
+struct acpi_integrity_info
+{
+       u32                         nodes;
+       u32                         objects;
+};
 
 
 #define ACPI_DB_REDIRECTABLE_OUTPUT  0x01
@@ -909,13 +880,12 @@ typedef struct dbmethodinfo
  *
  ****************************************************************************/
 
-typedef struct
+struct acpi_debug_print_info
 {
-       u32                     component_id;
-       char                    *proc_name;
-       char                    *module_name;
-
-} acpi_debug_print_info;
+       u32                             component_id;
+       char                            *proc_name;
+       char                            *module_name;
+};
 
 
 /* Entry for a memory allocation (debug only) */
@@ -925,26 +895,24 @@ typedef struct
 #define ACPI_MAX_MODULE_NAME                 16
 
 #define ACPI_COMMON_DEBUG_MEM_HEADER \
-       struct acpi_debug_mem_block *previous; \
-       struct acpi_debug_mem_block *next; \
-       u32                         size; \
-       u32                         component; \
-       u32                         line; \
-       char                        module[ACPI_MAX_MODULE_NAME]; \
-       u8                          alloc_type;
+       struct acpi_debug_mem_block         *previous; \
+       struct acpi_debug_mem_block         *next; \
+       u32                                 size; \
+       u32                                 component; \
+       u32                                 line; \
+       char                                module[ACPI_MAX_MODULE_NAME]; \
+       u8                                  alloc_type;
 
-typedef struct
+struct acpi_debug_mem_header
 {
        ACPI_COMMON_DEBUG_MEM_HEADER
+};
 
-} acpi_debug_mem_header;
-
-typedef struct acpi_debug_mem_block
+struct acpi_debug_mem_block
 {
        ACPI_COMMON_DEBUG_MEM_HEADER
-       u64                         user_space;
-
-} acpi_debug_mem_block;
+       u64                                 user_space;
+};
 
 
 #define ACPI_MEM_LIST_GLOBAL            0
@@ -960,27 +928,26 @@ typedef struct acpi_debug_mem_block
 #define ACPI_NUM_MEM_LISTS              7
 
 
-typedef struct
+struct acpi_memory_list
 {
-       void                        *list_head;
-       u16                         link_offset;
-       u16                         max_cache_depth;
-       u16                         cache_depth;
-       u16                         object_size;
+       void                                *list_head;
+       u16                                 link_offset;
+       u16                                 max_cache_depth;
+       u16                                 cache_depth;
+       u16                                 object_size;
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
        /* Statistics for debug memory tracking only */
 
-       u32                         total_allocated;
-       u32                         total_freed;
-       u32                         current_total_size;
-       u32                         cache_requests;
-       u32                         cache_hits;
-       char                        *list_name;
+       u32                                 total_allocated;
+       u32                                 total_freed;
+       u32                                 current_total_size;
+       u32                                 cache_requests;
+       u32                                 cache_hits;
+       char                                *list_name;
 #endif
-
-} acpi_memory_list;
+};
 
 
 #endif /* __ACLOCAL_H__ */
index 52d78fe..4d7a457 100644 (file)
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 - 2002, R. Byron Moore
+ *  Copyright (C) 2000 - 2003, R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@
  * Full 64-bit address/integer on both 32-bit and 64-bit platforms
  */
 #define ACPI_LODWORD(l)                 ((u32)(u64)(l))
-#define ACPI_HIDWORD(l)                 ((u32)(((*(uint64_struct *)(void *)(&l))).hi))
+#define ACPI_HIDWORD(l)                 ((u32)(((*(struct uint64_struct *)(void *)(&l))).hi))
 
 #define ACPI_GET_ADDRESS(a)             (a)
 #define ACPI_STORE_ADDRESS(a,b)         ((a)=(acpi_physical_address)(b))
 #define ACPI_REGISTER_INSERT_VALUE(reg, pos, mask, val)  reg = (reg & (~(mask))) | ACPI_REGISTER_PREPARE_BITS(val, pos, mask)
 
 /*
- * An acpi_namespace_node * can appear in some contexts,
- * where a pointer to an acpi_operand_object  can also
+ * An struct acpi_namespace_node * can appear in some contexts,
+ * where a pointer to an union acpi_operand_object    can also
  * appear.  This macro is used to distinguish them.
  *
  * The "Descriptor" field is the first field in both structures.
  */
-#define ACPI_GET_DESCRIPTOR_TYPE(d)     (((acpi_descriptor *)(void *)(d))->descriptor_id)
-#define ACPI_SET_DESCRIPTOR_TYPE(d,t)   (((acpi_descriptor *)(void *)(d))->descriptor_id = t)
+#define ACPI_GET_DESCRIPTOR_TYPE(d)     (((union acpi_descriptor *)(void *)(d))->descriptor_id)
+#define ACPI_SET_DESCRIPTOR_TYPE(d,t)   (((union acpi_descriptor *)(void *)(d))->descriptor_id = t)
 
 
 /* Macro to test the object type */
 
-#define ACPI_GET_OBJECT_TYPE(d)         (((acpi_operand_object *)(void *)(d))->common.type)
+#define ACPI_GET_OBJECT_TYPE(d)         (((union acpi_operand_object *)(void *)(d))->common.type)
 
 /* Macro to check the table flags for SINGLE or MULTIPLE tables are allowed */
 
  * as a local string ("_proc_name) so that it can be also used by the function exit macros below.
  */
 
-#define ACPI_FUNCTION_NAME(a)           acpi_debug_print_info _dbg;     \
+#define ACPI_FUNCTION_NAME(a)           struct acpi_debug_print_info _dbg;     \
                                                                                _dbg.component_id = _COMPONENT; \
                                                                                _dbg.proc_name   = a;           \
                                                                                _dbg.module_name = _THIS_MODULE;
index 64de3db..af362fb 100644 (file)
@@ -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
@@ -78,60 +78,60 @@ acpi_ns_initialize_devices (
 
 acpi_status
 acpi_ns_init_one_device (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value);
 
 acpi_status
 acpi_ns_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_status
 acpi_ns_walk_namespace (
-       acpi_object_type        type,
-       acpi_handle             start_object,
-       u32                     max_depth,
-       u8                      unlock_before_callback,
-       acpi_walk_callback      user_function,
-       void                    *context,
-       void                    **return_value);
-
-acpi_namespace_node *
+       acpi_object_type                type,
+       acpi_handle                     start_object,
+       u32                             max_depth,
+       u8                              unlock_before_callback,
+       acpi_walk_callback              user_function,
+       void                            *context,
+       void                            **return_value);
+
+struct acpi_namespace_node *
 acpi_ns_get_next_node (
-       acpi_object_type        type,
-       acpi_namespace_node     *parent,
-       acpi_namespace_node     *child);
+       acpi_object_type                type,
+       struct acpi_namespace_node      *parent,
+       struct acpi_namespace_node      *child);
 
 void
 acpi_ns_delete_namespace_by_owner (
-       u16                     table_id);
+       u16                             table_id);
 
 
 /* Namespace loading - nsload */
 
 acpi_status
 acpi_ns_one_complete_parse (
-       u32                     pass_number,
-       acpi_table_desc         *table_desc);
+       u32                             pass_number,
+       struct acpi_table_desc          *table_desc);
 
 acpi_status
 acpi_ns_parse_table (
-       acpi_table_desc         *table_desc,
-       acpi_namespace_node     *scope);
+       struct acpi_table_desc          *table_desc,
+       struct acpi_namespace_node      *scope);
 
 acpi_status
 acpi_ns_load_table (
-       acpi_table_desc         *table_desc,
-       acpi_namespace_node     *node);
+       struct acpi_table_desc          *table_desc,
+       struct acpi_namespace_node      *node);
 
 acpi_status
 acpi_ns_load_table_by_type (
-       acpi_table_type         table_type);
+       acpi_table_type                 table_type);
 
 
 /*
@@ -144,43 +144,43 @@ acpi_ns_root_initialize (
 
 acpi_status
 acpi_ns_lookup (
-       acpi_generic_state      *scope_info,
-       char                    *name,
-       acpi_object_type        type,
-       acpi_interpreter_mode   interpreter_mode,
-       u32                     flags,
-       acpi_walk_state         *walk_state,
-       acpi_namespace_node     **ret_node);
+       union acpi_generic_state        *scope_info,
+       char                            *name,
+       acpi_object_type                type,
+       acpi_interpreter_mode           interpreter_mode,
+       u32                             flags,
+       struct acpi_walk_state          *walk_state,
+       struct acpi_namespace_node      **ret_node);
 
 
 /*
  * Named object allocation/deallocation - nsalloc
  */
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_create_node (
-       u32                     name);
+       u32                             name);
 
 void
 acpi_ns_delete_node (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 void
 acpi_ns_delete_namespace_subtree (
-       acpi_namespace_node     *parent_handle);
+       struct acpi_namespace_node      *parent_handle);
 
 void
 acpi_ns_detach_object (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 void
 acpi_ns_delete_children (
-       acpi_namespace_node     *parent);
+       struct acpi_namespace_node      *parent);
 
 int
 acpi_ns_compare_names (
-       char                    *name1,
-       char                    *name2);
+       char                            *name1,
+       char                            *name2);
 
 /*
  * Namespace modification - nsmodify
@@ -188,11 +188,11 @@ acpi_ns_compare_names (
 
 acpi_status
 acpi_ns_unload_namespace (
-       acpi_handle             handle);
+       acpi_handle                     handle);
 
 acpi_status
 acpi_ns_delete_subtree (
-       acpi_handle             start_handle);
+       acpi_handle                     start_handle);
 
 
 /*
@@ -201,32 +201,32 @@ acpi_ns_delete_subtree (
 
 void
 acpi_ns_dump_tables (
-       acpi_handle             search_base,
-       u32                     max_depth);
+       acpi_handle                     search_base,
+       u32                             max_depth);
 
 void
 acpi_ns_dump_entry (
-       acpi_handle             handle,
-       u32                     debug_level);
+       acpi_handle                     handle,
+       u32                             debug_level);
 
 void
 acpi_ns_dump_pathname (
-       acpi_handle             handle,
-       char                    *msg,
-       u32                     level,
-       u32                     component);
+       acpi_handle                     handle,
+       char                            *msg,
+       u32                             level,
+       u32                             component);
 
 void
 acpi_ns_print_pathname (
-       u32                     num_segments,
-       char                    *pathname);
+       u32                             num_segments,
+       char                            *pathname);
 
 acpi_status
 acpi_ns_dump_one_device (
-       acpi_handle             obj_handle,
-       u32                     level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             level,
+       void                            *context,
+       void                            **return_value);
 
 void
 acpi_ns_dump_root_devices (
@@ -234,18 +234,18 @@ acpi_ns_dump_root_devices (
 
 acpi_status
 acpi_ns_dump_one_object (
-       acpi_handle             obj_handle,
-       u32                     level,
-       void                    *context,
-       void                    **return_value);
+       acpi_handle                     obj_handle,
+       u32                             level,
+       void                            *context,
+       void                            **return_value);
 
 void
 acpi_ns_dump_objects (
-       acpi_object_type        type,
-       u8                      display_type,
-       u32                     max_depth,
-       u32                     ownder_id,
-       acpi_handle             start_handle);
+       acpi_object_type                type,
+       u8                              display_type,
+       u32                             max_depth,
+       u32                             ownder_id,
+       acpi_handle                     start_handle);
 
 
 /*
@@ -254,33 +254,33 @@ acpi_ns_dump_objects (
 
 acpi_status
 acpi_ns_evaluate_by_handle (
-       acpi_namespace_node     *prefix_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_object);
+       struct acpi_namespace_node      *prefix_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_object);
 
 acpi_status
 acpi_ns_evaluate_by_name (
-       char                    *pathname,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_object);
+       char                            *pathname,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_object);
 
 acpi_status
 acpi_ns_evaluate_relative (
-       acpi_namespace_node     *prefix_node,
-       char                    *pathname,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_object);
+       struct acpi_namespace_node      *prefix_node,
+       char                            *pathname,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_object);
 
 acpi_status
 acpi_ns_execute_control_method (
-       acpi_namespace_node     *method_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_obj_desc);
+       struct acpi_namespace_node      *method_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_obj_desc);
 
 acpi_status
 acpi_ns_get_object_value (
-       acpi_namespace_node     *object_node,
-       acpi_operand_object     **return_obj_desc);
+       struct acpi_namespace_node      *object_node,
+       union acpi_operand_object       **return_obj_desc);
 
 
 /*
@@ -289,7 +289,7 @@ acpi_ns_get_object_value (
 
 acpi_name
 acpi_ns_find_parent_name (
-       acpi_namespace_node     *node_to_search);
+       struct acpi_namespace_node      *node_to_search);
 
 
 /*
@@ -298,42 +298,42 @@ acpi_ns_find_parent_name (
 
 u32
 acpi_ns_opens_scope (
-       acpi_object_type        type);
+       acpi_object_type                type);
 
 void
 acpi_ns_build_external_path (
-       acpi_namespace_node     *node,
-       acpi_size               size,
-       char                    *name_buffer);
+       struct acpi_namespace_node      *node,
+       acpi_size                       size,
+       char                            *name_buffer);
 
 char *
 acpi_ns_get_external_pathname (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 char *
 acpi_ns_name_of_current_scope (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ns_handle_to_pathname (
-       acpi_handle             target_handle,
-       acpi_buffer             *buffer);
+       acpi_handle                     target_handle,
+       struct acpi_buffer              *buffer);
 
 u8
 acpi_ns_pattern_match (
-       acpi_namespace_node     *obj_node,
-       char                    *search_for);
+       struct acpi_namespace_node      *obj_node,
+       char                            *search_for);
 
 acpi_status
 acpi_ns_get_node_by_path (
-       char                    *external_pathname,
-       acpi_namespace_node     *in_prefix_node,
-       u32                     flags,
-       acpi_namespace_node     **out_node);
+       char                            *external_pathname,
+       struct acpi_namespace_node      *in_prefix_node,
+       u32                             flags,
+       struct acpi_namespace_node      **out_node);
 
 acpi_size
 acpi_ns_get_pathname_length (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 
 /*
@@ -342,34 +342,34 @@ acpi_ns_get_pathname_length (
 
 acpi_status
 acpi_ns_attach_object (
-       acpi_namespace_node     *node,
-       acpi_operand_object     *object,
-       acpi_object_type        type);
+       struct acpi_namespace_node      *node,
+       union acpi_operand_object       *object,
+       acpi_object_type                type);
 
-acpi_operand_object *
+union acpi_operand_object *
 acpi_ns_get_attached_object (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
-acpi_operand_object *
+union acpi_operand_object *
 acpi_ns_get_secondary_object (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 acpi_status
 acpi_ns_attach_data (
-       acpi_namespace_node     *node,
-       acpi_object_handler     handler,
-       void                    *data);
+       struct acpi_namespace_node      *node,
+       acpi_object_handler             handler,
+       void                            *data);
 
 acpi_status
 acpi_ns_detach_data (
-       acpi_namespace_node     *node,
-       acpi_object_handler     handler);
+       struct acpi_namespace_node      *node,
+       acpi_object_handler             handler);
 
 acpi_status
 acpi_ns_get_attached_data (
-       acpi_namespace_node     *node,
-       acpi_object_handler     handler,
-       void                    **data);
+       struct acpi_namespace_node      *node,
+       acpi_object_handler             handler,
+       void                            **data);
 
 
 /*
@@ -378,27 +378,27 @@ acpi_ns_get_attached_data (
 
 acpi_status
 acpi_ns_search_and_enter (
-       u32                     entry_name,
-       acpi_walk_state         *walk_state,
-       acpi_namespace_node     *node,
-       acpi_interpreter_mode   interpreter_mode,
-       acpi_object_type        type,
-       u32                     flags,
-       acpi_namespace_node     **ret_node);
+       u32                             entry_name,
+       struct acpi_walk_state          *walk_state,
+       struct acpi_namespace_node      *node,
+       acpi_interpreter_mode           interpreter_mode,
+       acpi_object_type                type,
+       u32                             flags,
+       struct acpi_namespace_node      **ret_node);
 
 acpi_status
 acpi_ns_search_node (
-       u32                     entry_name,
-       acpi_namespace_node     *node,
-       acpi_object_type        type,
-       acpi_namespace_node     **ret_node);
+       u32                             entry_name,
+       struct acpi_namespace_node      *node,
+       acpi_object_type                type,
+       struct acpi_namespace_node      **ret_node);
 
 void
 acpi_ns_install_node (
-       acpi_walk_state         *walk_state,
-       acpi_namespace_node     *parent_node,
-       acpi_namespace_node     *node,
-       acpi_object_type        type);
+       struct acpi_walk_state          *walk_state,
+       struct acpi_namespace_node      *parent_node,
+       struct acpi_namespace_node      *node,
+       acpi_object_type                type);
 
 
 /*
@@ -407,83 +407,83 @@ acpi_ns_install_node (
 
 u8
 acpi_ns_valid_root_prefix (
-       char                    prefix);
+       char                            prefix);
 
 u8
 acpi_ns_valid_path_separator (
-       char                    sep);
+       char                            sep);
 
 acpi_object_type
 acpi_ns_get_type (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 u32
 acpi_ns_local (
-       acpi_object_type        type);
+       acpi_object_type                type);
 
 void
 acpi_ns_report_error (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id,
-       char                    *internal_name,
-       acpi_status             lookup_status);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id,
+       char                            *internal_name,
+       acpi_status                     lookup_status);
 
 void
 acpi_ns_report_method_error (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id,
-       char                    *message,
-       acpi_namespace_node     *node,
-       char                    *path,
-       acpi_status             lookup_status);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id,
+       char                            *message,
+       struct acpi_namespace_node      *node,
+       char                            *path,
+       acpi_status                     lookup_status);
 
 void
 acpi_ns_print_node_pathname (
-       acpi_namespace_node     *node,
-       char                    *msg);
+       struct acpi_namespace_node      *node,
+       char                            *msg);
 
 acpi_status
 acpi_ns_build_internal_name (
-       acpi_namestring_info    *info);
+       struct acpi_namestring_info     *info);
 
 void
 acpi_ns_get_internal_name_length (
-       acpi_namestring_info    *info);
+       struct acpi_namestring_info     *info);
 
 acpi_status
 acpi_ns_internalize_name (
-       char                    *dotted_name,
-       char                    **converted_name);
+       char                            *dotted_name,
+       char                            **converted_name);
 
 acpi_status
 acpi_ns_externalize_name (
-       u32                     internal_name_length,
-       char                    *internal_name,
-       u32                     *converted_name_length,
-       char                    **converted_name);
+       u32                             internal_name_length,
+       char                            *internal_name,
+       u32                             *converted_name_length,
+       char                            **converted_name);
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_map_handle_to_node (
-       acpi_handle             handle);
+       acpi_handle                     handle);
 
 acpi_handle
 acpi_ns_convert_entry_to_handle(
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 void
 acpi_ns_terminate (
        void);
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_get_parent_node (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_get_next_valid_node (
-       acpi_namespace_node     *node);
+       struct acpi_namespace_node      *node);
 
 
 #endif /* __ACNAMESP_H__ */
index 16dad11..72d3ca5 100644 (file)
@@ -1,12 +1,12 @@
 
 /******************************************************************************
  *
- * Name: acobject.h - Definition of acpi_operand_object  (Internal object only)
+ * Name: acobject.h - Definition of union acpi_operand_object    (Internal object only)
  *
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 - 2002, R. Byron Moore
+ *  Copyright (C) 2000 - 2003, R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 
 /*
- * The acpi_operand_object  is used to pass AML operands from the dispatcher
+ * The union acpi_operand_object    is used to pass AML operands from the dispatcher
  * to the interpreter, and to keep track of the various handlers such as
  * address space handlers and notify handlers.  The object is a constant
  * size in order to allow it to be cached and reused.
  * data_type is used to differentiate between internal descriptors, and MUST
  * be the first byte in this structure.
  */
-#define ACPI_OBJECT_COMMON_HEADER           /* SIZE/ALIGNMENT: 32 bits, one ptr plus trailing 8-bit flag */\
-       u8                          descriptor;         /* To differentiate various internal objs */\
-       u8                          type;               /* acpi_object_type */\
-       u16                         reference_count;    /* For object deletion management */\
-       union acpi_operand_obj      *next_object;       /* Objects linked to parent NS node */\
-       u8                          flags; \
+#define ACPI_OBJECT_COMMON_HEADER   /* SIZE/ALIGNMENT: 32 bits, one ptr plus trailing 8-bit flag */\
+       u8                                      descriptor;         /* To differentiate various internal objs */\
+       u8                                      type;               /* acpi_object_type */\
+       u16                                     reference_count;    /* For object deletion management */\
+       union acpi_operand_object               *next_object;       /* Objects linked to parent NS node */\
+       u8                                      flags; \
 
 /* Values for flag byte above */
 
  * "Field Datum"  -- a datum from the actual field object
  * "Buffer Datum" -- a datum from a user buffer, read from or to be written to the field
  */
-#define ACPI_COMMON_FIELD_INFO              /* SIZE/ALIGNMENT: 24 bits + three 32-bit values */\
-       u8                          field_flags;        /* Access, update, and lock bits */\
-       u8                          attribute;          /* From access_as keyword */\
-       u8                          access_byte_width;  /* Read/Write size in bytes */\
-       u32                         bit_length;         /* Length of field in bits */\
-       u32                         base_byte_offset;   /* Byte offset within containing object */\
-       u8                          start_field_bit_offset;/* Bit offset within first field datum (0-63) */\
-       u8                          datum_valid_bits;   /* Valid bit in first "Field datum" */\
-       u8                          end_field_valid_bits; /* Valid bits in the last "field datum" */\
-       u8                          end_buffer_valid_bits; /* Valid bits in the last "buffer datum" */\
-       u32                         value;              /* Value to store into the Bank or Index register */\
-       acpi_namespace_node         *node;              /* Link back to parent node */
+#define ACPI_COMMON_FIELD_INFO      /* SIZE/ALIGNMENT: 24 bits + three 32-bit values */\
+       u8                                      field_flags;        /* Access, update, and lock bits */\
+       u8                                      attribute;          /* From access_as keyword */\
+       u8                                      access_byte_width;  /* Read/Write size in bytes */\
+       u32                                     bit_length;         /* Length of field in bits */\
+       u32                                     base_byte_offset;   /* Byte offset within containing object */\
+       u8                                      start_field_bit_offset;/* Bit offset within first field datum (0-63) */\
+       u8                                      datum_valid_bits;   /* Valid bit in first "Field datum" */\
+       u8                                      end_field_valid_bits; /* Valid bits in the last "field datum" */\
+       u8                                      end_buffer_valid_bits; /* Valid bits in the last "buffer datum" */\
+       u32                                     value;              /* Value to store into the Bank or Index register */\
+       struct acpi_namespace_node              *node;              /* Link back to parent node */
 
 
 /*
  * Fields common to both Strings and Buffers
  */
 #define ACPI_COMMON_BUFFER_INFO \
-       u32                         length;
+       u32                                     length;
 
 
 /*
  * Common fields for objects that support ASL notifications
  */
 #define ACPI_COMMON_NOTIFY_INFO \
-       union acpi_operand_obj      *sys_handler;        /* Handler for system notifies */\
-       union acpi_operand_obj      *drv_handler;        /* Handler for driver notifies */\
-       union acpi_operand_obj      *addr_handler;       /* Handler for Address space */
+       union acpi_operand_object               *sys_handler;        /* Handler for system notifies */\
+       union acpi_operand_object               *drv_handler;        /* Handler for driver notifies */\
+       union acpi_operand_object               *addr_handler;       /* Handler for Address space */
 
 
 /******************************************************************************
  *
  *****************************************************************************/
 
-typedef struct acpi_object_common
+struct acpi_object_common
 {
        ACPI_OBJECT_COMMON_HEADER
+};
 
-} acpi_object_common;
 
-
-typedef struct acpi_object_integer
+struct acpi_object_integer
 {
        ACPI_OBJECT_COMMON_HEADER
+       acpi_integer                            value;
+};
 
-       acpi_integer                value;
-
-} acpi_object_integer;
 
-
-typedef struct acpi_object_string                   /* Null terminated, ASCII characters only */
+struct acpi_object_string           /* Null terminated, ASCII characters only */
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_BUFFER_INFO
-       char                        *pointer;           /* String in AML stream or allocated string */
-
-} acpi_object_string;
+       char                                    *pointer;           /* String in AML stream or allocated string */
+};
 
 
-typedef struct acpi_object_buffer
+struct acpi_object_buffer
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_BUFFER_INFO
-       u8                          *pointer;           /* Buffer in AML stream or allocated buffer */
-       acpi_namespace_node         *node;              /* Link back to parent node */
-       u8                          *aml_start;
-       u32                         aml_length;
+       u8                                      *pointer;           /* Buffer in AML stream or allocated buffer */
+       struct acpi_namespace_node              *node;              /* Link back to parent node */
+       u8                                      *aml_start;
+       u32                                     aml_length;
+};
 
-} acpi_object_buffer;
 
-
-typedef struct acpi_object_package
+struct acpi_object_package
 {
        ACPI_OBJECT_COMMON_HEADER
 
-       u32                         count;              /* # of elements in package */
-       u32                         aml_length;
-       u8                          *aml_start;
-       acpi_namespace_node         *node;              /* Link back to parent node */
-       union acpi_operand_obj      **elements;         /* Array of pointers to acpi_objects */
-
-} acpi_object_package;
+       u32                                     count;              /* # of elements in package */
+       u32                                     aml_length;
+       u8                                      *aml_start;
+       struct acpi_namespace_node              *node;              /* Link back to parent node */
+       union acpi_operand_object               **elements;         /* Array of pointers to acpi_objects */
+};
 
 
 /******************************************************************************
@@ -160,62 +154,53 @@ typedef struct acpi_object_package
  *
  *****************************************************************************/
 
-typedef struct acpi_object_event
+struct acpi_object_event
 {
        ACPI_OBJECT_COMMON_HEADER
-       void                        *semaphore;
-
-} acpi_object_event;
+       void                                    *semaphore;
+};
 
 
 #define INFINITE_CONCURRENCY        0xFF
 
-typedef struct acpi_object_method
+struct acpi_object_method
 {
        ACPI_OBJECT_COMMON_HEADER
-       u8                          method_flags;
-       u8                          param_count;
-
-       u32                         aml_length;
-
-       void                        *semaphore;
-       u8                          *aml_start;
-
-       u8                          concurrency;
-       u8                          thread_count;
-       acpi_owner_id               owning_id;
-
-} acpi_object_method;
-
-
-typedef struct acpi_object_mutex
+       u8                                      method_flags;
+       u8                                      param_count;
+       u32                                     aml_length;
+       void                                    *semaphore;
+       u8                                      *aml_start;
+       u8                                      concurrency;
+       u8                                      thread_count;
+       acpi_owner_id                           owning_id;
+};
+
+
+struct acpi_object_mutex
 {
        ACPI_OBJECT_COMMON_HEADER
-       u16                         sync_level;
-       u16                         acquisition_depth;
+       u16                                     sync_level;
+       u16                                     acquisition_depth;
+       struct acpi_thread_state                *owner_thread;
+       void                                    *semaphore;
+       union acpi_operand_object               *prev;              /* Link for list of acquired mutexes */
+       union acpi_operand_object               *next;              /* Link for list of acquired mutexes */
+       struct acpi_namespace_node              *node;              /* containing object */
+};
 
-       struct acpi_thread_state    *owner_thread;
-       void                        *semaphore;
-       union acpi_operand_obj      *prev;              /* Link for list of acquired mutexes */
-       union acpi_operand_obj      *next;              /* Link for list of acquired mutexes */
-       acpi_namespace_node         *node;              /* containing object */
 
-} acpi_object_mutex;
-
-
-typedef struct acpi_object_region
+struct acpi_object_region
 {
        ACPI_OBJECT_COMMON_HEADER
 
-       u8                          space_id;
-
-       union acpi_operand_obj      *addr_handler;      /* Handler for system notifies */
-       acpi_namespace_node         *node;              /* containing object */
-       union acpi_operand_obj      *next;
-       u32                         length;
-       acpi_physical_address       address;
-
-} acpi_object_region;
+       u8                                      space_id;
+       union acpi_operand_object               *addr_handler;      /* Handler for system notifies */
+       struct acpi_namespace_node              *node;              /* containing object */
+       union acpi_operand_object               *next;
+       u32                                     length;
+       acpi_physical_address                   address;
+};
 
 
 /******************************************************************************
@@ -224,52 +209,44 @@ typedef struct acpi_object_region
  *
  *****************************************************************************/
 
-typedef struct acpi_object_notify_common            /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
+struct acpi_object_notify_common            /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_NOTIFY_INFO
+};
 
-} acpi_object_notify_common;
 
-
-typedef struct acpi_object_device
+struct acpi_object_device
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_NOTIFY_INFO
-
-} acpi_object_device;
+};
 
 
-typedef struct acpi_object_power_resource
+struct acpi_object_power_resource
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_NOTIFY_INFO
+       u32                                     system_level;
+       u32                                     resource_order;
+};
 
-       u32                         system_level;
-       u32                         resource_order;
-
-} acpi_object_power_resource;
 
-
-typedef struct acpi_object_processor
+struct acpi_object_processor
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_NOTIFY_INFO
-
-       u32                         proc_id;
-       u32                         length;
-       acpi_io_address             address;
-
-} acpi_object_processor;
+       u32                                     proc_id;
+       u32                                     length;
+       acpi_io_address                         address;
+};
 
 
-typedef struct acpi_object_thermal_zone
+struct acpi_object_thermal_zone
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_NOTIFY_INFO
-
-
-} acpi_object_thermal_zone;
+};
 
 
 /******************************************************************************
@@ -278,36 +255,33 @@ typedef struct acpi_object_thermal_zone
  *
  *****************************************************************************/
 
-typedef struct acpi_object_field_common             /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
+struct acpi_object_field_common                         /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_FIELD_INFO
-       union acpi_operand_obj      *region_obj;        /* Containing Operation Region object */
-                        /* (REGION/BANK fields only) */
-} acpi_object_field_common;
+       union acpi_operand_object               *region_obj;        /* Containing Operation Region object */
+                         /* (REGION/BANK fields only) */
+};
 
 
-typedef struct acpi_object_region_field
+struct acpi_object_region_field
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_FIELD_INFO
-       union acpi_operand_obj      *region_obj;        /* Containing op_region object */
-
-} acpi_object_region_field;
+       union acpi_operand_object               *region_obj;        /* Containing op_region object */
+};
 
 
-typedef struct acpi_object_bank_field
+struct acpi_object_bank_field
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_FIELD_INFO
+       union acpi_operand_object               *region_obj;        /* Containing op_region object */
+       union acpi_operand_object               *bank_obj;          /* bank_select Register object */
+};
 
-       union acpi_operand_obj      *region_obj;        /* Containing op_region object */
-       union acpi_operand_obj      *bank_obj;          /* bank_select Register object */
 
-} acpi_object_bank_field;
-
-
-typedef struct acpi_object_index_field
+struct acpi_object_index_field
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_FIELD_INFO
@@ -316,23 +290,19 @@ typedef struct acpi_object_index_field
         * No "region_obj" pointer needed since the Index and Data registers
         * are each field definitions unto themselves.
         */
-       union acpi_operand_obj      *index_obj;         /* Index register */
-       union acpi_operand_obj      *data_obj;          /* Data register */
-
-
-} acpi_object_index_field;
+       union acpi_operand_object               *index_obj;         /* Index register */
+       union acpi_operand_object               *data_obj;          /* Data register */
+};
 
 
 /* The buffer_field is different in that it is part of a Buffer, not an op_region */
 
-typedef struct acpi_object_buffer_field
+struct acpi_object_buffer_field
 {
        ACPI_OBJECT_COMMON_HEADER
        ACPI_COMMON_FIELD_INFO
-
-       union acpi_operand_obj      *buffer_obj;        /* Containing Buffer object */
-
-} acpi_object_buffer_field;
+       union acpi_operand_object               *buffer_obj;        /* Containing Buffer object */
+};
 
 
 /******************************************************************************
@@ -341,15 +311,13 @@ typedef struct acpi_object_buffer_field
  *
  *****************************************************************************/
 
-typedef struct acpi_object_notify_handler
+struct acpi_object_notify_handler
 {
        ACPI_OBJECT_COMMON_HEADER
-
-       acpi_namespace_node         *node;               /* Parent device */
-       acpi_notify_handler         handler;
-       void                        *context;
-
-} acpi_object_notify_handler;
+       struct acpi_namespace_node              *node;              /* Parent device */
+       acpi_notify_handler                     handler;
+       void                                    *context;
+};
 
 
 /* Flags for address handler */
@@ -357,21 +325,18 @@ typedef struct acpi_object_notify_handler
 #define ACPI_ADDR_HANDLER_DEFAULT_INSTALLED  0x1
 
 
-typedef struct acpi_object_addr_handler
+struct acpi_object_addr_handler
 {
        ACPI_OBJECT_COMMON_HEADER
-
-       u8                          space_id;
-       u16                         hflags;
-       acpi_adr_space_handler      handler;
-
-       acpi_namespace_node         *node;              /* Parent device */
-       void                        *context;
-       acpi_adr_space_setup        setup;
-       union acpi_operand_obj      *region_list;       /* regions using this handler */
-       union acpi_operand_obj      *next;
-
-} acpi_object_addr_handler;
+       u8                                      space_id;
+       u16                                     hflags;
+       acpi_adr_space_handler                  handler;
+       struct acpi_namespace_node              *node;              /* Parent device */
+       void                                    *context;
+       acpi_adr_space_setup                    setup;
+       union acpi_operand_object               *region_list;       /* regions using this handler */
+       union acpi_operand_object               *next;
+};
 
 
 /******************************************************************************
@@ -384,19 +349,16 @@ typedef struct acpi_object_addr_handler
  * The Reference object type is used for these opcodes:
  * Arg[0-6], Local[0-7], index_op, name_op, zero_op, one_op, ones_op, debug_op
  */
-typedef struct acpi_object_reference
+struct acpi_object_reference
 {
        ACPI_OBJECT_COMMON_HEADER
-
-       u8                          target_type;        /* Used for index_op */
-       u16                         opcode;
-       u32                         offset;             /* Used for arg_op, local_op, and index_op */
-
-       void                        *object;            /* name_op=>HANDLE to obj, index_op=>acpi_operand_object */
-       acpi_namespace_node         *node;
-       union acpi_operand_obj      **where;
-
-} acpi_object_reference;
+       u8                                      target_type;        /* Used for index_op */
+       u16                                     opcode;
+       u32                                     offset;             /* Used for arg_op, local_op, and index_op */
+       void                                    *object;            /* name_op=>HANDLE to obj, index_op=>union acpi_operand_object  */
+       struct acpi_namespace_node              *node;
+       union acpi_operand_object               **where;
+};
 
 
 /*
@@ -406,93 +368,83 @@ typedef struct acpi_object_reference
  *
  * Currently: Region and field_unit types
  */
-typedef struct acpi_object_extra
+struct acpi_object_extra
 {
        ACPI_OBJECT_COMMON_HEADER
-       u8                          byte_fill1;
-       u16                         word_fill1;
-       u32                         aml_length;
-       u8                          *aml_start;
-       acpi_namespace_node         *method_REG;        /* _REG method for this region (if any) */
-       void                        *region_context;    /* Region-specific data */
-
-} acpi_object_extra;
+       u8                                      byte_fill1;
+       u16                                     word_fill1;
+       u32                                     aml_length;
+       u8                                      *aml_start;
+       struct acpi_namespace_node              *method_REG;        /* _REG method for this region (if any) */
+       void                                    *region_context;    /* Region-specific data */
+};
 
 
 /* Additional data that can be attached to namespace nodes */
 
-typedef struct acpi_object_data
+struct acpi_object_data
 {
        ACPI_OBJECT_COMMON_HEADER
-       acpi_object_handler         handler;
-       void                        *pointer;
-
-} acpi_object_data;
+       acpi_object_handler                     handler;
+       void                                    *pointer;
+};
 
 
 /* Structure used when objects are cached for reuse */
 
-typedef struct acpi_object_cache_list
+struct acpi_object_cache_list
 {
        ACPI_OBJECT_COMMON_HEADER
-       union acpi_operand_obj      *next;              /* Link for object cache and internal lists*/
-
-} acpi_object_cache_list;
+       union acpi_operand_object               *next;              /* Link for object cache and internal lists*/
+};
 
 
 /******************************************************************************
  *
- * acpi_operand_object Descriptor - a giant union of all of the above
+ * union acpi_operand_object Descriptor - a giant union of all of the above
  *
  *****************************************************************************/
 
-typedef union acpi_operand_obj
+union acpi_operand_object
 {
-       acpi_object_common          common;
-
-       acpi_object_integer         integer;
-       acpi_object_string          string;
-       acpi_object_buffer          buffer;
-       acpi_object_package         package;
-
-       acpi_object_event           event;
-       acpi_object_method          method;
-       acpi_object_mutex           mutex;
-       acpi_object_region          region;
-
-       acpi_object_notify_common   common_notify;
-       acpi_object_device          device;
-       acpi_object_power_resource  power_resource;
-       acpi_object_processor       processor;
-       acpi_object_thermal_zone    thermal_zone;
-
-       acpi_object_field_common    common_field;
-       acpi_object_region_field    field;
-       acpi_object_buffer_field    buffer_field;
-       acpi_object_bank_field      bank_field;
-       acpi_object_index_field     index_field;
-
-       acpi_object_notify_handler  notify_handler;
-       acpi_object_addr_handler    addr_handler;
-
-       acpi_object_reference       reference;
-       acpi_object_extra           extra;
-       acpi_object_data            data;
-       acpi_object_cache_list      cache;
-
-} acpi_operand_object;
+       struct acpi_object_common               common;
+       struct acpi_object_integer              integer;
+       struct acpi_object_string               string;
+       struct acpi_object_buffer               buffer;
+       struct acpi_object_package              package;
+       struct acpi_object_event                event;
+       struct acpi_object_method               method;
+       struct acpi_object_mutex                mutex;
+       struct acpi_object_region               region;
+       struct acpi_object_notify_common        common_notify;
+       struct acpi_object_device               device;
+       struct acpi_object_power_resource       power_resource;
+       struct acpi_object_processor            processor;
+       struct acpi_object_thermal_zone         thermal_zone;
+       struct acpi_object_field_common         common_field;
+       struct acpi_object_region_field         field;
+       struct acpi_object_buffer_field         buffer_field;
+       struct acpi_object_bank_field           bank_field;
+       struct acpi_object_index_field          index_field;
+       struct acpi_object_notify_handler       notify_handler;
+       struct acpi_object_addr_handler         addr_handler;
+       struct acpi_object_reference            reference;
+       struct acpi_object_extra                extra;
+       struct acpi_object_data                 data;
+       struct acpi_object_cache_list           cache;
+};
 
 
 /******************************************************************************
  *
- * acpi_descriptor - objects that share a common descriptor identifier
+ * union acpi_descriptor - objects that share a common descriptor identifier
  *
  *****************************************************************************/
 
 
 /* Object descriptor types */
 
-#define ACPI_DESC_TYPE_CACHED           0x11    /* Used only when object is cached */
+#define ACPI_DESC_TYPE_CACHED           0x11        /* Used only when object is cached */
 #define ACPI_DESC_TYPE_STATE            0x20
 #define ACPI_DESC_TYPE_STATE_UPDATE     0x21
 #define ACPI_DESC_TYPE_STATE_PACKAGE    0x22
@@ -509,14 +461,13 @@ typedef union acpi_operand_obj
 #define ACPI_DESC_TYPE_NAMED            0xAA
 
 
-typedef union acpi_desc
+union acpi_descriptor
 {
-       u8                          descriptor_id;        /* To differentiate various internal objs */\
-       acpi_operand_object         object;
-       acpi_namespace_node         node;
-       acpi_parse_object           op;
-
-} acpi_descriptor;
+       u8                                      descriptor_id;  /* To differentiate various internal objs */\
+       union acpi_operand_object               object;
+       struct acpi_namespace_node              node;
+       union acpi_parse_object                 op;
+};
 
 
 #endif /* _ACOBJECT_H */
index 6a88c06..1fceaeb 100644 (file)
@@ -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
index d35af88..4c91fd4 100644 (file)
@@ -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
 
 acpi_status
 acpi_psx_load_table (
-       u8                      *pcode_addr,
-       u32                     pcode_length);
+       u8                              *pcode_addr,
+       u32                             pcode_length);
 
 acpi_status
 acpi_psx_execute (
-       acpi_namespace_node     *method_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_obj_desc);
+       struct acpi_namespace_node      *method_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_obj_desc);
 
 
 /******************************************************************************
@@ -70,110 +70,110 @@ acpi_psx_execute (
 
 u8 *
 acpi_ps_get_next_package_end (
-       acpi_parse_state        *parser_state);
+       struct acpi_parse_state         *parser_state);
 
 u32
 acpi_ps_get_next_package_length (
-       acpi_parse_state        *parser_state);
+       struct acpi_parse_state         *parser_state);
 
 char *
 acpi_ps_get_next_namestring (
-       acpi_parse_state        *parser_state);
+       struct acpi_parse_state         *parser_state);
 
 void
 acpi_ps_get_next_simple_arg (
-       acpi_parse_state        *parser_state,
-       u32                     arg_type,
-       acpi_parse_object       *arg);
+       struct acpi_parse_state         *parser_state,
+       u32                             arg_type,
+       union acpi_parse_object         *arg);
 
 acpi_status
 acpi_ps_get_next_namepath (
-       acpi_walk_state         *walk_state,
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       *arg,
-       u8                      method_call);
+       struct acpi_walk_state          *walk_state,
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         *arg,
+       u8                              method_call);
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_next_field (
-       acpi_parse_state        *parser_state);
+       struct acpi_parse_state         *parser_state);
 
 acpi_status
 acpi_ps_get_next_arg (
-       acpi_walk_state         *walk_state,
-       acpi_parse_state        *parser_state,
-       u32                     arg_type,
-       acpi_parse_object       **return_arg);
+       struct acpi_walk_state          *walk_state,
+       struct acpi_parse_state         *parser_state,
+       u32                             arg_type,
+       union acpi_parse_object         **return_arg);
 
 
 /* psfind */
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_find_name (
-       acpi_parse_object       *scope,
-       u32                     name,
-       u32                     opcode);
+       union acpi_parse_object         *scope,
+       u32                             name,
+       u32                             opcode);
 
-acpi_parse_object*
+union acpi_parse_object*
 acpi_ps_get_parent (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 
 /* psopcode - AML Opcode information */
 
-const acpi_opcode_info *
+const struct acpi_opcode_info *
 acpi_ps_get_opcode_info (
-       u16                     opcode);
+       u16                             opcode);
 
 char *
 acpi_ps_get_opcode_name (
-       u16                     opcode);
+       u16                             opcode);
 
 
 /* psparse - top level parsing routines */
 
 u32
 acpi_ps_get_opcode_size (
-       u32                     opcode);
+       u32                             opcode);
 
 void
 acpi_ps_complete_this_op (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op);
 
 acpi_status
 acpi_ps_next_parse_state (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       acpi_status             callback_status);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       acpi_status                     callback_status);
 
 acpi_status
 acpi_ps_find_object (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       **out_op);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         **out_op);
 
 void
 acpi_ps_delete_parse_tree (
-       acpi_parse_object       *root);
+       union acpi_parse_object         *root);
 
 acpi_status
 acpi_ps_parse_loop (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ps_parse_aml (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ps_parse_table (
-       u8                      *aml,
-       u32                     aml_size,
-       acpi_parse_downwards    descending_callback,
-       acpi_parse_upwards      ascending_callback,
-       acpi_parse_object       **root_object);
+       u8                              *aml,
+       u32                             aml_size,
+       acpi_parse_downwards            descending_callback,
+       acpi_parse_upwards              ascending_callback,
+       union acpi_parse_object         **root_object);
 
 u16
 acpi_ps_peek_opcode (
-       acpi_parse_state        *state);
+       struct acpi_parse_state         *state);
 
 
 /* psscope - Scope stack management routines */
@@ -181,108 +181,108 @@ acpi_ps_peek_opcode (
 
 acpi_status
 acpi_ps_init_scope (
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       *root);
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         *root);
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_parent_scope (
-       acpi_parse_state        *state);
+       struct acpi_parse_state         *state);
 
 u8
 acpi_ps_has_completed_scope (
-       acpi_parse_state        *parser_state);
+       struct acpi_parse_state         *parser_state);
 
 void
 acpi_ps_pop_scope (
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       **op,
-       u32                     *arg_list,
-       u32                     *arg_count);
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         **op,
+       u32                             *arg_list,
+       u32                             *arg_count);
 
 acpi_status
 acpi_ps_push_scope (
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       *op,
-       u32                     remaining_args,
-       u32                     arg_count);
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         *op,
+       u32                             remaining_args,
+       u32                             arg_count);
 
 void
 acpi_ps_cleanup_scope (
-       acpi_parse_state        *state);
+       struct acpi_parse_state         *state);
 
 
 /* pstree - parse tree manipulation routines */
 
 void
 acpi_ps_append_arg(
-       acpi_parse_object       *op,
-       acpi_parse_object       *arg);
+       union acpi_parse_object         *op,
+       union acpi_parse_object         *arg);
 
-acpi_parse_object*
+union acpi_parse_object*
 acpi_ps_find (
-       acpi_parse_object       *scope,
-       char                    *path,
-       u16                     opcode,
-       u32                     create);
+       union acpi_parse_object         *scope,
+       char                            *path,
+       u16                             opcode,
+       u32                             create);
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_arg(
-       acpi_parse_object       *op,
-       u32                      argn);
+       union acpi_parse_object         *op,
+       u32                              argn);
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_child (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_depth_next (
-       acpi_parse_object       *origin,
-       acpi_parse_object       *op);
+       union acpi_parse_object         *origin,
+       union acpi_parse_object         *op);
 
 
 /* pswalk - parse tree walk routines */
 
 acpi_status
 acpi_ps_walk_parsed_aml (
-       acpi_parse_object       *start_op,
-       acpi_parse_object       *end_op,
-       acpi_operand_object     *mth_desc,
-       acpi_namespace_node     *start_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **caller_return_desc,
-       acpi_owner_id           owner_id,
-       acpi_parse_downwards    descending_callback,
-       acpi_parse_upwards      ascending_callback);
+       union acpi_parse_object         *start_op,
+       union acpi_parse_object         *end_op,
+       union acpi_operand_object       *mth_desc,
+       struct acpi_namespace_node      *start_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **caller_return_desc,
+       acpi_owner_id                   owner_id,
+       acpi_parse_downwards            descending_callback,
+       acpi_parse_upwards              ascending_callback);
 
 acpi_status
 acpi_ps_get_next_walk_op (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       acpi_parse_upwards      ascending_callback);
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       acpi_parse_upwards              ascending_callback);
 
 acpi_status
 acpi_ps_delete_completed_op (
-       acpi_walk_state         *walk_state);
+       struct acpi_walk_state          *walk_state);
 
 
 /* psutils - parser utilities */
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_create_scope_op (
        void);
 
 void
 acpi_ps_init_op (
-       acpi_parse_object       *op,
-       u16                     opcode);
+       union acpi_parse_object         *op,
+       u16                             opcode);
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_alloc_op (
-       u16                     opcode);
+       u16                             opcode);
 
 void
 acpi_ps_free_op (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 void
 acpi_ps_delete_parse_cache (
@@ -290,39 +290,39 @@ acpi_ps_delete_parse_cache (
 
 u8
 acpi_ps_is_leading_char (
-       u32                     c);
+       u32                             c);
 
 u8
 acpi_ps_is_prefix_char (
-       u32                     c);
+       u32                             c);
 
 u32
 acpi_ps_get_name(
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 void
 acpi_ps_set_name(
-       acpi_parse_object       *op,
-       u32                     name);
+       union acpi_parse_object         *op,
+       u32                             name);
 
 
 /* psdump - display parser tree */
 
 u32
 acpi_ps_sprint_path (
-       char                    *buffer_start,
-       u32                     buffer_size,
-       acpi_parse_object       *op);
+       char                            *buffer_start,
+       u32                             buffer_size,
+       union acpi_parse_object         *op);
 
 u32
 acpi_ps_sprint_op (
-       char                    *buffer_start,
-       u32                     buffer_size,
-       acpi_parse_object       *op);
+       char                            *buffer_start,
+       u32                             buffer_size,
+       union acpi_parse_object         *op);
 
 void
 acpi_ps_show (
-       acpi_parse_object       *op);
+       union acpi_parse_object         *op);
 
 
 #endif /* __ACPARSER_H__ */
index f415da6..3647f10 100644 (file)
@@ -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
index 2bf4e3f..e5c8934 100644 (file)
@@ -9,7 +9,7 @@
 
 
 /*
- *  Copyright (C) 2000 - 2002, R. Byron Moore
+ *  Copyright (C) 2000 - 2003, R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
 #define ACPI_SIGNAL_FATAL           0
 #define ACPI_SIGNAL_BREAKPOINT      1
 
-typedef struct acpi_fatal_info
+struct acpi_signal_fatal_info
 {
-       u32                     type;
-       u32                     code;
-       u32                     argument;
-
-} acpi_signal_fatal_info;
+       u32                             type;
+       u32                             code;
+       u32                             argument;
+};
 
 
 /*
@@ -64,11 +63,11 @@ typedef struct acpi_fatal_info
 
 typedef u32
 (ACPI_SYSTEM_XFACE *OSD_HANDLER) (
-       void                    *context);
+       void                            *context);
 
 typedef void
 (ACPI_SYSTEM_XFACE *OSD_EXECUTION_CALLBACK) (
-       void                    *context);
+       void                            *context);
 
 
 /*
@@ -90,13 +89,13 @@ acpi_os_terminate (
 
 acpi_status
 acpi_os_get_root_pointer (
-       u32                     flags,
-       acpi_pointer            *address);
+       u32                             flags,
+       struct acpi_pointer             *address);
 
 acpi_status
 acpi_os_table_override (
-       acpi_table_header       *existing_table,
-       acpi_table_header       **new_table);
+       struct acpi_table_header        *existing_table,
+       struct acpi_table_header        **new_table);
 
 
 /*
@@ -105,24 +104,24 @@ acpi_os_table_override (
 
 acpi_status
 acpi_os_create_semaphore (
-       u32                     max_units,
-       u32                     initial_units,
-       acpi_handle             *out_handle);
+       u32                             max_units,
+       u32                             initial_units,
+       acpi_handle                     *out_handle);
 
 acpi_status
 acpi_os_delete_semaphore (
-       acpi_handle             handle);
+       acpi_handle                     handle);
 
 acpi_status
 acpi_os_wait_semaphore (
-       acpi_handle             handle,
-       u32                     units,
-       u16                     timeout);
+       acpi_handle                     handle,
+       u32                             units,
+       u16                             timeout);
 
 acpi_status
 acpi_os_signal_semaphore (
-       acpi_handle             handle,
-       u32                     units);
+       acpi_handle                     handle,
+       u32                             units);
 
 
 /*
@@ -131,27 +130,27 @@ acpi_os_signal_semaphore (
 
 void *
 acpi_os_allocate (
-       acpi_size               size);
+       acpi_size                       size);
 
 void
 acpi_os_free (
-       void *                  memory);
+       void *                          memory);
 
 acpi_status
 acpi_os_map_memory (
-       acpi_physical_address   physical_address,
-       acpi_size               size,
-       void                    **logical_address);
+       acpi_physical_address           physical_address,
+       acpi_size                       size,
+       void                            **logical_address);
 
 void
 acpi_os_unmap_memory (
-       void                    *logical_address,
-       acpi_size               size);
+       void                            *logical_address,
+       acpi_size                       size);
 
 acpi_status
 acpi_os_get_physical_address (
-       void                    *logical_address,
-       acpi_physical_address   *physical_address);
+       void                            *logical_address,
+       acpi_physical_address           *physical_address);
 
 
 /*
@@ -160,13 +159,13 @@ acpi_os_get_physical_address (
 
 acpi_status
 acpi_os_install_interrupt_handler (
-       u32                     interrupt_number,
+       u32                             interrupt_number,
        OSD_HANDLER             service_routine,
-       void                    *context);
+       void                            *context);
 
 acpi_status
 acpi_os_remove_interrupt_handler (
-       u32                     interrupt_number,
+       u32                             interrupt_number,
        OSD_HANDLER             service_routine);
 
 
@@ -180,18 +179,18 @@ acpi_os_get_thread_id (
 
 acpi_status
 acpi_os_queue_for_execution (
-       u32                     priority,
+       u32                             priority,
        OSD_EXECUTION_CALLBACK  function,
-       void                    *context);
+       void                            *context);
 
 void
 acpi_os_sleep (
-       u32                     seconds,
-       u32                     milliseconds);
+       u32                             seconds,
+       u32                             milliseconds);
 
 void
 acpi_os_stall (
-       u32                     microseconds);
+       u32                             microseconds);
 
 
 /*
@@ -200,15 +199,15 @@ acpi_os_stall (
 
 acpi_status
 acpi_os_read_port (
-       acpi_io_address         address,
-       void                    *value,
-       u32                     width);
+       acpi_io_address                 address,
+       void                            *value,
+       u32                             width);
 
 acpi_status
 acpi_os_write_port (
-       acpi_io_address         address,
-       acpi_integer            value,
-       u32                     width);
+       acpi_io_address                 address,
+       acpi_integer                    value,
+       u32                             width);
 
 
 /*
@@ -217,15 +216,15 @@ acpi_os_write_port (
 
 acpi_status
 acpi_os_read_memory (
-       acpi_physical_address   address,
-       void                    *value,
-       u32                     width);
+       acpi_physical_address           address,
+       void                            *value,
+       u32                             width);
 
 acpi_status
 acpi_os_write_memory (
-       acpi_physical_address   address,
-       acpi_integer            value,
-       u32                     width);
+       acpi_physical_address           address,
+       acpi_integer                    value,
+       u32                             width);
 
 
 /*
@@ -234,26 +233,26 @@ acpi_os_write_memory (
 
 acpi_status
 acpi_os_read_pci_configuration (
-       acpi_pci_id             *pci_id,
-       u32                     reg,
-       void                    *value,
-       u32                     width);
+       struct acpi_pci_id              *pci_id,
+       u32                             register,
+       void                            *value,
+       u32                             width);
 
 acpi_status
 acpi_os_write_pci_configuration (
-       acpi_pci_id             *pci_id,
-       u32                     reg,
-       acpi_integer            value,
-       u32                     width);
+       struct acpi_pci_id              *pci_id,
+       u32                             register,
+       acpi_integer                    value,
+       u32                             width);
 
 /*
  * Interim function needed for PCI IRQ routing
  */
 void
 acpi_os_derive_pci_id(
-       acpi_handle             rhandle,
-       acpi_handle             chandle,
-       acpi_pci_id             **pci_id);
+       acpi_handle                     rhandle,
+       acpi_handle                     chandle,
+       struct acpi_pci_id              **pci_id);
 
 /*
  * Miscellaneous
@@ -261,13 +260,13 @@ acpi_os_derive_pci_id(
 
 u8
 acpi_os_readable (
-       void                    *pointer,
-       u32                     length);
+       void                            *pointer,
+       u32                             length);
 
 u8
 acpi_os_writable (
-       void                    *pointer,
-       u32                     length);
+       void                            *pointer,
+       u32                             length);
 
 u32
 acpi_os_get_timer (
@@ -275,8 +274,8 @@ acpi_os_get_timer (
 
 acpi_status
 acpi_os_signal (
-       u32                     function,
-       void                    *info);
+       u32                             function,
+       void                            *info);
 
 /*
  * Debug print routines
@@ -284,17 +283,17 @@ acpi_os_signal (
 
 void ACPI_INTERNAL_VAR_XFACE
 acpi_os_printf (
-       const char              *format,
+       const char                      *format,
        ...);
 
 void
 acpi_os_vprintf (
-       const char              *format,
+       const char                      *format,
        va_list                 args);
 
 void
 acpi_os_redirect_output (
-       void                    *destination);
+       void                            *destination);
 
 
 /*
@@ -303,7 +302,7 @@ acpi_os_redirect_output (
 
 u32
 acpi_os_get_line (
-       char                    *buffer);
+       char                            *buffer);
 
 
 /*
@@ -312,10 +311,10 @@ acpi_os_get_line (
 
 void
 acpi_os_dbg_assert(
-       void                    *failed_assertion,
-       void                    *file_name,
-       u32                     line_number,
-       char                    *message);
+       void                            *failed_assertion,
+       void                            *file_name,
+       u32                             line_number,
+       char                            *message);
 
 
 #endif /* __ACPIOSXF_H__ */
index c7bea94..145e660 100644 (file)
@@ -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,11 +41,11 @@ acpi_initialize_subsystem (
 
 acpi_status
 acpi_enable_subsystem (
-       u32                     flags);
+       u32                             flags);
 
 acpi_status
 acpi_initialize_objects (
-       u32                     flags);
+       u32                             flags);
 
 acpi_status
 acpi_terminate (
@@ -65,11 +65,11 @@ acpi_disable (
 
 acpi_status
 acpi_get_system_info (
-       acpi_buffer             *ret_buffer);
+       struct acpi_buffer              *ret_buffer);
 
 const char *
 acpi_format_exception (
-       acpi_status             exception);
+       acpi_status                     exception);
 
 acpi_status
 acpi_purge_cached_objects (
@@ -77,8 +77,8 @@ acpi_purge_cached_objects (
 
 acpi_status
 acpi_install_initialization_handler (
-       acpi_init_handler       handler,
-       u32                     function);
+       acpi_init_handler               handler,
+       u32                             function);
 
 /*
  * ACPI Memory manager
@@ -86,15 +86,15 @@ acpi_install_initialization_handler (
 
 void *
 acpi_allocate (
-       u32                     size);
+       u32                             size);
 
 void *
 acpi_callocate (
-       u32                     size);
+       u32                             size);
 
 void
 acpi_free (
-       void                    *address);
+       void                            *address);
 
 
 /*
@@ -103,8 +103,8 @@ acpi_free (
 
 acpi_status
 acpi_find_root_pointer (
-       u32                     flags,
-       acpi_pointer            *rsdp_address);
+       u32                             flags,
+       struct acpi_pointer             *rsdp_address);
 
 acpi_status
 acpi_load_tables (
@@ -112,30 +112,30 @@ acpi_load_tables (
 
 acpi_status
 acpi_load_table (
-       acpi_table_header       *table_ptr);
+       struct acpi_table_header        *table_ptr);
 
 acpi_status
 acpi_unload_table (
-       acpi_table_type         table_type);
+       acpi_table_type                 table_type);
 
 acpi_status
 acpi_get_table_header (
-       acpi_table_type         table_type,
-       u32                     instance,
-       acpi_table_header       *out_table_header);
+       acpi_table_type                 table_type,
+       u32                             instance,
+       struct acpi_table_header        *out_table_header);
 
 acpi_status
 acpi_get_table (
-       acpi_table_type         table_type,
-       u32                     instance,
-       acpi_buffer             *ret_buffer);
+       acpi_table_type                 table_type,
+       u32                             instance,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_get_firmware_table (
-       acpi_string             signature,
-       u32                     instance,
-       u32                     flags,
-       acpi_table_header       **table_pointer);
+       acpi_string                     signature,
+       u32                             instance,
+       u32                             flags,
+       struct acpi_table_header        **table_pointer);
 
 
 /*
@@ -144,48 +144,48 @@ acpi_get_firmware_table (
 
 acpi_status
 acpi_walk_namespace (
-       acpi_object_type        type,
-       acpi_handle             start_object,
-       u32                     max_depth,
-       acpi_walk_callback      user_function,
-       void                    *context,
-       void *                  *return_value);
+       acpi_object_type                type,
+       acpi_handle                     start_object,
+       u32                             max_depth,
+       acpi_walk_callback              user_function,
+       void                            *context,
+       void                            **return_value);
 
 acpi_status
 acpi_get_devices (
-       char                    *HID,
-       acpi_walk_callback      user_function,
-       void                    *context,
-       void                    **return_value);
+       char                            *HID,
+       acpi_walk_callback              user_function,
+       void                            *context,
+       void                            **return_value);
 
 acpi_status
 acpi_get_name (
-       acpi_handle             handle,
-       u32                     name_type,
-       acpi_buffer             *ret_path_ptr);
+       acpi_handle                     handle,
+       u32                             name_type,
+       struct acpi_buffer              *ret_path_ptr);
 
 acpi_status
 acpi_get_handle (
-       acpi_handle             parent,
-       acpi_string             pathname,
-       acpi_handle             *ret_handle);
+       acpi_handle                     parent,
+       acpi_string                     pathname,
+       acpi_handle                     *ret_handle);
 
 acpi_status
 acpi_attach_data (
-       acpi_handle             obj_handle,
-       acpi_object_handler     handler,
-       void                    *data);
+       acpi_handle                     obj_handle,
+       acpi_object_handler             handler,
+       void                            *data);
 
 acpi_status
 acpi_detach_data (
-       acpi_handle             obj_handle,
-       acpi_object_handler     handler);
+       acpi_handle                     obj_handle,
+       acpi_object_handler             handler);
 
 acpi_status
 acpi_get_data (
-       acpi_handle             obj_handle,
-       acpi_object_handler     handler,
-       void                    **data);
+       acpi_handle                     obj_handle,
+       acpi_object_handler             handler,
+       void                            **data);
 
 
 /*
@@ -194,40 +194,40 @@ acpi_get_data (
 
 acpi_status
 acpi_evaluate_object (
-       acpi_handle             object,
-       acpi_string             pathname,
-       acpi_object_list        *parameter_objects,
-       acpi_buffer             *return_object_buffer);
+       acpi_handle                     object,
+       acpi_string                     pathname,
+       struct acpi_object_list         *parameter_objects,
+       struct acpi_buffer              *return_object_buffer);
 
 acpi_status
 acpi_evaluate_object_typed (
-       acpi_handle             object,
-       acpi_string             pathname,
-       acpi_object_list        *external_params,
-       acpi_buffer             *return_buffer,
-       acpi_object_type        return_type);
+       acpi_handle                     object,
+       acpi_string                     pathname,
+       struct acpi_object_list         *external_params,
+       struct acpi_buffer              *return_buffer,
+       acpi_object_type                return_type);
 
 acpi_status
 acpi_get_object_info (
-       acpi_handle             device,
-       acpi_device_info        *info);
+       acpi_handle                     device,
+       struct acpi_device_info         *info);
 
 acpi_status
 acpi_get_next_object (
-       acpi_object_type        type,
-       acpi_handle             parent,
-       acpi_handle             child,
-       acpi_handle             *out_handle);
+       acpi_object_type                type,
+       acpi_handle                     parent,
+       acpi_handle                     child,
+       acpi_handle                     *out_handle);
 
 acpi_status
 acpi_get_type (
-       acpi_handle             object,
-       acpi_object_type        *out_type);
+       acpi_handle                     object,
+       acpi_object_type                *out_type);
 
 acpi_status
 acpi_get_parent (
-       acpi_handle             object,
-       acpi_handle             *out_handle);
+       acpi_handle                     object,
+       acpi_handle                     *out_handle);
 
 
 /*
@@ -236,85 +236,85 @@ acpi_get_parent (
 
 acpi_status
 acpi_install_fixed_event_handler (
-       u32                     acpi_event,
-       acpi_event_handler      handler,
-       void                    *context);
+       u32                             acpi_event,
+       acpi_event_handler              handler,
+       void                            *context);
 
 acpi_status
 acpi_remove_fixed_event_handler (
-       u32                     acpi_event,
-       acpi_event_handler      handler);
+       u32                             acpi_event,
+       acpi_event_handler              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_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_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_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_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
 acpi_acquire_global_lock (
-       u16                     timeout,
-       u32                     *handle);
+       u16                             timeout,
+       u32                             *handle);
 
 acpi_status
 acpi_release_global_lock (
-       u32                     handle);
+       u32                             handle);
 
 acpi_status
 acpi_remove_gpe_handler (
-       u32                     gpe_number,
-       acpi_gpe_handler        handler);
+       u32                             gpe_number,
+       acpi_gpe_handler                handler);
 
 acpi_status
 acpi_enable_event (
-       u32                     acpi_event,
-       u32                     type,
-       u32                     flags);
+       u32                             acpi_event,
+       u32                             type,
+       u32                             flags);
 
 acpi_status
 acpi_disable_event (
-       u32                     acpi_event,
-       u32                     type,
-       u32                     flags);
+       u32                             acpi_event,
+       u32                             type,
+       u32                             flags);
 
 acpi_status
 acpi_clear_event (
-       u32                     acpi_event,
-       u32                     type);
+       u32                             acpi_event,
+       u32                             type);
 
 acpi_status
 acpi_get_event_status (
-       u32                     acpi_event,
-       u32                     type,
-       acpi_event_status       *event_status);
+       u32                             acpi_event,
+       u32                             type,
+       acpi_event_status               *event_status);
 
 /*
  * Resource interfaces
@@ -322,23 +322,23 @@ acpi_get_event_status (
 
 acpi_status
 acpi_get_current_resources(
-       acpi_handle             device_handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_get_possible_resources(
-       acpi_handle             device_handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_set_current_resources (
-       acpi_handle             device_handle,
-       acpi_buffer             *in_buffer);
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *in_buffer);
 
 acpi_status
 acpi_get_irq_routing_table (
-       acpi_handle             bus_device_handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     bus_device_handle,
+       struct acpi_buffer              *ret_buffer);
 
 
 /*
@@ -347,41 +347,41 @@ acpi_get_irq_routing_table (
 
 acpi_status
 acpi_get_register (
-       u32                     register_id,
-       u32                     *return_value,
-       u32                     flags);
+       u32                             register_id,
+       u32                             *return_value,
+       u32                             flags);
 
 acpi_status
 acpi_set_register (
-       u32                     register_id,
-       u32                     value,
-       u32                     flags);
+       u32                             register_id,
+       u32                             value,
+       u32                             flags);
 
 acpi_status
 acpi_set_firmware_waking_vector (
-       acpi_physical_address   physical_address);
+       acpi_physical_address           physical_address);
 
 acpi_status
 acpi_get_firmware_waking_vector (
-       acpi_physical_address   *physical_address);
+       acpi_physical_address           *physical_address);
 
 acpi_status
 acpi_get_sleep_type_data (
-       u8                      sleep_state,
-       u8                      *slp_typ_a,
-       u8                      *slp_typ_b);
+       u8                              sleep_state,
+       u8                              *slp_typ_a,
+       u8                              *slp_typ_b);
 
 acpi_status
 acpi_enter_sleep_state_prep (
-       u8                      sleep_state);
+       u8                              sleep_state);
 
 acpi_status
 acpi_enter_sleep_state (
-       u8                      sleep_state);
+       u8                              sleep_state);
 
 acpi_status
 acpi_leave_sleep_state (
-       u8                      sleep_state);
+       u8                              sleep_state);
 
 
 #endif /* __ACXFACE_H__ */
index e57e646..342d1a4 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_get_prt_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer);
 
 
 acpi_status
 acpi_rs_get_crs_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_rs_get_prs_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_rs_set_srs_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer);
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_rs_create_resource_list (
-       acpi_operand_object     *byte_stream_buffer,
-       acpi_buffer             *output_buffer);
+       union acpi_operand_object       *byte_stream_buffer,
+       struct acpi_buffer              *output_buffer);
 
 acpi_status
 acpi_rs_create_byte_stream (
-       acpi_resource           *linked_list_buffer,
-       acpi_buffer             *output_buffer);
+       struct acpi_resource            *linked_list_buffer,
+       struct acpi_buffer              *output_buffer);
 
 acpi_status
 acpi_rs_create_pci_routing_table (
-       acpi_operand_object     *package_object,
-       acpi_buffer             *output_buffer);
+       union acpi_operand_object       *package_object,
+       struct acpi_buffer              *output_buffer);
 
 
 /*
@@ -72,295 +72,295 @@ acpi_rs_create_pci_routing_table (
  */
 void
 acpi_rs_dump_irq (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_address16 (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_address32 (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_address64 (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_dma (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_io (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_extended_irq (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_fixed_io (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_fixed_memory32 (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_memory24 (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_memory32 (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_start_depend_fns (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_vendor_specific (
-       acpi_resource_data      *data);
+       union acpi_resource_data        *data);
 
 void
 acpi_rs_dump_resource_list (
-       acpi_resource           *resource);
+       struct acpi_resource            *resource);
 
 void
 acpi_rs_dump_irq_list (
-       u8                      *route_table);
+       u8                              *route_table);
 
 acpi_status
 acpi_rs_get_byte_stream_start (
-       u8                      *byte_stream_buffer,
-       u8                      **byte_stream_start,
-       u32                     *size);
+       u8                              *byte_stream_buffer,
+       u8                              **byte_stream_start,
+       u32                             *size);
 
 acpi_status
 acpi_rs_get_list_length (
-       u8                      *byte_stream_buffer,
-       u32                     byte_stream_buffer_length,
-       acpi_size               *size_needed);
+       u8                              *byte_stream_buffer,
+       u32                             byte_stream_buffer_length,
+       acpi_size                       *size_needed);
 
 acpi_status
 acpi_rs_get_byte_stream_length (
-       acpi_resource           *linked_list_buffer,
-       acpi_size               *size_needed);
+       struct acpi_resource            *linked_list_buffer,
+       acpi_size                       *size_needed);
 
 acpi_status
 acpi_rs_get_pci_routing_table_length (
-       acpi_operand_object     *package_object,
-       acpi_size               *buffer_size_needed);
+       union acpi_operand_object       *package_object,
+       acpi_size                       *buffer_size_needed);
 
 acpi_status
 acpi_rs_byte_stream_to_list (
-       u8                      *byte_stream_buffer,
-       u32                     byte_stream_buffer_length,
-       u8                      *output_buffer);
+       u8                              *byte_stream_buffer,
+       u32                             byte_stream_buffer_length,
+       u8                              *output_buffer);
 
 acpi_status
 acpi_rs_list_to_byte_stream (
-       acpi_resource           *linked_list,
-       acpi_size               byte_stream_size_needed,
-       u8                      *output_buffer);
+       struct acpi_resource            *linked_list,
+       acpi_size                       byte_stream_size_needed,
+       u8                              *output_buffer);
 
 acpi_status
 acpi_rs_io_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_fixed_io_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_io_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_fixed_io_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_irq_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_irq_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_dma_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_dma_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_address16_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_address16_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_address32_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_address32_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_address64_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_address64_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_start_depend_fns_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_end_depend_fns_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_start_depend_fns_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_end_depend_fns_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_memory24_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_memory24_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_memory32_range_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_fixed_memory32_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_memory32_range_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_fixed_memory32_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_extended_irq_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_extended_irq_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_end_tag_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_end_tag_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 acpi_status
 acpi_rs_vendor_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size);
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size);
 
 acpi_status
 acpi_rs_vendor_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed);
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed);
 
 u8
 acpi_rs_get_resource_type (
-       u8                      resource_start_byte);
+       u8                              resource_start_byte);
 
 #endif  /* __ACRESRC_H__ */
index 92ee30f..66764cb 100644 (file)
@@ -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
 #define ACPI_WALK_CONST_REQUIRED    3
 #define ACPI_WALK_CONST_OPTIONAL    4
 
-typedef struct acpi_walk_state
+struct acpi_walk_state
 {
-       u8                      data_type;                          /* To differentiate various internal objs MUST BE FIRST!*/\
-       acpi_owner_id           owner_id;                           /* Owner of objects created during the walk */
-       u8                      last_predicate;                     /* Result of last predicate */
-       u8                      current_result;                     /* */
-       u8                      next_op_info;                       /* Info about next_op */
-       u8                      num_operands;                       /* Stack pointer for Operands[] array */
-       u8                      return_used;
-       u8                      walk_type;
-       u16                     opcode;                             /* Current AML opcode */
-       u8                      scope_depth;
-       u8                      reserved1;
-       u32                     arg_count;                          /* push for fixed or var args */
-       u32                     aml_offset;
-       u32                     arg_types;
-       u32                     method_breakpoint;                  /* For single stepping */
-       u32                     user_breakpoint;                    /* User AML breakpoint */
-       u32                     parse_flags;
-       u32                     prev_arg_types;
-
-
-       u8                      *aml_last_while;
-       struct acpi_node        arguments[ACPI_METHOD_NUM_ARGS];    /* Control method arguments */
-       union acpi_operand_obj  **caller_return_desc;
-       acpi_generic_state      *control_state;                     /* List of control states (nested IFs) */
-       struct acpi_node        local_variables[ACPI_METHOD_NUM_LOCALS];    /* Control method locals */
-       struct acpi_node        *method_call_node;                  /* Called method Node*/
-       acpi_parse_object       *method_call_op;                    /* method_call Op if running a method */
-       union acpi_operand_obj  *method_desc;                       /* Method descriptor if running a method */
-       struct acpi_node        *method_node;                       /* Method Node if running a method */
-       acpi_parse_object       *op;                                /* Current parser op */
-       union acpi_operand_obj  *operands[ACPI_OBJ_NUM_OPERANDS+1];      /* Operands passed to the interpreter (+1 for NULL terminator) */
-       const acpi_opcode_info  *op_info;                           /* Info on current opcode */
-       acpi_parse_object       *origin;                            /* Start of walk [Obsolete] */
-       union acpi_operand_obj  **params;
-       acpi_parse_state        parser_state;                       /* Current state of parser */
-       union acpi_operand_obj  *result_obj;
-       acpi_generic_state      *results;                           /* Stack of accumulated results */
-       union acpi_operand_obj  *return_desc;                       /* Return object, if any */
-       acpi_generic_state      *scope_info;                        /* Stack of nested scopes */
-
-       acpi_parse_object       *prev_op;                           /* Last op that was processed */
-       acpi_parse_object       *next_op;                           /* next op to be processed */
-       acpi_parse_downwards    descending_callback;
-       acpi_parse_upwards      ascending_callback;
-       acpi_thread_state       *thread;
-       struct acpi_walk_state  *next;                              /* Next walk_state in list */
-
-
-} acpi_walk_state;
+       u8                                  data_type;                          /* To differentiate various internal objs MUST BE FIRST!*/\
+       acpi_owner_id                       owner_id;                           /* Owner of objects created during the walk */
+       u8                                  last_predicate;                     /* Result of last predicate */
+       u8                                  current_result;                     /* */
+       u8                                  next_op_info;                       /* Info about next_op */
+       u8                                  num_operands;                       /* Stack pointer for Operands[] array */
+       u8                                  return_used;
+       u8                                  walk_type;
+       u16                                 opcode;                             /* Current AML opcode */
+       u8                                  scope_depth;
+       u8                                  reserved1;
+       u32                                 arg_count;                          /* push for fixed or var args */
+       u32                                 aml_offset;
+       u32                                 arg_types;
+       u32                                 method_breakpoint;                  /* For single stepping */
+       u32                                 user_breakpoint;                    /* User AML breakpoint */
+       u32                                 parse_flags;
+       u32                                 prev_arg_types;
+
+       u8                                  *aml_last_while;
+       struct acpi_namespace_node          arguments[ACPI_METHOD_NUM_ARGS];    /* Control method arguments */
+       union acpi_operand_object           **caller_return_desc;
+       union acpi_generic_state            *control_state;                     /* List of control states (nested IFs) */
+       struct acpi_namespace_node          local_variables[ACPI_METHOD_NUM_LOCALS];    /* Control method locals */
+       struct acpi_namespace_node          *method_call_node;                  /* Called method Node*/
+       union acpi_parse_object             *method_call_op;                    /* method_call Op if running a method */
+       union acpi_operand_object           *method_desc;                       /* Method descriptor if running a method */
+       struct acpi_namespace_node          *method_node;                       /* Method Node if running a method */
+       union acpi_parse_object             *op;                                /* Current parser op */
+       union acpi_operand_object           *operands[ACPI_OBJ_NUM_OPERANDS+1]; /* Operands passed to the interpreter (+1 for NULL terminator) */
+       const struct acpi_opcode_info       *op_info;                           /* Info on current opcode */
+       union acpi_parse_object             *origin;                            /* Start of walk [Obsolete] */
+       union acpi_operand_object           **params;
+       struct acpi_parse_state             parser_state;                       /* Current state of parser */
+       union acpi_operand_object           *result_obj;
+       union acpi_generic_state            *results;                           /* Stack of accumulated results */
+       union acpi_operand_object           *return_desc;                       /* Return object, if any */
+       union acpi_generic_state            *scope_info;                        /* Stack of nested scopes */
+
+       union acpi_parse_object             *prev_op;                           /* Last op that was processed */
+       union acpi_parse_object             *next_op;                           /* next op to be processed */
+       acpi_parse_downwards                descending_callback;
+       acpi_parse_upwards                  ascending_callback;
+       struct acpi_thread_state            *thread;
+       struct acpi_walk_state              *next;                              /* Next walk_state in list */
+};
 
 
 /* Info used by acpi_ps_init_objects */
 
-typedef struct acpi_init_walk_info
+struct acpi_init_walk_info
 {
-       u16                     method_count;
-       u16                     device_count;
-       u16                     op_region_count;
-       u16                     field_count;
-       u16                     buffer_count;
-       u16                     package_count;
-       u16                     op_region_init;
-       u16                     field_init;
-       u16                     buffer_init;
-       u16                     package_init;
-       u16                     object_count;
-       acpi_table_desc         *table_desc;
-
-} acpi_init_walk_info;
+       u16                             method_count;
+       u16                             device_count;
+       u16                             op_region_count;
+       u16                             field_count;
+       u16                             buffer_count;
+       u16                             package_count;
+       u16                             op_region_init;
+       u16                             field_init;
+       u16                             buffer_init;
+       u16                             package_init;
+       u16                             object_count;
+       struct acpi_table_desc          *table_desc;
+};
 
 
 /* Info used by acpi_ns_initialize_devices */
 
-typedef struct acpi_device_walk_info
+struct acpi_device_walk_info
 {
-       u16                     device_count;
-       u16                     num_STA;
-       u16                     num_INI;
-       acpi_table_desc         *table_desc;
-
-} acpi_device_walk_info;
+       u16                             device_count;
+       u16                             num_STA;
+       u16                             num_INI;
+       struct acpi_table_desc          *table_desc;
+};
 
 
 /* TBD: [Restructure] Merge with struct above */
 
-typedef struct acpi_walk_info
+struct acpi_walk_info
 {
-       u32                     debug_level;
-       u32                     owner_id;
-       u8                      display_type;
-
-} acpi_walk_info;
+       u32                             debug_level;
+       u32                             owner_id;
+       u8                              display_type;
+};
 
 /* Display Types */
 
 #define ACPI_DISPLAY_SUMMARY    0
 #define ACPI_DISPLAY_OBJECTS    1
 
-typedef struct acpi_get_devices_info
+struct acpi_get_devices_info
 {
-       acpi_walk_callback      user_function;
-       void                    *context;
-       char                    *hid;
+       acpi_walk_callback              user_function;
+       void                            *context;
+       char                            *hid;
+};
 
-} acpi_get_devices_info;
 
-
-typedef union acpi_aml_operands
+union acpi_aml_operands
 {
-       acpi_operand_object         *operands[7];
+       union acpi_operand_object           *operands[7];
 
        struct
        {
-               acpi_object_integer     *type;
-               acpi_object_integer     *code;
-               acpi_object_integer     *argument;
+               struct acpi_object_integer      *type;
+               struct acpi_object_integer      *code;
+               struct acpi_object_integer      *argument;
 
        } fatal;
 
        struct
        {
-               acpi_operand_object     *source;
-               acpi_object_integer     *index;
-               acpi_operand_object     *target;
+               union acpi_operand_object       *source;
+               struct acpi_object_integer      *index;
+               union acpi_operand_object       *target;
 
        } index;
 
        struct
        {
-               acpi_operand_object     *source;
-               acpi_object_integer     *index;
-               acpi_object_integer     *length;
-               acpi_operand_object     *target;
+               union acpi_operand_object       *source;
+               struct acpi_object_integer      *index;
+               struct acpi_object_integer      *length;
+               union acpi_operand_object       *target;
 
        } mid;
-
-} acpi_aml_operands;
+};
 
 
 #endif
index f8a6eeb..685ea7a 100644 (file)
@@ -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
@@ -33,8 +33,8 @@
 
 acpi_status
 acpi_tb_handle_to_object (
-       u16                     table_id,
-       acpi_table_desc         **table_desc);
+       u16                             table_id,
+       struct acpi_table_desc          **table_desc);
 
 /*
  * tbconvrt - Table conversion routines
@@ -42,7 +42,7 @@ acpi_tb_handle_to_object (
 
 acpi_status
 acpi_tb_convert_to_xsdt (
-       acpi_table_desc         *table_info);
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_convert_table_fadt (
@@ -50,12 +50,12 @@ acpi_tb_convert_table_fadt (
 
 acpi_status
 acpi_tb_build_common_facs (
-       acpi_table_desc         *table_info);
+       struct acpi_table_desc          *table_info);
 
 u32
 acpi_tb_get_table_count (
-       rsdp_descriptor         *RSDP,
-       acpi_table_header       *RSDT);
+       struct rsdp_descriptor          *RSDP,
+       struct acpi_table_header        *RSDT);
 
 /*
  * tbget - Table "get" routines
@@ -63,48 +63,48 @@ acpi_tb_get_table_count (
 
 acpi_status
 acpi_tb_get_table (
-       acpi_pointer            *address,
-       acpi_table_desc         *table_info);
+       struct acpi_pointer             *address,
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_get_table_header (
-       acpi_pointer            *address,
-       acpi_table_header       *return_header);
+       struct acpi_pointer             *address,
+       struct acpi_table_header        *return_header);
 
 acpi_status
 acpi_tb_get_table_body (
-       acpi_pointer            *address,
-       acpi_table_header       *header,
-       acpi_table_desc         *table_info);
+       struct acpi_pointer             *address,
+       struct acpi_table_header        *header,
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_get_this_table (
-       acpi_pointer            *address,
-       acpi_table_header       *header,
-       acpi_table_desc         *table_info);
+       struct acpi_pointer             *address,
+       struct acpi_table_header        *header,
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_table_override (
-       acpi_table_header       *header,
-       acpi_table_desc         *table_info);
+       struct acpi_table_header        *header,
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_get_table_ptr (
-       acpi_table_type         table_type,
-       u32                     instance,
-       acpi_table_header       **table_ptr_loc);
+       acpi_table_type                 table_type,
+       u32                             instance,
+       struct acpi_table_header        **table_ptr_loc);
 
 acpi_status
 acpi_tb_verify_rsdp (
-       acpi_pointer            *address);
+       struct acpi_pointer             *address);
 
 void
 acpi_tb_get_rsdt_address (
-       acpi_pointer            *out_address);
+       struct acpi_pointer             *out_address);
 
 acpi_status
 acpi_tb_validate_rsdt (
-       acpi_table_header       *table_ptr);
+       struct acpi_table_header        *table_ptr);
 
 acpi_status
 acpi_tb_get_required_tables (
@@ -112,14 +112,14 @@ acpi_tb_get_required_tables (
 
 acpi_status
 acpi_tb_get_primary_table (
-       acpi_pointer            *address,
-       acpi_table_desc         *table_info);
+       struct acpi_pointer             *address,
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_get_secondary_table (
-       acpi_pointer            *address,
-       acpi_string             signature,
-       acpi_table_desc         *table_info);
+       struct acpi_pointer             *address,
+       acpi_string                     signature,
+       struct acpi_table_desc          *table_info);
 
 /*
  * tbinstall - Table installation
@@ -127,23 +127,23 @@ acpi_tb_get_secondary_table (
 
 acpi_status
 acpi_tb_install_table (
-       acpi_table_desc         *table_info);
+       struct acpi_table_desc          *table_info);
 
 acpi_status
 acpi_tb_match_signature (
-       char                    *signature,
-       acpi_table_desc         *table_info,
-       u8                      search_type);
+       char                            *signature,
+       struct acpi_table_desc          *table_info,
+       u8                              search_type);
 
 acpi_status
 acpi_tb_recognize_table (
-       acpi_table_desc         *table_info,
-       u8                     search_type);
+       struct acpi_table_desc          *table_info,
+       u8                             search_type);
 
 acpi_status
 acpi_tb_init_table_descriptor (
-       acpi_table_type         table_type,
-       acpi_table_desc         *table_info);
+       acpi_table_type                 table_type,
+       struct acpi_table_desc          *table_info);
 
 
 /*
@@ -156,19 +156,19 @@ acpi_tb_delete_acpi_tables (
 
 void
 acpi_tb_delete_acpi_table (
-       acpi_table_type         type);
+       acpi_table_type                 type);
 
 void
 acpi_tb_delete_single_table (
-       acpi_table_desc         *table_desc);
+       struct acpi_table_desc          *table_desc);
 
-acpi_table_desc *
+struct acpi_table_desc *
 acpi_tb_uninstall_table (
-       acpi_table_desc         *table_desc);
+       struct acpi_table_desc          *table_desc);
 
 void
 acpi_tb_free_acpi_tables_of_type (
-       acpi_table_desc         *table_info);
+       struct acpi_table_desc          *table_info);
 
 
 /*
@@ -181,13 +181,13 @@ acpi_tb_get_table_rsdt (
 
 u8 *
 acpi_tb_scan_memory_for_rsdp (
-       u8                      *start_address,
-       u32                     length);
+       u8                              *start_address,
+       u32                             length);
 
 acpi_status
 acpi_tb_find_rsdp (
-       acpi_table_desc         *table_info,
-       u32                     flags);
+       struct acpi_table_desc          *table_info,
+       u32                             flags);
 
 
 /*
@@ -196,23 +196,23 @@ acpi_tb_find_rsdp (
 
 acpi_status
 acpi_tb_find_table (
-       char                    *signature,
-       char                    *oem_id,
-       char                    *oem_table_id,
-       acpi_table_header       **table_ptr);
+       char                            *signature,
+       char                            *oem_id,
+       char                            *oem_table_id,
+       struct acpi_table_header        **table_ptr);
 
 acpi_status
 acpi_tb_verify_table_checksum (
-       acpi_table_header       *table_header);
+       struct acpi_table_header        *table_header);
 
 u8
 acpi_tb_checksum (
-       void                    *buffer,
-       u32                     length);
+       void                            *buffer,
+       u32                             length);
 
 acpi_status
 acpi_tb_validate_table_header (
-       acpi_table_header       *table_header);
+       struct acpi_table_header        *table_header);
 
 
 #endif /* __ACTABLES_H__ */
index 2c3c69d..22865ad 100644 (file)
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 - 2002, R. Byron Moore
+ *  Copyright (C) 2000 - 2003, R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@
 #define DUAL_PIC                0
 #define MULTIPLE_APIC           1
 
-/* values of Type in APIC_HEADER */
+/* values of Type in struct apic_header */
 
 #define APIC_PROC               0
 #define APIC_IO                 1
  * Common table types.  The base code can remain
  * constant if the underlying tables are changed
  */
-#define RSDT_DESCRIPTOR         RSDT_DESCRIPTOR_REV2
-#define xsdt_descriptor         XSDT_DESCRIPTOR_REV2
-#define FACS_DESCRIPTOR         facs_descriptor_rev2
-#define FADT_DESCRIPTOR         fadt_descriptor_rev2
+#define RSDT_DESCRIPTOR         struct rsdt_descriptor_rev2
+#define XSDT_DESCRIPTOR         struct xsdt_descriptor_rev2
+#define FACS_DESCRIPTOR         struct facs_descriptor_rev2
+#define FADT_DESCRIPTOR         struct fadt_descriptor_rev2
 
 
 #pragma pack(1)
  * Architecture-independent tables
  * The architecture dependent tables are in separate files
  */
-typedef struct  /* Root System Descriptor Pointer */
+struct rsdp_descriptor         /* Root System Descriptor Pointer */
 {
-       char                    signature [8];          /* ACPI signature, contains "RSD PTR " */
-       u8                      checksum;               /* To make sum of struct == 0 */
-       char                    oem_id [6];             /* OEM identification */
-       u8                      revision;               /* Must be 0 for 1.0, 2 for 2.0 */
-       u32                     rsdt_physical_address;  /* 32-bit physical address of RSDT */
-       u32                     length;                 /* XSDT Length in bytes including hdr */
-       u64                     xsdt_physical_address;  /* 64-bit physical address of XSDT */
-       u8                      extended_checksum;      /* Checksum of entire table */
-       char                    reserved [3];           /* Reserved field must be 0 */
-
-} rsdp_descriptor;
-
-
-typedef struct  /* ACPI common table header */
+       char                            signature [8];          /* ACPI signature, contains "RSD PTR " */
+       u8                              checksum;               /* To make sum of struct == 0 */
+       char                            oem_id [6];             /* OEM identification */
+       u8                              revision;               /* Must be 0 for 1.0, 2 for 2.0 */
+       u32                             rsdt_physical_address;  /* 32-bit physical address of RSDT */
+       u32                             length;                 /* XSDT Length in bytes including hdr */
+       u64                             xsdt_physical_address;  /* 64-bit physical address of XSDT */
+       u8                              extended_checksum;      /* Checksum of entire table */
+       char                            reserved [3];           /* Reserved field must be 0 */
+};
+
+
+struct acpi_table_header         /* ACPI common table header */
 {
-       char                    signature [4];          /* ACPI signature (4 ASCII characters) */
-       u32                     length;                 /* Length of table, in bytes, including header */
-       u8                      revision;               /* ACPI Specification minor version # */
-       u8                      checksum;               /* To make sum of entire table == 0 */
-       char                    oem_id [6];             /* OEM identification */
-       char                    oem_table_id [8];       /* OEM table identification */
-       u32                     oem_revision;           /* OEM revision number */
-       char                    asl_compiler_id [4];    /* ASL compiler vendor ID */
-       u32                     asl_compiler_revision;  /* ASL compiler revision number */
-
-} acpi_table_header;
-
-
-typedef struct  /* Common FACS for internal use */
+       char                            signature [4];          /* ACPI signature (4 ASCII characters) */
+       u32                             length;                 /* Length of table, in bytes, including header */
+       u8                              revision;               /* ACPI Specification minor version # */
+       u8                              checksum;               /* To make sum of entire table == 0 */
+       char                            oem_id [6];             /* OEM identification */
+       char                            oem_table_id [8];       /* OEM table identification */
+       u32                             oem_revision;           /* OEM revision number */
+       char                            asl_compiler_id [4];    /* ASL compiler vendor ID */
+       u32                             asl_compiler_revision;  /* ASL compiler revision number */
+};
+
+
+struct acpi_common_facs          /* Common FACS for internal use */
 {
-       u32                     *global_lock;
-       u64                     *firmware_waking_vector;
-       u8                      vector_width;
+       u32                             *global_lock;
+       u64                             *firmware_waking_vector;
+       u8                              vector_width;
+};
 
-} acpi_common_facs;
 
-
-typedef struct  /* APIC Table */
+struct apic_table
 {
-       acpi_table_header       header;                 /* ACPI table header */
-       u32                     local_apic_address;     /* Physical address for accessing local APICs */
-       u32                     PCATcompat      : 1;    /* a one indicates system also has dual 8259s */
-       u32                     reserved1       : 31;
-
-} APIC_TABLE;
+       struct acpi_table_header        header;                 /* ACPI table header */
+       u32                             local_apic_address;     /* Physical address for accessing local APICs */
+       u32                             PCATcompat      : 1;    /* a one indicates system also has dual 8259s */
+       u32                             reserved1       : 31;
+};
 
 
-typedef struct  /* APIC Header */
+struct apic_header
 {
-       u8                      type;                   /* APIC type.  Either APIC_PROC or APIC_IO */
-       u8                      length;                 /* Length of APIC structure */
-
-} APIC_HEADER;
+       u8                              type;                   /* APIC type.  Either APIC_PROC or APIC_IO */
+       u8                              length;                 /* Length of APIC structure */
+};
 
 
-typedef struct  /* Processor APIC */
+struct processor_apic
 {
-       APIC_HEADER             header;
-       u8                      processor_apic_id;      /* ACPI processor id */
-       u8                      local_apic_id;          /* Processor's local APIC id */
-       u32                     processor_enabled: 1;   /* Processor is usable if set */
-       u32                     reserved1       : 31;
+       struct apic_header              header;
+       u8                              processor_apic_id;      /* ACPI processor id */
+       u8                              local_apic_id;          /* Processor's local APIC id */
+       u32                             processor_enabled: 1;   /* Processor is usable if set */
+       u32                             reserved1       : 31;
+};
 
-} PROCESSOR_APIC;
 
-
-typedef struct  /* IO APIC */
+struct io_apic
 {
-       APIC_HEADER             header;
-       u8                      io_apic_id;             /* I/O APIC ID */
-       u8                      reserved;               /* Reserved - must be zero */
-       u32                     io_apic_address;        /* APIC's physical address */
-       u32                     vector;                 /* Interrupt vector index where INTI
+       struct apic_header              header;
+       u8                              io_apic_id;             /* I/O APIC ID */
+       u8                              reserved;               /* Reserved - must be zero */
+       u32                             io_apic_address;        /* APIC's physical address */
+       u32                             vector;                 /* Interrupt vector index where INTI
                          * lines start */
-} IO_APIC;
+};
 
 
 /*
@@ -160,14 +154,13 @@ typedef struct  /* IO APIC */
  *  IA64 TBD:   Modify Smart Battery Description to comply with ACPI IA64
  *              extensions.
  */
-typedef struct  /* Smart Battery Description Table */
+struct smart_battery_description_table
 {
-       acpi_table_header       header;
-       u32                     warning_level;
-       u32                     low_level;
-       u32                     critical_level;
-
-} SMART_BATTERY_DESCRIPTION_TABLE;
+       struct acpi_table_header        header;
+       u32                             warning_level;
+       u32                             low_level;
+       u32                             critical_level;
+};
 
 
 #pragma pack()
@@ -182,7 +175,7 @@ typedef struct  /* Smart Battery Description Table */
 #define ACPI_MEM_ALLOCATED      1
 #define ACPI_MEM_MAPPED         2
 
-/* Definitions for the Flags bitfield member of ACPI_TABLE_SUPPORT */
+/* Definitions for the Flags bitfield member of struct acpi_table_support */
 
 #define ACPI_TABLE_SINGLE       0x00
 #define ACPI_TABLE_MULTIPLE     0x01
@@ -196,15 +189,14 @@ typedef struct  /* Smart Battery Description Table */
 
 /* Data about each known table type */
 
-typedef struct _acpi_table_support
+struct acpi_table_support
 {
-       char                    *name;
-       char                    *signature;
-       void                    **global_ptr;
-       u8                      sig_length;
-       u8                      flags;
-
-} ACPI_TABLE_SUPPORT;
+       char                            *name;
+       char                            *signature;
+       void                            **global_ptr;
+       u8                              sig_length;
+       u8                              flags;
+};
 
 
 /*
index 2eb31e1..aad526a 100644 (file)
@@ -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
 /*
  * ACPI 1.0 Root System Description Table (RSDT)
  */
-typedef struct
+struct rsdt_descriptor_rev1
 {
-       acpi_table_header       header;                 /* ACPI Table header */
-       u32                     table_offset_entry [1]; /* Array of pointers to other */
+       struct acpi_table_header        header;                 /* ACPI Table header */
+       u32                             table_offset_entry [1]; /* Array of pointers to other */
                         /* ACPI tables */
-} RSDT_DESCRIPTOR_REV1;
+};
 
 
 /*
  * ACPI 1.0 Firmware ACPI Control Structure (FACS)
  */
-typedef struct
+struct facs_descriptor_rev1
 {
-       char                    signature[4];           /* ACPI Signature */
-       u32                     length;                 /* Length of structure, in bytes */
-       u32                     hardware_signature;     /* Hardware configuration signature */
-       u32                     firmware_waking_vector; /* ACPI OS waking vector */
-       u32                     global_lock;            /* Global Lock */
-       u32                     S4bios_f        : 1;    /* Indicates if S4BIOS support is present */
-       u32                     reserved1       : 31;   /* Must be 0 */
-       u8                      resverved3 [40];        /* Reserved - must be zero */
-
-} facs_descriptor_rev1;
+       char                            signature[4];           /* ACPI Signature */
+       u32                             length;                 /* Length of structure, in bytes */
+       u32                             hardware_signature;     /* Hardware configuration signature */
+       u32                             firmware_waking_vector; /* ACPI OS waking vector */
+       u32                             global_lock;            /* Global Lock */
+       u32                             S4bios_f        : 1;    /* Indicates if S4BIOS support is present */
+       u32                             reserved1       : 31;   /* Must be 0 */
+       u8                              resverved3 [40];        /* Reserved - must be zero */
+};
 
 
 /*
  * ACPI 1.0 Fixed ACPI Description Table (FADT)
  */
-typedef struct
+struct fadt_descriptor_rev1
 {
-       acpi_table_header       header;                 /* ACPI Table header */
-       u32                     firmware_ctrl;          /* Physical address of FACS */
-       u32                     dsdt;                   /* Physical address of DSDT */
-       u8                      model;                  /* System Interrupt Model */
-       u8                      reserved1;              /* Reserved */
-       u16                     sci_int;                /* System vector of SCI interrupt */
-       u32                     smi_cmd;                /* Port address of SMI command port */
-       u8                      acpi_enable;            /* Value to write to smi_cmd to enable ACPI */
-       u8                      acpi_disable;           /* Value to write to smi_cmd to disable ACPI */
-       u8                      S4bios_req;             /* Value to write to SMI CMD to enter S4BIOS state */
-       u8                      reserved2;              /* Reserved - must be zero */
-       u32                     pm1a_evt_blk;           /* Port address of Power Mgt 1a acpi_event Reg Blk */
-       u32                     pm1b_evt_blk;           /* Port address of Power Mgt 1b acpi_event Reg Blk */
-       u32                     pm1a_cnt_blk;           /* Port address of Power Mgt 1a Control Reg Blk */
-       u32                     pm1b_cnt_blk;           /* Port address of Power Mgt 1b Control Reg Blk */
-       u32                     pm2_cnt_blk;            /* Port address of Power Mgt 2 Control Reg Blk */
-       u32                     pm_tmr_blk;             /* Port address of Power Mgt Timer Ctrl Reg Blk */
-       u32                     gpe0_blk;               /* Port addr of General Purpose acpi_event 0 Reg Blk */
-       u32                     gpe1_blk;               /* Port addr of General Purpose acpi_event 1 Reg Blk */
-       u8                      pm1_evt_len;            /* Byte length of ports at pm1_x_evt_blk */
-       u8                      pm1_cnt_len;            /* Byte length of ports at pm1_x_cnt_blk */
-       u8                      pm2_cnt_len;            /* Byte Length of ports at pm2_cnt_blk */
-       u8                      pm_tm_len;              /* Byte Length of ports at pm_tm_blk */
-       u8                      gpe0_blk_len;           /* Byte Length of ports at gpe0_blk */
-       u8                      gpe1_blk_len;           /* Byte Length of ports at gpe1_blk */
-       u8                      gpe1_base;              /* Offset in gpe model where gpe1 events start */
-       u8                      reserved3;              /* Reserved */
-       u16                     plvl2_lat;              /* Worst case HW latency to enter/exit C2 state */
-       u16                     plvl3_lat;              /* Worst case HW latency to enter/exit C3 state */
-       u16                     flush_size;             /* Size of area read to flush caches */
-       u16                     flush_stride;           /* Stride used in flushing caches */
-       u8                      duty_offset;            /* Bit location of duty cycle field in p_cnt reg */
-       u8                      duty_width;             /* Bit width of duty cycle field in p_cnt reg */
-       u8                      day_alrm;               /* Index to day-of-month alarm in RTC CMOS RAM */
-       u8                      mon_alrm;               /* Index to month-of-year alarm in RTC CMOS RAM */
-       u8                      century;                /* Index to century in RTC CMOS RAM */
-       u8                      reserved4;              /* Reserved */
-       u8                      reserved4a;             /* Reserved */
-       u8                      reserved4b;             /* Reserved */
-       u32                     wb_invd         : 1;    /* The wbinvd instruction works properly */
-       u32                     wb_invd_flush   : 1;    /* The wbinvd flushes but does not invalidate */
-       u32                     proc_c1         : 1;    /* All processors support C1 state */
-       u32                     plvl2_up        : 1;    /* C2 state works on MP system */
-       u32                     pwr_button      : 1;    /* Power button is handled as a generic feature */
-       u32                     sleep_button    : 1;    /* Sleep button is handled as a generic feature, or not present */
-       u32                     fixed_rTC       : 1;    /* RTC wakeup stat not in fixed register space */
-       u32                     rtcs4           : 1;    /* RTC wakeup stat not possible from S4 */
-       u32                     tmr_val_ext     : 1;    /* The tmr_val width is 32 bits (0 = 24 bits) */
-       u32                     reserved5       : 23;   /* Reserved - must be zero */
-
-}  fadt_descriptor_rev1;
+       struct acpi_table_header        header;                 /* ACPI Table header */
+       u32                             firmware_ctrl;          /* Physical address of FACS */
+       u32                             dsdt;                   /* Physical address of DSDT */
+       u8                              model;                  /* System Interrupt Model */
+       u8                              reserved1;              /* Reserved */
+       u16                             sci_int;                /* System vector of SCI interrupt */
+       u32                             smi_cmd;                /* Port address of SMI command port */
+       u8                              acpi_enable;            /* Value to write to smi_cmd to enable ACPI */
+       u8                              acpi_disable;           /* Value to write to smi_cmd to disable ACPI */
+       u8                              S4bios_req;             /* Value to write to SMI CMD to enter S4BIOS state */
+       u8                              reserved2;              /* Reserved - must be zero */
+       u32                             pm1a_evt_blk;           /* Port address of Power Mgt 1a acpi_event Reg Blk */
+       u32                             pm1b_evt_blk;           /* Port address of Power Mgt 1b acpi_event Reg Blk */
+       u32                             pm1a_cnt_blk;           /* Port address of Power Mgt 1a Control Reg Blk */
+       u32                             pm1b_cnt_blk;           /* Port address of Power Mgt 1b Control Reg Blk */
+       u32                             pm2_cnt_blk;            /* Port address of Power Mgt 2 Control Reg Blk */
+       u32                             pm_tmr_blk;             /* Port address of Power Mgt Timer Ctrl Reg Blk */
+       u32                             gpe0_blk;               /* Port addr of General Purpose acpi_event 0 Reg Blk */
+       u32                             gpe1_blk;               /* Port addr of General Purpose acpi_event 1 Reg Blk */
+       u8                              pm1_evt_len;            /* Byte length of ports at pm1_x_evt_blk */
+       u8                              pm1_cnt_len;            /* Byte length of ports at pm1_x_cnt_blk */
+       u8                              pm2_cnt_len;            /* Byte Length of ports at pm2_cnt_blk */
+       u8                              pm_tm_len;              /* Byte Length of ports at pm_tm_blk */
+       u8                              gpe0_blk_len;           /* Byte Length of ports at gpe0_blk */
+       u8                              gpe1_blk_len;           /* Byte Length of ports at gpe1_blk */
+       u8                              gpe1_base;              /* Offset in gpe model where gpe1 events start */
+       u8                              reserved3;              /* Reserved */
+       u16                             plvl2_lat;              /* Worst case HW latency to enter/exit C2 state */
+       u16                             plvl3_lat;              /* Worst case HW latency to enter/exit C3 state */
+       u16                             flush_size;             /* Size of area read to flush caches */
+       u16                             flush_stride;           /* Stride used in flushing caches */
+       u8                              duty_offset;            /* Bit location of duty cycle field in p_cnt reg */
+       u8                              duty_width;             /* Bit width of duty cycle field in p_cnt reg */
+       u8                              day_alrm;               /* Index to day-of-month alarm in RTC CMOS RAM */
+       u8                              mon_alrm;               /* Index to month-of-year alarm in RTC CMOS RAM */
+       u8                              century;                /* Index to century in RTC CMOS RAM */
+       u8                              reserved4;              /* Reserved */
+       u8                              reserved4a;             /* Reserved */
+       u8                              reserved4b;             /* Reserved */
+       u32                             wb_invd         : 1;    /* The wbinvd instruction works properly */
+       u32                             wb_invd_flush   : 1;    /* The wbinvd flushes but does not invalidate */
+       u32                             proc_c1         : 1;    /* All processors support C1 state */
+       u32                             plvl2_up        : 1;    /* C2 state works on MP system */
+       u32                             pwr_button      : 1;    /* Power button is handled as a generic feature */
+       u32                             sleep_button    : 1;    /* Sleep button is handled as a generic feature, or not present */
+       u32                             fixed_rTC       : 1;    /* RTC wakeup stat not in fixed register space */
+       u32                             rtcs4           : 1;    /* RTC wakeup stat not possible from S4 */
+       u32                             tmr_val_ext     : 1;    /* The tmr_val width is 32 bits (0 = 24 bits) */
+       u32                             reserved5       : 23;   /* Reserved - must be zero */
+};
 
 #pragma pack()
 
index 57e31da..a5410ff 100644 (file)
@@ -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
 /*
  * ACPI 2.0 Root System Description Table (RSDT)
  */
-typedef struct
+struct rsdt_descriptor_rev2
 {
-       acpi_table_header       header;                 /* ACPI table header */
-       u32                     table_offset_entry [1]; /* Array of pointers to  */
+       struct acpi_table_header        header;                 /* ACPI table header */
+       u32                             table_offset_entry [1]; /* Array of pointers to  */
                         /* ACPI table headers */
-} RSDT_DESCRIPTOR_REV2;
+};
 
 
 /*
  * ACPI 2.0 Extended System Description Table (XSDT)
  */
-typedef struct
+struct xsdt_descriptor_rev2
 {
-       acpi_table_header       header;                 /* ACPI table header */
-       u64                     table_offset_entry [1]; /* Array of pointers to  */
+       struct acpi_table_header        header;                 /* ACPI table header */
+       u64                             table_offset_entry [1]; /* Array of pointers to  */
                         /* ACPI table headers */
-} XSDT_DESCRIPTOR_REV2;
+};
 
 
 /*
  * ACPI 2.0 Firmware ACPI Control Structure (FACS)
  */
-typedef struct
+struct facs_descriptor_rev2
 {
-       char                    signature[4];           /* ACPI signature */
-       u32                     length;                 /* Length of structure, in bytes */
-       u32                     hardware_signature;     /* Hardware configuration signature */
-       u32                     firmware_waking_vector; /* 32bit physical address of the Firmware Waking Vector. */
-       u32                     global_lock;            /* Global Lock used to synchronize access to shared hardware resources */
-       u32                     S4bios_f        : 1;    /* S4Bios_f - Indicates if S4BIOS support is present */
-       u32                     reserved1       : 31;   /* Must be 0 */
-       u64                     xfirmware_waking_vector; /* 64bit physical address of the Firmware Waking Vector. */
-       u8                      version;                /* Version of this table */
-       u8                      reserved3 [31];         /* Reserved - must be zero */
-
-} facs_descriptor_rev2;
+       char                            signature[4];           /* ACPI signature */
+       u32                             length;                 /* Length of structure, in bytes */
+       u32                             hardware_signature;     /* Hardware configuration signature */
+       u32                             firmware_waking_vector; /* 32bit physical address of the Firmware Waking Vector. */
+       u32                             global_lock;            /* Global Lock used to synchronize access to shared hardware resources */
+       u32                             S4bios_f        : 1;    /* S4Bios_f - Indicates if S4BIOS support is present */
+       u32                             reserved1       : 31;   /* Must be 0 */
+       u64                             xfirmware_waking_vector; /* 64bit physical address of the Firmware Waking Vector. */
+       u8                              version;                /* Version of this table */
+       u8                              reserved3 [31];         /* Reserved - must be zero */
+};
 
 
 /*
  * ACPI 2.0 Generic Address Structure (GAS)
  */
-typedef struct
+struct acpi_generic_address
 {
-       u8                      address_space_id;       /* Address space where struct or register exists. */
-       u8                      register_bit_width;     /* Size in bits of given register */
-       u8                      register_bit_offset;    /* Bit offset within the register */
-       u8                      reserved;               /* Must be 0 */
-       u64                     address;                /* 64-bit address of struct or register */
-
-} acpi_generic_address;
+       u8                              address_space_id;       /* Address space where struct or register exists. */
+       u8                              register_bit_width;     /* Size in bits of given register */
+       u8                              register_bit_offset;    /* Bit offset within the register */
+       u8                              reserved;               /* Must be 0 */
+       u64                             address;                /* 64-bit address of struct or register */
+};
 
 
 /*
  * ACPI 2.0 Fixed ACPI Description Table (FADT)
  */
-typedef struct
+struct fadt_descriptor_rev2
 {
-       acpi_table_header       header;             /* ACPI table header */
-       u32                     V1_firmware_ctrl;   /* 32-bit physical address of FACS */
-       u32                     V1_dsdt;            /* 32-bit physical address of DSDT */
-       u8                      reserved1;          /* System Interrupt Model isn't used in ACPI 2.0*/
-       u8                      prefer_PM_profile;  /* Conveys preferred power management profile to OSPM. */
-       u16                     sci_int;            /* System vector of SCI interrupt */
-       u32                     smi_cmd;            /* Port address of SMI command port */
-       u8                      acpi_enable;        /* Value to write to smi_cmd to enable ACPI */
-       u8                      acpi_disable;       /* Value to write to smi_cmd to disable ACPI */
-       u8                      S4bios_req;         /* Value to write to SMI CMD to enter S4BIOS state */
-       u8                      pstate_cnt;         /* Processor performance state control*/
-       u32                     V1_pm1a_evt_blk;    /* Port address of Power Mgt 1a acpi_event Reg Blk */
-       u32                     V1_pm1b_evt_blk;    /* Port address of Power Mgt 1b acpi_event Reg Blk */
-       u32                     V1_pm1a_cnt_blk;    /* Port address of Power Mgt 1a Control Reg Blk */
-       u32                     V1_pm1b_cnt_blk;    /* Port address of Power Mgt 1b Control Reg Blk */
-       u32                     V1_pm2_cnt_blk;     /* Port address of Power Mgt 2 Control Reg Blk */
-       u32                     V1_pm_tmr_blk;      /* Port address of Power Mgt Timer Ctrl Reg Blk */
-       u32                     V1_gpe0_blk;        /* Port addr of General Purpose acpi_event 0 Reg Blk */
-       u32                     V1_gpe1_blk;        /* Port addr of General Purpose acpi_event 1 Reg Blk */
-       u8                      pm1_evt_len;        /* Byte length of ports at pm1_x_evt_blk */
-       u8                      pm1_cnt_len;        /* Byte length of ports at pm1_x_cnt_blk */
-       u8                      pm2_cnt_len;        /* Byte Length of ports at pm2_cnt_blk */
-       u8                      pm_tm_len;          /* Byte Length of ports at pm_tm_blk */
-       u8                      gpe0_blk_len;       /* Byte Length of ports at gpe0_blk */
-       u8                      gpe1_blk_len;       /* Byte Length of ports at gpe1_blk */
-       u8                      gpe1_base;          /* Offset in gpe model where gpe1 events start */
-       u8                      cst_cnt;            /* Support for the _CST object and C States change notification.*/
-       u16                     plvl2_lat;          /* Worst case HW latency to enter/exit C2 state */
-       u16                     plvl3_lat;          /* Worst case HW latency to enter/exit C3 state */
-       u16                     flush_size;         /* Number of flush strides that need to be read */
-       u16                     flush_stride;       /* Processor's memory cache line width, in bytes */
-       u8                      duty_offset;        /* Processor's duty cycle index in processor's P_CNT reg*/
-       u8                      duty_width;         /* Processor's duty cycle value bit width in P_CNT register.*/
-       u8                      day_alrm;           /* Index to day-of-month alarm in RTC CMOS RAM */
-       u8                      mon_alrm;           /* Index to month-of-year alarm in RTC CMOS RAM */
-       u8                      century;            /* Index to century in RTC CMOS RAM */
-       u16                     iapc_boot_arch;     /* IA-PC Boot Architecture Flags. See Table 5-10 for description*/
-       u8                      reserved2;          /* Reserved */
-       u32                     wb_invd     : 1;    /* The wbinvd instruction works properly */
-       u32                     wb_invd_flush : 1;  /* The wbinvd flushes but does not invalidate */
-       u32                     proc_c1     : 1;    /* All processors support C1 state */
-       u32                     plvl2_up    : 1;    /* C2 state works on MP system */
-       u32                     pwr_button  : 1;    /* Power button is handled as a generic feature */
-       u32                     sleep_button : 1;   /* Sleep button is handled as a generic feature, or not present */
-       u32                     fixed_rTC   : 1;    /* RTC wakeup stat not in fixed register space */
-       u32                     rtcs4       : 1;    /* RTC wakeup stat not possible from S4 */
-       u32                     tmr_val_ext : 1;    /* Indicates tmr_val is 32 bits 0=24-bits*/
-       u32                     dock_cap    : 1;    /* Supports Docking */
-       u32                     reset_reg_sup : 1;  /* Indicates system supports system reset via the FADT RESET_REG*/
-       u32                     sealed_case : 1;    /* Indicates system has no internal expansion capabilities and case is sealed. */
-       u32                     headless    : 1;    /* Indicates system does not have local video capabilities or local input devices.*/
-       u32                     cpu_sw_sleep : 1;   /* Indicates to OSPM that a processor native instruction */
+       struct acpi_table_header        header;             /* ACPI table header */
+       u32                             V1_firmware_ctrl;   /* 32-bit physical address of FACS */
+       u32                             V1_dsdt;            /* 32-bit physical address of DSDT */
+       u8                              reserved1;          /* System Interrupt Model isn't used in ACPI 2.0*/
+       u8                              prefer_PM_profile;  /* Conveys preferred power management profile to OSPM. */
+       u16                             sci_int;            /* System vector of SCI interrupt */
+       u32                             smi_cmd;            /* Port address of SMI command port */
+       u8                              acpi_enable;        /* Value to write to smi_cmd to enable ACPI */
+       u8                              acpi_disable;       /* Value to write to smi_cmd to disable ACPI */
+       u8                              S4bios_req;         /* Value to write to SMI CMD to enter S4BIOS state */
+       u8                              pstate_cnt;         /* Processor performance state control*/
+       u32                             V1_pm1a_evt_blk;    /* Port address of Power Mgt 1a acpi_event Reg Blk */
+       u32                             V1_pm1b_evt_blk;    /* Port address of Power Mgt 1b acpi_event Reg Blk */
+       u32                             V1_pm1a_cnt_blk;    /* Port address of Power Mgt 1a Control Reg Blk */
+       u32                             V1_pm1b_cnt_blk;    /* Port address of Power Mgt 1b Control Reg Blk */
+       u32                             V1_pm2_cnt_blk;     /* Port address of Power Mgt 2 Control Reg Blk */
+       u32                             V1_pm_tmr_blk;      /* Port address of Power Mgt Timer Ctrl Reg Blk */
+       u32                             V1_gpe0_blk;        /* Port addr of General Purpose acpi_event 0 Reg Blk */
+       u32                             V1_gpe1_blk;        /* Port addr of General Purpose acpi_event 1 Reg Blk */
+       u8                              pm1_evt_len;        /* Byte length of ports at pm1_x_evt_blk */
+       u8                              pm1_cnt_len;        /* Byte length of ports at pm1_x_cnt_blk */
+       u8                              pm2_cnt_len;        /* Byte Length of ports at pm2_cnt_blk */
+       u8                              pm_tm_len;          /* Byte Length of ports at pm_tm_blk */
+       u8                              gpe0_blk_len;       /* Byte Length of ports at gpe0_blk */
+       u8                              gpe1_blk_len;       /* Byte Length of ports at gpe1_blk */
+       u8                              gpe1_base;          /* Offset in gpe model where gpe1 events start */
+       u8                              cst_cnt;            /* Support for the _CST object and C States change notification.*/
+       u16                             plvl2_lat;          /* Worst case HW latency to enter/exit C2 state */
+       u16                             plvl3_lat;          /* Worst case HW latency to enter/exit C3 state */
+       u16                             flush_size;         /* Number of flush strides that need to be read */
+       u16                             flush_stride;       /* Processor's memory cache line width, in bytes */
+       u8                              duty_offset;        /* Processor's duty cycle index in processor's P_CNT reg*/
+       u8                              duty_width;         /* Processor's duty cycle value bit width in P_CNT register.*/
+       u8                              day_alrm;           /* Index to day-of-month alarm in RTC CMOS RAM */
+       u8                              mon_alrm;           /* Index to month-of-year alarm in RTC CMOS RAM */
+       u8                              century;            /* Index to century in RTC CMOS RAM */
+       u16                             iapc_boot_arch;     /* IA-PC Boot Architecture Flags. See Table 5-10 for description*/
+       u8                              reserved2;          /* Reserved */
+       u32                             wb_invd     : 1;    /* The wbinvd instruction works properly */
+       u32                             wb_invd_flush : 1;  /* The wbinvd flushes but does not invalidate */
+       u32                             proc_c1     : 1;    /* All processors support C1 state */
+       u32                             plvl2_up    : 1;    /* C2 state works on MP system */
+       u32                             pwr_button  : 1;    /* Power button is handled as a generic feature */
+       u32                             sleep_button : 1;   /* Sleep button is handled as a generic feature, or not present */
+       u32                             fixed_rTC   : 1;    /* RTC wakeup stat not in fixed register space */
+       u32                             rtcs4       : 1;    /* RTC wakeup stat not possible from S4 */
+       u32                             tmr_val_ext : 1;    /* Indicates tmr_val is 32 bits 0=24-bits*/
+       u32                             dock_cap    : 1;    /* Supports Docking */
+       u32                             reset_reg_sup : 1;  /* Indicates system supports system reset via the FADT RESET_REG*/
+       u32                             sealed_case : 1;    /* Indicates system has no internal expansion capabilities and case is sealed. */
+       u32                             headless    : 1;    /* Indicates system does not have local video capabilities or local input devices.*/
+       u32                             cpu_sw_sleep : 1;   /* Indicates to OSPM that a processor native instruction */
                           /* Must be executed after writing the SLP_TYPx register. */
-       u32                     reserved6   : 18;   /* Reserved - must be zero */
-
-       acpi_generic_address    reset_register;     /* Reset register address in GAS format */
-       u8                      reset_value;        /* Value to write to the reset_register port to reset the system. */
-       u8                      reserved7[3];       /* These three bytes must be zero */
-       u64                     xfirmware_ctrl;     /* 64-bit physical address of FACS */
-       u64                     Xdsdt;              /* 64-bit physical address of DSDT */
-       acpi_generic_address    xpm1a_evt_blk;      /* Extended Power Mgt 1a acpi_event Reg Blk address */
-       acpi_generic_address    xpm1b_evt_blk;      /* Extended Power Mgt 1b acpi_event Reg Blk address */
-       acpi_generic_address    xpm1a_cnt_blk;      /* Extended Power Mgt 1a Control Reg Blk address */
-       acpi_generic_address    xpm1b_cnt_blk;      /* Extended Power Mgt 1b Control Reg Blk address */
-       acpi_generic_address    xpm2_cnt_blk;       /* Extended Power Mgt 2 Control Reg Blk address */
-       acpi_generic_address    xpm_tmr_blk;        /* Extended Power Mgt Timer Ctrl Reg Blk address */
-       acpi_generic_address    xgpe0_blk;          /* Extended General Purpose acpi_event 0 Reg Blk address */
-       acpi_generic_address    xgpe1_blk;          /* Extended General Purpose acpi_event 1 Reg Blk address */
-
-}  fadt_descriptor_rev2;
+       u32                             reserved6   : 18;   /* Reserved - must be zero */
+
+       struct acpi_generic_address     reset_register;     /* Reset register address in GAS format */
+       u8                              reset_value;        /* Value to write to the reset_register port to reset the system. */
+       u8                              reserved7[3];       /* These three bytes must be zero */
+       u64                             xfirmware_ctrl;     /* 64-bit physical address of FACS */
+       u64                             Xdsdt;              /* 64-bit physical address of DSDT */
+       struct acpi_generic_address     xpm1a_evt_blk;      /* Extended Power Mgt 1a acpi_event Reg Blk address */
+       struct acpi_generic_address     xpm1b_evt_blk;      /* Extended Power Mgt 1b acpi_event Reg Blk address */
+       struct acpi_generic_address     xpm1a_cnt_blk;      /* Extended Power Mgt 1a Control Reg Blk address */
+       struct acpi_generic_address     xpm1b_cnt_blk;      /* Extended Power Mgt 1b Control Reg Blk address */
+       struct acpi_generic_address     xpm2_cnt_blk;       /* Extended Power Mgt 2 Control Reg Blk address */
+       struct acpi_generic_address     xpm_tmr_blk;        /* Extended Power Mgt Timer Ctrl Reg Blk address */
+       struct acpi_generic_address     xgpe0_blk;          /* Extended General Purpose acpi_event 0 Reg Blk address */
+       struct acpi_generic_address     xgpe1_blk;          /* Extended General Purpose acpi_event 1 Reg Blk address */
+};
 
 
 #pragma pack()
index 0f2d084..7b4fb44 100644 (file)
@@ -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
 
 /* Only for clarity in declarations */
 
-typedef u64                 IO_ADDRESS;
+typedef u64                         IO_ADDRESS;
 
 
 #pragma pack(1)
-typedef struct  /* Root System Descriptor Pointer */
+struct  /* Root System Descriptor Pointer */
 {
        NATIVE_CHAR             signature [8];          /* contains "RSD PTR " */
-       u8                      checksum;               /* to make sum of struct == 0 */
+       u8                              checksum;               /* to make sum of struct == 0 */
        NATIVE_CHAR             oem_id [6];             /* OEM identification */
-       u8                      reserved;               /* Must be 0 for 1.0, 2 for 2.0 */
-       u64                     rsdt_physical_address;  /* 64-bit physical address of RSDT */
-} RSDP_DESCRIPTOR_REV071;
+       u8                              reserved;               /* Must be 0 for 1.0, 2 for 2.0 */
+       u64                             rsdt_physical_address;  /* 64-bit physical address of RSDT */
+};
 
 
 /*****************************************/
 /* IA64 Extensions to ACPI Spec Rev 0.71 */
 /* for the Root System Description Table */
 /*****************************************/
-typedef struct
+struct
 {
-       acpi_table_header   header;                 /* Table header */
-       u32                 reserved_pad;           /* IA64 alignment, must be 0 */
-       u64                 table_offset_entry [1]; /* Array of pointers to other */
+       struct acpi_table_header    header;                 /* Table header */
+       u32                         reserved_pad;           /* IA64 alignment, must be 0 */
+       u64                         table_offset_entry [1]; /* Array of pointers to other */
                           /* tables' headers */
-} RSDT_DESCRIPTOR_REV071;
+};
 
 
 /*******************************************/
 /* IA64 Extensions to ACPI Spec Rev 0.71   */
 /* for the Firmware ACPI Control Structure */
 /*******************************************/
-typedef struct
+struct
 {
        NATIVE_CHAR         signature[4];         /* signature "FACS" */
-       u32                 length;               /* length of structure, in bytes */
-       u32                 hardware_signature;   /* hardware configuration signature */
-       u32                 reserved4;            /* must be 0 */
-       u64                 firmware_waking_vector; /* ACPI OS waking vector */
-       u64                 global_lock;          /* Global Lock */
-       u32                 S4bios_f      : 1;    /* Indicates if S4BIOS support is present */
-       u32                 reserved1     : 31;   /* must be 0 */
-       u8                  reserved3 [28];       /* reserved - must be zero */
-
-} facs_descriptor_rev071;
+       u32                         length;               /* length of structure, in bytes */
+       u32                         hardware_signature;   /* hardware configuration signature */
+       u32                         reserved4;            /* must be 0 */
+       u64                         firmware_waking_vector; /* ACPI OS waking vector */
+       u64                         global_lock;          /* Global Lock */
+       u32                         S4bios_f      : 1;    /* Indicates if S4BIOS support is present */
+       u32                         reserved1     : 31;   /* must be 0 */
+       u8                          reserved3 [28];       /* reserved - must be zero */
+};
 
 
 /******************************************/
 /* IA64 Extensions to ACPI Spec Rev 0.71  */
 /* for the Fixed ACPI Description Table   */
 /******************************************/
-typedef struct
+struct
 {
-       acpi_table_header   header;             /* table header */
-       u32                 reserved_pad;       /* IA64 alignment, must be 0 */
-       u64                 firmware_ctrl;      /* 64-bit Physical address of FACS */
-       u64                 dsdt;               /* 64-bit Physical address of DSDT */
-       u8                  model;              /* System Interrupt Model */
-       u8                  address_space;      /* Address Space Bitmask */
-       u16                 sci_int;            /* System vector of SCI interrupt */
-       u8                  acpi_enable;        /* value to write to smi_cmd to enable ACPI */
-       u8                  acpi_disable;       /* value to write to smi_cmd to disable ACPI */
-       u8                  S4bios_req;         /* Value to write to SMI CMD to enter S4BIOS state */
-       u8                  reserved2;          /* reserved - must be zero */
-       u64                 smi_cmd;            /* Port address of SMI command port */
-       u64                 pm1a_evt_blk;       /* Port address of Power Mgt 1a acpi_event Reg Blk */
-       u64                 pm1b_evt_blk;       /* Port address of Power Mgt 1b acpi_event Reg Blk */
-       u64                 pm1a_cnt_blk;       /* Port address of Power Mgt 1a Control Reg Blk */
-       u64                 pm1b_cnt_blk;       /* Port address of Power Mgt 1b Control Reg Blk */
-       u64                 pm2_cnt_blk;        /* Port address of Power Mgt 2 Control Reg Blk */
-       u64                 pm_tmr_blk;         /* Port address of Power Mgt Timer Ctrl Reg Blk */
-       u64                 gpe0_blk;           /* Port addr of General Purpose acpi_event 0 Reg Blk */
-       u64                 gpe1_blk;           /* Port addr of General Purpose acpi_event 1 Reg Blk */
-       u8                  pm1_evt_len;        /* Byte length of ports at pm1_x_evt_blk */
-       u8                  pm1_cnt_len;        /* Byte length of ports at pm1_x_cnt_blk */
-       u8                  pm2_cnt_len;        /* Byte Length of ports at pm2_cnt_blk */
-       u8                  pm_tm_len;          /* Byte Length of ports at pm_tm_blk */
-       u8                  gpe0_blk_len;       /* Byte Length of ports at gpe0_blk */
-       u8                  gpe1_blk_len;       /* Byte Length of ports at gpe1_blk */
-       u8                  gpe1_base;          /* offset in gpe model where gpe1 events start */
-       u8                  reserved3;          /* reserved */
-       u16                 plvl2_lat;          /* worst case HW latency to enter/exit C2 state */
-       u16                 plvl3_lat;          /* worst case HW latency to enter/exit C3 state */
-       u8                  day_alrm;           /* index to day-of-month alarm in RTC CMOS RAM */
-       u8                  mon_alrm;           /* index to month-of-year alarm in RTC CMOS RAM */
-       u8                  century;            /* index to century in RTC CMOS RAM */
-       u8                  reserved4;          /* reserved */
-       u32                 flush_cash  : 1;    /* PAL_FLUSH_CACHE is correctly supported */
-       u32                 reserved5   : 1;    /* reserved - must be zero */
-       u32                 proc_c1     : 1;    /* all processors support C1 state */
-       u32                 plvl2_up    : 1;    /* C2 state works on MP system */
-       u32                 pwr_button  : 1;    /* Power button is handled as a generic feature */
-       u32                 sleep_button : 1;   /* Sleep button is handled as a generic feature, or not present */
-       u32                 fixed_rTC   : 1;    /* RTC wakeup stat not in fixed register space */
-       u32                 rtcs4       : 1;    /* RTC wakeup stat not possible from S4 */
-       u32                 tmr_val_ext : 1;    /* tmr_val is 32 bits */
-       u32                 dock_cap    : 1;    /* Supports Docking */
-       u32                 reserved6   : 22;    /* reserved - must be zero */
-
-}  fadt_descriptor_rev071;
+       struct acpi_table_header    header;             /* table header */
+       u32                         reserved_pad;       /* IA64 alignment, must be 0 */
+       u64                         firmware_ctrl;      /* 64-bit Physical address of FACS */
+       u64                         dsdt;               /* 64-bit Physical address of DSDT */
+       u8                          model;              /* System Interrupt Model */
+       u8                          address_space;      /* Address Space Bitmask */
+       u16                         sci_int;            /* System vector of SCI interrupt */
+       u8                          acpi_enable;        /* value to write to smi_cmd to enable ACPI */
+       u8                          acpi_disable;       /* value to write to smi_cmd to disable ACPI */
+       u8                          S4bios_req;         /* Value to write to SMI CMD to enter S4BIOS state */
+       u8                          reserved2;          /* reserved - must be zero */
+       u64                         smi_cmd;            /* Port address of SMI command port */
+       u64                         pm1a_evt_blk;       /* Port address of Power Mgt 1a acpi_event Reg Blk */
+       u64                         pm1b_evt_blk;       /* Port address of Power Mgt 1b acpi_event Reg Blk */
+       u64                         pm1a_cnt_blk;       /* Port address of Power Mgt 1a Control Reg Blk */
+       u64                         pm1b_cnt_blk;       /* Port address of Power Mgt 1b Control Reg Blk */
+       u64                         pm2_cnt_blk;        /* Port address of Power Mgt 2 Control Reg Blk */
+       u64                         pm_tmr_blk;         /* Port address of Power Mgt Timer Ctrl Reg Blk */
+       u64                         gpe0_blk;           /* Port addr of General Purpose acpi_event 0 Reg Blk */
+       u64                         gpe1_blk;           /* Port addr of General Purpose acpi_event 1 Reg Blk */
+       u8                          pm1_evt_len;        /* Byte length of ports at pm1_x_evt_blk */
+       u8                          pm1_cnt_len;        /* Byte length of ports at pm1_x_cnt_blk */
+       u8                          pm2_cnt_len;        /* Byte Length of ports at pm2_cnt_blk */
+       u8                          pm_tm_len;          /* Byte Length of ports at pm_tm_blk */
+       u8                          gpe0_blk_len;       /* Byte Length of ports at gpe0_blk */
+       u8                          gpe1_blk_len;       /* Byte Length of ports at gpe1_blk */
+       u8                          gpe1_base;          /* offset in gpe model where gpe1 events start */
+       u8                          reserved3;          /* reserved */
+       u16                         plvl2_lat;          /* worst case HW latency to enter/exit C2 state */
+       u16                         plvl3_lat;          /* worst case HW latency to enter/exit C3 state */
+       u8                          day_alrm;           /* index to day-of-month alarm in RTC CMOS RAM */
+       u8                          mon_alrm;           /* index to month-of-year alarm in RTC CMOS RAM */
+       u8                          century;            /* index to century in RTC CMOS RAM */
+       u8                          reserved4;          /* reserved */
+       u32                         flush_cash  : 1;    /* PAL_FLUSH_CACHE is correctly supported */
+       u32                         reserved5   : 1;    /* reserved - must be zero */
+       u32                         proc_c1     : 1;    /* all processors support C1 state */
+       u32                         plvl2_up    : 1;    /* C2 state works on MP system */
+       u32                         pwr_button  : 1;    /* Power button is handled as a generic feature */
+       u32                         sleep_button : 1;   /* Sleep button is handled as a generic feature, or not present */
+       u32                         fixed_rTC   : 1;    /* RTC wakeup stat not in fixed register space */
+       u32                         rtcs4       : 1;    /* RTC wakeup stat not possible from S4 */
+       u32                         tmr_val_ext : 1;    /* tmr_val is 32 bits */
+       u32                         dock_cap    : 1;    /* Supports Docking */
+       u32                         reserved6   : 22;    /* reserved - must be zero */
+};
 
 #pragma pack()
 
index 7169645..16a2133 100644 (file)
@@ -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
@@ -90,13 +90,13 @@ typedef COMPILER_DEPENDENT_UINT64       UINT64;
 
 /*! [End] no source code translation !*/
 
-typedef s64                             acpi_native_int;
-typedef u64                             acpi_native_uint;
+typedef s64                                     acpi_native_int;
+typedef u64                                     acpi_native_uint;
 
-typedef u64                             acpi_table_ptr;
-typedef u64                             acpi_io_address;
-typedef u64                             acpi_physical_address;
-typedef u64                             acpi_size;
+typedef u64                                     acpi_table_ptr;
+typedef u64                                     acpi_io_address;
+typedef u64                                     acpi_physical_address;
+typedef u64                                     acpi_size;
 
 #define ALIGNED_ADDRESS_BOUNDARY        0x00000008      /* No hardware alignment support in IA64 */
 #define ACPI_USE_NATIVE_DIVIDE                          /* Native 64-bit integer support */
@@ -118,22 +118,21 @@ typedef long                            INT32;
 typedef int                             INT16;
 typedef unsigned long                   UINT32;
 
-typedef struct
+struct
 {
        UINT32                                  Lo;
        UINT32                                  Hi;
-
-} UINT64;
+};
 
 /*! [End] no source code translation !*/
 
-typedef u16                             acpi_native_uint;
-typedef s16                             acpi_native_int;
+typedef u16                                     acpi_native_uint;
+typedef s16                                     acpi_native_int;
 
-typedef u32                             acpi_table_ptr;
-typedef u32                             acpi_io_address;
-typedef char                            *acpi_physical_address;
-typedef u16                             acpi_size;
+typedef u32                                     acpi_table_ptr;
+typedef u32                                     acpi_io_address;
+typedef char                                    *acpi_physical_address;
+typedef u16                                     acpi_size;
 
 #define ALIGNED_ADDRESS_BOUNDARY        0x00000002
 #define _HW_ALIGNMENT_SUPPORT
@@ -165,13 +164,13 @@ typedef COMPILER_DEPENDENT_UINT64       UINT64;
 
 /*! [End] no source code translation !*/
 
-typedef s32                             acpi_native_int;
-typedef u32                             acpi_native_uint;
+typedef s32                                     acpi_native_int;
+typedef u32                                     acpi_native_uint;
 
-typedef u64                             acpi_table_ptr;
-typedef u32                             acpi_io_address;
-typedef u64                             acpi_physical_address;
-typedef u32                             acpi_size;
+typedef u64                                     acpi_table_ptr;
+typedef u32                                     acpi_io_address;
+typedef u64                                     acpi_physical_address;
+typedef u32                                     acpi_size;
 
 #define ALIGNED_ADDRESS_BOUNDARY        0x00000004
 #define _HW_ALIGNMENT_SUPPORT
@@ -186,27 +185,25 @@ typedef u32                             acpi_size;
 /*
  * Miscellaneous common types
  */
-typedef u32                             UINT32_BIT;
-typedef acpi_native_uint                ACPI_PTRDIFF;
+typedef u32                                     UINT32_BIT;
+typedef acpi_native_uint                        ACPI_PTRDIFF;
 
 /*
  * Pointer overlays to avoid lots of typecasting for
  * code that accepts both physical and logical pointers.
  */
-typedef union acpi_ptrs
+union acpi_pointers
 {
-       acpi_physical_address       physical;
-       void                        *logical;
-       acpi_table_ptr              value;
-
-} acpi_pointers;
+       acpi_physical_address               physical;
+       void                                *logical;
+       acpi_table_ptr                      value;
+};
 
-typedef struct acpi_pointer
+struct acpi_pointer
 {
-       u32                         pointer_type;
-       union acpi_ptrs             pointer;
-
-} acpi_pointer;
+       u32                                 pointer_type;
+       union acpi_pointers                 pointer;
+};
 
 /* pointer_types for above */
 
@@ -245,31 +242,28 @@ typedef struct acpi_pointer
 /*
  * Local datatypes
  */
-typedef u32                             acpi_status;    /* All ACPI Exceptions */
-typedef u32                             acpi_name;      /* 4-byte ACPI name */
-typedef char*                           acpi_string;    /* Null terminated ASCII string */
-typedef void*                           acpi_handle;    /* Actually a ptr to an Node */
+typedef u32                                     acpi_status;    /* All ACPI Exceptions */
+typedef u32                                     acpi_name;      /* 4-byte ACPI name */
+typedef char *                                  acpi_string;    /* Null terminated ASCII string */
+typedef void *                                  acpi_handle;    /* Actually a ptr to an Node */
 
-typedef struct
+struct uint64_struct
 {
-       u32                         lo;
-       u32                         hi;
+       u32                                 lo;
+       u32                                 hi;
+};
 
-} uint64_struct;
-
-typedef union
+union uint64_overlay
 {
-       u64                         full;
-       uint64_struct               part;
-
-} uint64_overlay;
+       u64                                 full;
+       struct uint64_struct                part;
+};
 
-typedef struct
+struct uint32_struct
 {
-       u32                         lo;
-       u32                         hi;
-
-} uint32_struct;
+       u32                                 lo;
+       u32                                 hi;
+};
 
 
 /*
@@ -283,7 +277,7 @@ typedef struct
 
 /* 32-bit integers only, no 64-bit support */
 
-typedef u32                             acpi_integer;
+typedef u32                                     acpi_integer;
 #define ACPI_INTEGER_MAX                ACPI_UINT32_MAX
 #define ACPI_INTEGER_BIT_SIZE           32
 #define ACPI_MAX_BCD_VALUE              99999999
@@ -297,7 +291,7 @@ typedef u32                             acpi_integer;
 
 /* 64-bit integers */
 
-typedef u64                             acpi_integer;
+typedef u64                                     acpi_integer;
 #define ACPI_INTEGER_MAX                ACPI_UINT64_MAX
 #define ACPI_INTEGER_BIT_SIZE           64
 #define ACPI_MAX_BCD_VALUE              9999999999999999
@@ -384,7 +378,7 @@ typedef u64                             acpi_integer;
 /*
  *  Table types.  These values are passed to the table related APIs
  */
-typedef u32                             acpi_table_type;
+typedef u32                                     acpi_table_type;
 
 #define ACPI_TABLE_RSDP                 (acpi_table_type) 0
 #define ACPI_TABLE_DSDT                 (acpi_table_type) 1
@@ -406,7 +400,7 @@ typedef u32                             acpi_table_type;
  * Types must be kept in sync with the global acpi_ns_properties
  * and acpi_ns_type_names arrays.
  */
-typedef u32                             acpi_object_type;
+typedef u32                                     acpi_object_type;
 
 #define ACPI_TYPE_ANY                   0x00
 #define ACPI_TYPE_INTEGER               0x01  /* Byte/Word/Dword/Zero/One/Ones */
@@ -450,7 +444,7 @@ typedef u32                             acpi_object_type;
 
 /*
  * These are special object types that never appear in
- * a Namespace node, only in an acpi_operand_object
+ * a Namespace node, only in an union acpi_operand_object
  */
 #define ACPI_TYPE_LOCAL_EXTRA           0x1B
 #define ACPI_TYPE_LOCAL_DATA            0x1C
@@ -505,7 +499,7 @@ typedef u32                             acpi_object_type;
 /*
  * acpi_event Types: Fixed & General Purpose
  */
-typedef u32                             acpi_event_type;
+typedef u32                                     acpi_event_type;
 
 #define ACPI_EVENT_FIXED                0
 #define ACPI_EVENT_GPE                  1
@@ -550,7 +544,7 @@ typedef u32                             acpi_event_type;
  *          |     +----- Set?
  *          +----------- <Reserved>
  */
-typedef u32                             acpi_event_status;
+typedef u32                                     acpi_event_status;
 
 #define ACPI_EVENT_FLAG_DISABLED        (acpi_event_status) 0x00
 #define ACPI_EVENT_FLAG_ENABLED         (acpi_event_status) 0x01
@@ -569,7 +563,7 @@ typedef u32                             acpi_event_status;
 
 /* Address Space (Operation Region) Types */
 
-typedef u8                              acpi_adr_space_type;
+typedef u8                                      acpi_adr_space_type;
 
 #define ACPI_ADR_SPACE_SYSTEM_MEMORY    (acpi_adr_space_type) 0
 #define ACPI_ADR_SPACE_SYSTEM_IO        (acpi_adr_space_type) 1
@@ -579,6 +573,7 @@ typedef u8                              acpi_adr_space_type;
 #define ACPI_ADR_SPACE_CMOS             (acpi_adr_space_type) 5
 #define ACPI_ADR_SPACE_PCI_BAR_TARGET   (acpi_adr_space_type) 6
 #define ACPI_ADR_SPACE_DATA_TABLE       (acpi_adr_space_type) 7
+#define ACPI_ADR_SPACE_FIXED_HARDWARE   (acpi_adr_space_type) 127
 
 
 /*
@@ -616,70 +611,68 @@ typedef u8                              acpi_adr_space_type;
 /*
  * External ACPI object definition
  */
-typedef union acpi_obj
+union acpi_object
 {
-       acpi_object_type            type;   /* See definition of acpi_ns_type for values */
+       acpi_object_type                    type;   /* See definition of acpi_ns_type for values */
        struct
        {
-               acpi_object_type            type;
-               acpi_integer                value;      /* The actual number */
+               acpi_object_type                    type;
+               acpi_integer                        value;      /* The actual number */
        } integer;
 
        struct
        {
-               acpi_object_type            type;
-               u32                         length;     /* # of bytes in string, excluding trailing null */
-               char                        *pointer;   /* points to the string value */
+               acpi_object_type                    type;
+               u32                                 length;     /* # of bytes in string, excluding trailing null */
+               char                                *pointer;   /* points to the string value */
        } string;
 
        struct
        {
-               acpi_object_type            type;
-               u32                         length;     /* # of bytes in buffer */
-               u8                          *pointer;   /* points to the buffer */
+               acpi_object_type                    type;
+               u32                                 length;     /* # of bytes in buffer */
+               u8                                  *pointer;   /* points to the buffer */
        } buffer;
 
        struct
        {
-               acpi_object_type            type;
-               u32                         fill1;
-               acpi_handle                 handle;     /* object reference */
+               acpi_object_type                    type;
+               u32                                 fill1;
+               acpi_handle                         handle;     /* object reference */
        } reference;
 
        struct
        {
-               acpi_object_type            type;
-               u32                         count;      /* # of elements in package */
-               union acpi_obj              *elements;  /* Pointer to an array of ACPI_OBJECTs */
+               acpi_object_type                    type;
+               u32                                 count;      /* # of elements in package */
+               union acpi_object                   *elements;  /* Pointer to an array of ACPI_OBJECTs */
        } package;
 
        struct
        {
-               acpi_object_type            type;
-               u32                         proc_id;
-               acpi_io_address             pblk_address;
-               u32                         pblk_length;
+               acpi_object_type                    type;
+               u32                                 proc_id;
+               acpi_io_address                     pblk_address;
+               u32                                 pblk_length;
        } processor;
 
        struct
        {
-               acpi_object_type            type;
-               u32                         system_level;
-               u32                         resource_order;
+               acpi_object_type                    type;
+               u32                                 system_level;
+               u32                                 resource_order;
        } power_resource;
-
-} acpi_object;
+};
 
 
 /*
  * List of objects, used as a parameter list for control method evaluation
  */
-typedef struct acpi_obj_list
+struct acpi_object_list
 {
-       u32                         count;
-       acpi_object                 *pointer;
-
-} acpi_object_list;
+       u32                                 count;
+       union acpi_object                   *pointer;
+};
 
 
 /*
@@ -689,12 +682,11 @@ typedef struct acpi_obj_list
 #define ACPI_ALLOCATE_BUFFER        (acpi_size) (-1)
 #define ACPI_ALLOCATE_LOCAL_BUFFER  (acpi_size) (-2)
 
-typedef struct
+struct acpi_buffer
 {
-       acpi_size                   length;         /* Length in bytes of the buffer */
-       void                        *pointer;       /* pointer to buffer */
-
-} acpi_buffer;
+       acpi_size                           length;         /* Length in bytes of the buffer */
+       void                                *pointer;       /* pointer to buffer */
+};
 
 
 /*
@@ -717,29 +709,27 @@ typedef struct
 /*
  * ACPI Table Info.  One per ACPI table _type_
  */
-typedef struct acpi_table_info
+struct acpi_table_info
 {
-       u32                         count;
-
-} acpi_table_info;
+       u32                                 count;
+};
 
 
 /*
  * System info returned by acpi_get_system_info()
  */
-typedef struct _acpi_sys_info
+struct acpi_system_info
 {
-       u32                         acpi_ca_version;
-       u32                         flags;
-       u32                         timer_resolution;
-       u32                         reserved1;
-       u32                         reserved2;
-       u32                         debug_level;
-       u32                         debug_layer;
-       u32                         num_table_types;
-       acpi_table_info             table_info [NUM_ACPI_TABLES];
-
-} acpi_system_info;
+       u32                                 acpi_ca_version;
+       u32                                 flags;
+       u32                                 timer_resolution;
+       u32                                 reserved1;
+       u32                                 reserved2;
+       u32                                 debug_level;
+       u32                                 debug_layer;
+       u32                                 num_table_types;
+       struct acpi_table_info              table_info [NUM_ACPI_TABLES];
+};
 
 
 /*
@@ -747,28 +737,28 @@ typedef struct _acpi_sys_info
  */
 typedef
 u32 (*acpi_event_handler) (
-       void                        *context);
+       void                                *context);
 
 typedef
 void (*acpi_gpe_handler) (
-       void                        *context);
+       void                                *context);
 
 typedef
 void (*acpi_notify_handler) (
-       acpi_handle                 device,
-       u32                         value,
-       void                        *context);
+       acpi_handle                         device,
+       u32                                 value,
+       void                                *context);
 
 typedef
 void (*acpi_object_handler) (
-       acpi_handle                 object,
-       u32                         function,
-       void                        *data);
+       acpi_handle                         object,
+       u32                                 function,
+       void                                *data);
 
 typedef
 acpi_status (*acpi_init_handler) (
-       acpi_handle                 object,
-       u32                         function);
+       acpi_handle                         object,
+       u32                                 function);
 
 #define ACPI_INIT_DEVICE_INI        1
 
@@ -777,32 +767,32 @@ acpi_status (*acpi_init_handler) (
 
 typedef
 acpi_status (*acpi_adr_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);
 
 #define ACPI_DEFAULT_HANDLER        NULL
 
 
 typedef
 acpi_status (*acpi_adr_space_setup) (
-       acpi_handle                 region_handle,
-       u32                         function,
-       void                        *handler_context,
-       void                        **region_context);
+       acpi_handle                         region_handle,
+       u32                                 function,
+       void                                *handler_context,
+       void                                **region_context);
 
 #define ACPI_REGION_ACTIVATE    0
 #define ACPI_REGION_DEACTIVATE  1
 
 typedef
 acpi_status (*acpi_walk_callback) (
-       acpi_handle                 obj_handle,
-       u32                         nesting_level,
-       void                        *context,
-       void                        **return_value);
+       acpi_handle                         obj_handle,
+       u32                                 nesting_level,
+       void                                *context,
+       void                                **return_value);
 
 
 /* Interrupt handler return values */
@@ -820,47 +810,47 @@ acpi_status (*acpi_walk_callback) (
 
 
 #define ACPI_COMMON_OBJ_INFO \
-       acpi_object_type            type;           /* ACPI object type */ \
-       acpi_name                   name            /* ACPI object Name */
+       acpi_object_type                    type;           /* ACPI object type */ \
+       acpi_name                           name            /* ACPI object Name */
 
 
-typedef struct
+struct acpi_obj_info_header
 {
        ACPI_COMMON_OBJ_INFO;
-} acpi_obj_info_header;
+};
 
 
-typedef struct
+struct acpi_device_info
 {
        ACPI_COMMON_OBJ_INFO;
 
-       u32                         valid;              /*  Are the next bits legit? */
-       char                        hardware_id[9];     /*  _HID value if any */
-       char                        unique_id[9];       /*  _UID value if any */
-       acpi_integer                address;            /*  _ADR value if any */
-       u32                         current_status;     /*  _STA value */
-} acpi_device_info;
+       u32                                 valid;              /*  Are the next bits legit? */
+       char                                hardware_id[9];     /*  _HID value if any */
+       char                                unique_id[9];       /*  _UID value if any */
+       acpi_integer                        address;            /*  _ADR value if any */
+       u32                                 current_status;     /*  _STA value */
+};
 
 
 /* Context structs for address space handlers */
 
-typedef struct
+struct acpi_pci_id
 {
-       u16                         segment;
-       u16                         bus;
-       u16                         device;
-       u16                         function;
-} acpi_pci_id;
+       u16                                 segment;
+       u16                                 bus;
+       u16                                 device;
+       u16                                 function;
+};
 
 
-typedef struct
+struct acpi_mem_space_context
 {
-       u32                         length;
-       acpi_physical_address       address;
-       acpi_physical_address       mapped_physical_address;
-       u8                          *mapped_logical_address;
-       acpi_size                   mapped_length;
-} acpi_mem_space_context;
+       u32                                 length;
+       acpi_physical_address               address;
+       acpi_physical_address               mapped_physical_address;
+       u8                                  *mapped_logical_address;
+       acpi_size                           mapped_length;
+};
 
 
 /*
@@ -947,195 +937,176 @@ typedef struct
 /*
  *  Structures used to describe device resources
  */
-typedef struct
+struct acpi_resource_irq
 {
-       u32                         edge_level;
-       u32                         active_high_low;
-       u32                         shared_exclusive;
-       u32                         number_of_interrupts;
-       u32                         interrupts[1];
-
-} acpi_resource_irq;
-
-typedef struct
+       u32                                 edge_level;
+       u32                                 active_high_low;
+       u32                                 shared_exclusive;
+       u32                                 number_of_interrupts;
+       u32                                 interrupts[1];
+};
+
+struct acpi_resource_dma
 {
-       u32                         type;
-       u32                         bus_master;
-       u32                         transfer;
-       u32                         number_of_channels;
-       u32                         channels[1];
-
-} acpi_resource_dma;
-
-typedef struct
+       u32                                 type;
+       u32                                 bus_master;
+       u32                                 transfer;
+       u32                                 number_of_channels;
+       u32                                 channels[1];
+};
+
+struct acpi_resource_start_dpf
 {
-       u32                         compatibility_priority;
-       u32                         performance_robustness;
-
-} acpi_resource_start_dpf;
+       u32                                 compatibility_priority;
+       u32                                 performance_robustness;
+};
 
 /*
  * END_DEPENDENT_FUNCTIONS_RESOURCE struct is not
  * needed because it has no fields
  */
 
-typedef struct
+struct acpi_resource_io
 {
-       u32                         io_decode;
-       u32                         min_base_address;
-       u32                         max_base_address;
-       u32                         alignment;
-       u32                         range_length;
-
-} acpi_resource_io;
-
-typedef struct
+       u32                                 io_decode;
+       u32                                 min_base_address;
+       u32                                 max_base_address;
+       u32                                 alignment;
+       u32                                 range_length;
+};
+
+struct acpi_resource_fixed_io
 {
-       u32                         base_address;
-       u32                         range_length;
-
-} acpi_resource_fixed_io;
+       u32                                 base_address;
+       u32                                 range_length;
+};
 
-typedef struct
+struct acpi_resource_vendor
 {
-       u32                         length;
-       u8                          reserved[1];
-
-} acpi_resource_vendor;
+       u32                                 length;
+       u8                                  reserved[1];
+};
 
-typedef struct
+struct acpi_resource_end_tag
 {
-       u8                          checksum;
+       u8                                  checksum;
+};
 
-} acpi_resource_end_tag;
-
-typedef struct
+struct acpi_resource_mem24
 {
-       u32                         read_write_attribute;
-       u32                         min_base_address;
-       u32                         max_base_address;
-       u32                         alignment;
-       u32                         range_length;
-
-} acpi_resource_mem24;
-
-typedef struct
+       u32                                 read_write_attribute;
+       u32                                 min_base_address;
+       u32                                 max_base_address;
+       u32                                 alignment;
+       u32                                 range_length;
+};
+
+struct acpi_resource_mem32
 {
-       u32                         read_write_attribute;
-       u32                         min_base_address;
-       u32                         max_base_address;
-       u32                         alignment;
-       u32                         range_length;
-
-} acpi_resource_mem32;
-
-typedef struct
+       u32                                 read_write_attribute;
+       u32                                 min_base_address;
+       u32                                 max_base_address;
+       u32                                 alignment;
+       u32                                 range_length;
+};
+
+struct acpi_resource_fixed_mem32
 {
-       u32                         read_write_attribute;
-       u32                         range_base_address;
-       u32                         range_length;
-
-} acpi_resource_fixed_mem32;
+       u32                                 read_write_attribute;
+       u32                                 range_base_address;
+       u32                                 range_length;
+};
 
-typedef struct
+struct acpi_memory_attribute
 {
-       u16                         cache_attribute;
-       u16                         read_write_attribute;
+       u16                                 cache_attribute;
+       u16                                 read_write_attribute;
+};
 
-} acpi_memory_attribute;
-
-typedef struct
+struct acpi_io_attribute
 {
-       u16                         range_attribute;
-       u16                         reserved;
-
-} acpi_io_attribute;
+       u16                                 range_attribute;
+       u16                                 reserved;
+};
 
-typedef struct
+struct acpi_bus_attribute
 {
-       u16                         reserved1;
-       u16                         reserved2;
+       u16                                 reserved1;
+       u16                                 reserved2;
+};
 
-} acpi_bus_attribute;
-
-typedef union
+union acpi_resource_attribute
 {
-       acpi_memory_attribute       memory;
-       acpi_io_attribute           io;
-       acpi_bus_attribute          bus;
-
-} acpi_resource_attribute;
+       struct acpi_memory_attribute        memory;
+       struct acpi_io_attribute            io;
+       struct acpi_bus_attribute           bus;
+};
 
-typedef struct
+struct acpi_resource_source
 {
-       u32                         index;
-       u32                         string_length;
-       char                        *string_ptr;
+       u32                                 index;
+       u32                                 string_length;
+       char                                *string_ptr;
+};
 
-} acpi_resource_source;
-
-typedef struct
+struct acpi_resource_address16
 {
-       u32                         resource_type;
-       u32                         producer_consumer;
-       u32                         decode;
-       u32                         min_address_fixed;
-       u32                         max_address_fixed;
-       acpi_resource_attribute     attribute;
-       u32                         granularity;
-       u32                         min_address_range;
-       u32                         max_address_range;
-       u32                         address_translation_offset;
-       u32                         address_length;
-       acpi_resource_source        resource_source;
-
-} acpi_resource_address16;
-
-typedef struct
+       u32                                 resource_type;
+       u32                                 producer_consumer;
+       u32                                 decode;
+       u32                                 min_address_fixed;
+       u32                                 max_address_fixed;
+       union acpi_resource_attribute       attribute;
+       u32                                 granularity;
+       u32                                 min_address_range;
+       u32                                 max_address_range;
+       u32                                 address_translation_offset;
+       u32                                 address_length;
+       struct acpi_resource_source         resource_source;
+};
+
+struct acpi_resource_address32
 {
-       u32                         resource_type;
-       u32                         producer_consumer;
-       u32                         decode;
-       u32                         min_address_fixed;
-       u32                         max_address_fixed;
-       acpi_resource_attribute     attribute;
-       u32                         granularity;
-       u32                         min_address_range;
-       u32                         max_address_range;
-       u32                         address_translation_offset;
-       u32                         address_length;
-       acpi_resource_source        resource_source;
-
-} acpi_resource_address32;
-
-typedef struct
+       u32                                 resource_type;
+       u32                                 producer_consumer;
+       u32                                 decode;
+       u32                                 min_address_fixed;
+       u32                                 max_address_fixed;
+       union acpi_resource_attribute       attribute;
+       u32                                 granularity;
+       u32                                 min_address_range;
+       u32                                 max_address_range;
+       u32                                 address_translation_offset;
+       u32                                 address_length;
+       struct acpi_resource_source         resource_source;
+};
+
+struct acpi_resource_address64
 {
-       u32                         resource_type;
-       u32                         producer_consumer;
-       u32                         decode;
-       u32                         min_address_fixed;
-       u32                         max_address_fixed;
-       acpi_resource_attribute     attribute;
-       u64                         granularity;
-       u64                         min_address_range;
-       u64                         max_address_range;
-       u64                         address_translation_offset;
-       u64                         address_length;
-       acpi_resource_source        resource_source;
-
-} acpi_resource_address64;
-
-typedef struct
+       u32                                 resource_type;
+       u32                                 producer_consumer;
+       u32                                 decode;
+       u32                                 min_address_fixed;
+       u32                                 max_address_fixed;
+       union acpi_resource_attribute       attribute;
+       u64                                 granularity;
+       u64                                 min_address_range;
+       u64                                 max_address_range;
+       u64                                 address_translation_offset;
+       u64                                 address_length;
+       struct acpi_resource_source         resource_source;
+};
+
+struct acpi_resource_ext_irq
 {
-       u32                         producer_consumer;
-       u32                         edge_level;
-       u32                         active_high_low;
-       u32                         shared_exclusive;
-       u32                         number_of_interrupts;
-       acpi_resource_source        resource_source;
-       u32                         interrupts[1];
-
-} acpi_resource_ext_irq;
+       u32                                 producer_consumer;
+       u32                                 edge_level;
+       u32                                 active_high_low;
+       u32                                 shared_exclusive;
+       u32                                 number_of_interrupts;
+       struct acpi_resource_source         resource_source;
+       u32                                 interrupts[1];
+};
 
 
 /* ACPI_RESOURCE_TYPEs */
@@ -1156,41 +1127,39 @@ typedef struct
 #define ACPI_RSTYPE_ADDRESS64           13
 #define ACPI_RSTYPE_EXT_IRQ             14
 
-typedef u32                             acpi_resource_type;
+typedef u32                                     acpi_resource_type;
 
-typedef union
+union acpi_resource_data
 {
-       acpi_resource_irq           irq;
-       acpi_resource_dma           dma;
-       acpi_resource_start_dpf     start_dpf;
-       acpi_resource_io            io;
-       acpi_resource_fixed_io      fixed_io;
-       acpi_resource_vendor        vendor_specific;
-       acpi_resource_end_tag       end_tag;
-       acpi_resource_mem24         memory24;
-       acpi_resource_mem32         memory32;
-       acpi_resource_fixed_mem32   fixed_memory32;
-       acpi_resource_address16     address16;
-       acpi_resource_address32     address32;
-       acpi_resource_address64     address64;
-       acpi_resource_ext_irq       extended_irq;
-
-} acpi_resource_data;
-
-typedef struct acpi_resource
+       struct acpi_resource_irq            irq;
+       struct acpi_resource_dma            dma;
+       struct acpi_resource_start_dpf      start_dpf;
+       struct acpi_resource_io             io;
+       struct acpi_resource_fixed_io       fixed_io;
+       struct acpi_resource_vendor         vendor_specific;
+       struct acpi_resource_end_tag        end_tag;
+       struct acpi_resource_mem24          memory24;
+       struct acpi_resource_mem32          memory32;
+       struct acpi_resource_fixed_mem32    fixed_memory32;
+       struct acpi_resource_address16      address16;
+       struct acpi_resource_address32      address32;
+       struct acpi_resource_address64      address64;
+       struct acpi_resource_ext_irq        extended_irq;
+};
+
+struct acpi_resource
 {
-       acpi_resource_type          id;
-       u32                         length;
-       acpi_resource_data          data;
-
-} acpi_resource;
+       acpi_resource_type                  id;
+       u32                                 length;
+       union acpi_resource_data            data;
+};
 
 #define ACPI_RESOURCE_LENGTH                12
 #define ACPI_RESOURCE_LENGTH_NO_DATA        8       /* Id + Length fields */
 
 #define ACPI_SIZEOF_RESOURCE(type)          (ACPI_RESOURCE_LENGTH_NO_DATA + sizeof (type))
 
-#define ACPI_NEXT_RESOURCE(res)             (acpi_resource *)((u8 *) res + res->length)
+#define ACPI_NEXT_RESOURCE(res)             (struct acpi_resource *)((u8 *) res + res->length)
 
 #ifdef _HW_ALIGNMENT_SUPPORT
 #define ACPI_ALIGN_RESOURCE_SIZE(length)    (length)
@@ -1203,15 +1172,14 @@ typedef struct acpi_resource
  */
 
 
-typedef struct acpi_pci_routing_table
+struct acpi_pci_routing_table
 {
-       u32                         length;
-       u32                         pin;
-       acpi_integer                address;        /* here for 64-bit alignment */
-       u32                         source_index;
-       char                        source[4];      /* pad to 64 bits so sizeof() works in all cases */
-
-} acpi_pci_routing_table;
+       u32                                 length;
+       u32                                 pin;
+       acpi_integer                        address;        /* here for 64-bit alignment */
+       u32                                 source_index;
+       char                                source[4];      /* pad to 64 bits so sizeof() works in all cases */
+};
 
 /*
  * END: of definitions for PCI Routing tables
index d63f158..8ef73e7 100644 (file)
@@ -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
 
 typedef
 acpi_status (*acpi_pkg_callback) (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context);
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context);
 
 
 acpi_status
 acpi_ut_walk_package_tree (
-       acpi_operand_object     *source_object,
-       void                    *target_object,
-       acpi_pkg_callback       walk_callback,
-       void                    *context);
+       union acpi_operand_object       *source_object,
+       void                            *target_object,
+       acpi_pkg_callback               walk_callback,
+       void                            *context);
 
 
-typedef struct acpi_pkg_info
+struct acpi_pkg_info
 {
-       u8                      *free_space;
-       acpi_size               length;
-       u32                     object_space;
-       u32                     num_packages;
-} acpi_pkg_info;
+       u8                              *free_space;
+       acpi_size                       length;
+       u32                             object_space;
+       u32                             num_packages;
+};
 
 #define REF_INCREMENT       (u16) 0
 #define REF_DECREMENT       (u16) 1
@@ -97,38 +97,38 @@ acpi_ut_validate_fadt (
 
 char *
 acpi_ut_get_mutex_name (
-       u32                     mutex_id);
+       u32                             mutex_id);
 
 #endif
 
 char *
 acpi_ut_get_type_name (
-       acpi_object_type        type);
+       acpi_object_type                type);
 
 char *
 acpi_ut_get_object_type_name (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 char *
 acpi_ut_get_region_name (
-       u8                      space_id);
+       u8                              space_id);
 
 char *
 acpi_ut_get_event_name (
-       u32                     event_id);
+       u32                             event_id);
 
 char
 acpi_ut_hex_to_ascii_char (
-       acpi_integer            integer,
-       u32                     position);
+       acpi_integer                    integer,
+       u32                             position);
 
 u8
 acpi_ut_valid_object_type (
-       acpi_object_type        type);
+       acpi_object_type                type);
 
 acpi_owner_id
 acpi_ut_allocate_owner_id (
-       u32                     id_type);
+       u32                             id_type);
 
 
 /*
@@ -139,71 +139,71 @@ acpi_ut_allocate_owner_id (
 
 acpi_size
 acpi_ut_strlen (
-       const char              *string);
+       const char                      *string);
 
 char *
 acpi_ut_strcpy (
-       char                    *dst_string,
-       const char              *src_string);
+       char                            *dst_string,
+       const char                      *src_string);
 
 char *
 acpi_ut_strncpy (
-       char                    *dst_string,
-       const char              *src_string,
-       acpi_size               count);
+       char                            *dst_string,
+       const char                      *src_string,
+       acpi_size                       count);
 
 int
 acpi_ut_strncmp (
-       const char              *string1,
-       const char              *string2,
-       acpi_size               count);
+       const char                      *string1,
+       const char                      *string2,
+       acpi_size                       count);
 
 int
 acpi_ut_strcmp (
-       const char              *string1,
-       const char              *string2);
+       const char                      *string1,
+       const char                      *string2);
 
 char *
 acpi_ut_strcat (
-       char                    *dst_string,
-       const char              *src_string);
+       char                            *dst_string,
+       const char                      *src_string);
 
 char *
 acpi_ut_strncat (
-       char                    *dst_string,
-       const char              *src_string,
-       acpi_size               count);
+       char                            *dst_string,
+       const char                      *src_string,
+       acpi_size                       count);
 
 u32
 acpi_ut_strtoul (
-       const char              *string,
-       char                    **terminator,
-       u32                     base);
+       const char                      *string,
+       char                            **terminator,
+       u32                             base);
 
 char *
 acpi_ut_strstr (
-       char                    *string1,
-       char                    *string2);
+       char                            *string1,
+       char                            *string2);
 
 void *
 acpi_ut_memcpy (
-       void                    *dest,
-       const void              *src,
-       acpi_size               count);
+       void                            *dest,
+       const void                      *src,
+       acpi_size                       count);
 
 void *
 acpi_ut_memset (
-       void                    *dest,
-       acpi_native_uint        value,
-       acpi_size               count);
+       void                            *dest,
+       acpi_native_uint                value,
+       acpi_size                       count);
 
 int
 acpi_ut_to_upper (
-       int                     c);
+       int                             c);
 
 int
 acpi_ut_to_lower (
-       int                     c);
+       int                             c);
 
 extern const u8 _acpi_ctype[];
 
@@ -235,67 +235,67 @@ extern const u8 _acpi_ctype[];
 
 acpi_status
 acpi_ut_build_simple_object(
-       acpi_operand_object     *obj,
-       acpi_object             *user_obj,
-       u8                      *data_space,
-       u32                     *buffer_space_used);
+       union acpi_operand_object       *obj,
+       union acpi_object               *user_obj,
+       u8                              *data_space,
+       u32                             *buffer_space_used);
 
 acpi_status
 acpi_ut_build_package_object (
-       acpi_operand_object     *obj,
-       u8                      *buffer,
-       u32                     *space_used);
+       union acpi_operand_object       *obj,
+       u8                              *buffer,
+       u32                             *space_used);
 
 acpi_status
 acpi_ut_copy_ielement_to_eelement (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context);
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context);
 
 acpi_status
 acpi_ut_copy_ielement_to_ielement (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context);
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context);
 
 acpi_status
 acpi_ut_copy_iobject_to_eobject (
-       acpi_operand_object     *obj,
-       acpi_buffer             *ret_buffer);
+       union acpi_operand_object       *obj,
+       struct acpi_buffer              *ret_buffer);
 
 acpi_status
 acpi_ut_copy_esimple_to_isimple(
-       acpi_object             *user_obj,
-       acpi_operand_object     **return_obj);
+       union acpi_object               *user_obj,
+       union acpi_operand_object       **return_obj);
 
 acpi_status
 acpi_ut_copy_eobject_to_iobject (
-       acpi_object             *obj,
-       acpi_operand_object     **internal_obj);
+       union acpi_object               *obj,
+       union acpi_operand_object       **internal_obj);
 
 acpi_status
 acpi_ut_copy_isimple_to_isimple (
-       acpi_operand_object     *source_obj,
-       acpi_operand_object     *dest_obj);
+       union acpi_operand_object       *source_obj,
+       union acpi_operand_object       *dest_obj);
 
 acpi_status
 acpi_ut_copy_ipackage_to_ipackage (
-       acpi_operand_object     *source_obj,
-       acpi_operand_object     *dest_obj,
-       acpi_walk_state         *walk_state);
+       union acpi_operand_object       *source_obj,
+       union acpi_operand_object       *dest_obj,
+       struct acpi_walk_state          *walk_state);
 
 acpi_status
 acpi_ut_copy_simple_object (
-       acpi_operand_object     *source_desc,
-       acpi_operand_object     *dest_desc);
+       union acpi_operand_object       *source_desc,
+       union acpi_operand_object       *dest_desc);
 
 acpi_status
 acpi_ut_copy_iobject_to_iobject (
-       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);
 
 
 /*
@@ -304,8 +304,8 @@ acpi_ut_copy_iobject_to_iobject (
 
 acpi_status
 acpi_ut_update_object_reference (
-       acpi_operand_object     *object,
-       u16                     action);
+       union acpi_operand_object       *object,
+       u16                             action);
 
 
 /*
@@ -322,89 +322,89 @@ acpi_ut_track_stack_ptr (
 
 void
 acpi_ut_trace (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info);
 
 void
 acpi_ut_trace_ptr (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       void                    *pointer);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       void                            *pointer);
 
 void
 acpi_ut_trace_u32 (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       u32                     integer);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       u32                             integer);
 
 void
 acpi_ut_trace_str (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       char                    *string);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       char                            *string);
 
 void
 acpi_ut_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info);
 
 void
 acpi_ut_status_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       acpi_status             status);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       acpi_status                     status);
 
 void
 acpi_ut_value_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       acpi_integer            value);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       acpi_integer                    value);
 
 void
 acpi_ut_ptr_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       u8                      *ptr);
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       u8                              *ptr);
 
 void
 acpi_ut_report_info (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id);
 
 void
 acpi_ut_report_error (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id);
 
 void
 acpi_ut_report_warning (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id);
 
 void
 acpi_ut_dump_buffer (
-       u8                      *buffer,
-       u32                     count,
-       u32                     display,
-       u32                     component_id);
+       u8                              *buffer,
+       u32                             count,
+       u32                             display,
+       u32                             component_id);
 
 void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print (
-       u32                     requested_debug_level,
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       char                    *format,
+       u32                             requested_debug_level,
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       char                            *format,
        ...) ACPI_PRINTF_LIKE_FUNC;
 
 void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print_raw (
-       u32                     requested_debug_level,
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       char                    *format,
+       u32                             requested_debug_level,
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       char                            *format,
        ...) ACPI_PRINTF_LIKE_FUNC;
 
 
@@ -414,19 +414,19 @@ acpi_ut_debug_print_raw (
 
 void
 acpi_ut_delete_internal_obj (
-       acpi_operand_object     *object);
+       union acpi_operand_object       *object);
 
 void
 acpi_ut_delete_internal_package_object (
-       acpi_operand_object     *object);
+       union acpi_operand_object       *object);
 
 void
 acpi_ut_delete_internal_simple_object (
-       acpi_operand_object     *object);
+       union acpi_operand_object       *object);
 
 void
 acpi_ut_delete_internal_object_list (
-       acpi_operand_object     **obj_list);
+       union acpi_operand_object       **obj_list);
 
 
 /*
@@ -448,36 +448,36 @@ acpi_ut_delete_internal_object_list (
 
 acpi_status
 acpi_ut_evaluate_object (
-       acpi_namespace_node     *prefix_node,
-       char                    *path,
-       u32                     expected_return_btypes,
-       acpi_operand_object     **return_desc);
+       struct acpi_namespace_node      *prefix_node,
+       char                            *path,
+       u32                             expected_return_btypes,
+       union acpi_operand_object       **return_desc);
 
 acpi_status
 acpi_ut_evaluate_numeric_object (
-       char                    *object_name,
-       acpi_namespace_node     *device_node,
-       acpi_integer            *address);
+       char                            *object_name,
+       struct acpi_namespace_node      *device_node,
+       acpi_integer                    *address);
 
 acpi_status
 acpi_ut_execute_HID (
-       acpi_namespace_node     *device_node,
-       acpi_device_id          *hid);
+       struct acpi_namespace_node      *device_node,
+       struct acpi_device_id           *hid);
 
 acpi_status
 acpi_ut_execute_CID (
-       acpi_namespace_node     *device_node,
-       acpi_device_id          *cid);
+       struct acpi_namespace_node      *device_node,
+       struct acpi_device_id           *cid);
 
 acpi_status
 acpi_ut_execute_STA (
-       acpi_namespace_node     *device_node,
-       u32                     *status_flags);
+       struct acpi_namespace_node      *device_node,
+       u32                             *status_flags);
 
 acpi_status
 acpi_ut_execute_UID (
-       acpi_namespace_node     *device_node,
-       acpi_device_id          *uid);
+       struct acpi_namespace_node      *device_node,
+       struct acpi_device_id           *uid);
 
 
 /*
@@ -494,52 +494,52 @@ acpi_ut_mutex_terminate (
 
 acpi_status
 acpi_ut_create_mutex (
-       acpi_mutex_handle       mutex_id);
+       acpi_mutex_handle               mutex_id);
 
 acpi_status
 acpi_ut_delete_mutex (
-       acpi_mutex_handle       mutex_id);
+       acpi_mutex_handle               mutex_id);
 
 acpi_status
 acpi_ut_acquire_mutex (
-       acpi_mutex_handle       mutex_id);
+       acpi_mutex_handle               mutex_id);
 
 acpi_status
 acpi_ut_release_mutex (
-       acpi_mutex_handle       mutex_id);
+       acpi_mutex_handle               mutex_id);
 
 
 /*
  * ut_object - internal object create/delete/cache routines
  */
 
-acpi_operand_object  *
+union acpi_operand_object    *
 acpi_ut_create_internal_object_dbg (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id,
-       acpi_object_type        type);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id,
+       acpi_object_type                type);
 
 void *
 acpi_ut_allocate_object_desc_dbg (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id);
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id);
 
 #define acpi_ut_create_internal_object(t) acpi_ut_create_internal_object_dbg (_THIS_MODULE,__LINE__,_COMPONENT,t)
 #define acpi_ut_allocate_object_desc()  acpi_ut_allocate_object_desc_dbg (_THIS_MODULE,__LINE__,_COMPONENT)
 
 void
 acpi_ut_delete_object_desc (
-       acpi_operand_object     *object);
+       union acpi_operand_object       *object);
 
 u8
 acpi_ut_valid_internal_object (
-       void                    *object);
+       void                            *object);
 
-acpi_operand_object *
+union acpi_operand_object *
 acpi_ut_create_buffer_object (
-       acpi_size               buffer_size);
+       acpi_size                       buffer_size);
 
 
 /*
@@ -548,11 +548,11 @@ acpi_ut_create_buffer_object (
 
 void
 acpi_ut_add_reference (
-       acpi_operand_object     *object);
+       union acpi_operand_object       *object);
 
 void
 acpi_ut_remove_reference (
-       acpi_operand_object     *object);
+       union acpi_operand_object       *object);
 
 /*
  * ut_size - Object size routines
@@ -560,25 +560,25 @@ acpi_ut_remove_reference (
 
 acpi_status
 acpi_ut_get_simple_object_size (
-       acpi_operand_object     *obj,
-       acpi_size               *obj_length);
+       union acpi_operand_object       *obj,
+       acpi_size                       *obj_length);
 
 acpi_status
 acpi_ut_get_package_object_size (
-       acpi_operand_object     *obj,
-       acpi_size               *obj_length);
+       union acpi_operand_object       *obj,
+       acpi_size                       *obj_length);
 
 acpi_status
 acpi_ut_get_object_size(
-       acpi_operand_object     *obj,
-       acpi_size               *obj_length);
+       union acpi_operand_object       *obj,
+       acpi_size                       *obj_length);
 
 acpi_status
 acpi_ut_get_element_length (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context);
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context);
 
 
 /*
@@ -587,53 +587,53 @@ acpi_ut_get_element_length (
 
 void
 acpi_ut_push_generic_state (
-       acpi_generic_state      **list_head,
-       acpi_generic_state      *state);
+       union acpi_generic_state        **list_head,
+       union acpi_generic_state        *state);
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_pop_generic_state (
-       acpi_generic_state      **list_head);
+       union acpi_generic_state        **list_head);
 
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_generic_state (
        void);
 
-acpi_thread_state *
+struct acpi_thread_state *
 acpi_ut_create_thread_state (
        void);
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_update_state (
-       acpi_operand_object     *object,
-       u16                     action);
+       union acpi_operand_object       *object,
+       u16                             action);
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_pkg_state (
-       void                    *internal_object,
-       void                    *external_object,
-       u16                     index);
+       void                            *internal_object,
+       void                            *external_object,
+       u16                             index);
 
 acpi_status
 acpi_ut_create_update_state_and_push (
-       acpi_operand_object     *object,
-       u16                     action,
-       acpi_generic_state      **state_list);
+       union acpi_operand_object       *object,
+       u16                             action,
+       union acpi_generic_state        **state_list);
 
 acpi_status
 acpi_ut_create_pkg_state_and_push (
-       void                    *internal_object,
-       void                    *external_object,
-       u16                     index,
-       acpi_generic_state      **state_list);
+       void                            *internal_object,
+       void                            *external_object,
+       u16                             index,
+       union acpi_generic_state        **state_list);
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_control_state (
        void);
 
 void
 acpi_ut_delete_generic_state (
-       acpi_generic_state      *state);
+       union acpi_generic_state        *state);
 
 void
 acpi_ut_delete_generic_state_cache (
@@ -649,64 +649,64 @@ acpi_ut_delete_object_cache (
 
 void
 acpi_ut_print_string (
-       char                    *string,
-       u8                      max_length);
+       char                            *string,
+       u8                              max_length);
 
 acpi_status
 acpi_ut_divide (
-       acpi_integer            *in_dividend,
-       acpi_integer            *in_divisor,
-       acpi_integer            *out_quotient,
-       acpi_integer            *out_remainder);
+       acpi_integer                    *in_dividend,
+       acpi_integer                    *in_divisor,
+       acpi_integer                    *out_quotient,
+       acpi_integer                    *out_remainder);
 
 acpi_status
 acpi_ut_short_divide (
-       acpi_integer            *in_dividend,
-       u32                     divisor,
-       acpi_integer            *out_quotient,
-       u32                     *out_remainder);
+       acpi_integer                    *in_dividend,
+       u32                             divisor,
+       acpi_integer                    *out_quotient,
+       u32                             *out_remainder);
 
 u8
 acpi_ut_valid_acpi_name (
-       u32                     name);
+       u32                             name);
 
 u8
 acpi_ut_valid_acpi_character (
-       char                    character);
+       char                            character);
 
 acpi_status
 acpi_ut_strtoul64 (
-       char                    *string,
-       u32                     base,
-       acpi_integer            *ret_integer);
+       char                            *string,
+       u32                             base,
+       acpi_integer                    *ret_integer);
 
 char *
 acpi_ut_strupr (
-       char                    *src_string);
+       char                            *src_string);
 
 u8 *
 acpi_ut_get_resource_end_tag (
-       acpi_operand_object     *obj_desc);
+       union acpi_operand_object       *obj_desc);
 
 u8
 acpi_ut_generate_checksum (
-       u8                      *buffer,
-       u32                     length);
+       u8                              *buffer,
+       u32                             length);
 
 u32
 acpi_ut_dword_byte_swap (
-       u32                     value);
+       u32                             value);
 
 void
 acpi_ut_set_integer_width (
-       u8                      revision);
+       u8                              revision);
 
 #ifdef ACPI_DEBUG_OUTPUT
 void
 acpi_ut_display_init_pathname (
-       u8                      type,
-       acpi_namespace_node     *obj_handle,
-       char                    *path);
+       u8                              type,
+       struct acpi_namespace_node      *obj_handle,
+       char                            *path);
 
 #endif
 
@@ -717,89 +717,89 @@ acpi_ut_display_init_pathname (
 
 void *
 acpi_ut_acquire_from_cache (
-       u32                     list_id);
+       u32                             list_id);
 
 void
 acpi_ut_release_to_cache (
-       u32                     list_id,
-       void                    *object);
+       u32                             list_id,
+       void                            *object);
 
 void
 acpi_ut_delete_generic_cache (
-       u32                     list_id);
+       u32                             list_id);
 
 acpi_status
 acpi_ut_validate_buffer (
-       acpi_buffer             *buffer);
+       struct acpi_buffer              *buffer);
 
 acpi_status
 acpi_ut_initialize_buffer (
-       acpi_buffer             *buffer,
-       acpi_size               required_length);
+       struct acpi_buffer              *buffer,
+       acpi_size                       required_length);
 
 
 /* Memory allocation functions */
 
 void *
 acpi_ut_allocate (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
 void *
 acpi_ut_callocate (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
 void *
 acpi_ut_allocate_and_track (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
 void *
 acpi_ut_callocate_and_track (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
 void
 acpi_ut_free_and_track (
-       void                    *address,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       void                            *address,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
-acpi_debug_mem_block *
+struct acpi_debug_mem_block *
 acpi_ut_find_allocation (
-       u32                     list_id,
-       void                    *allocation);
+       u32                             list_id,
+       void                            *allocation);
 
 acpi_status
 acpi_ut_track_allocation (
-       u32                     list_id,
-       acpi_debug_mem_block    *address,
-       acpi_size               size,
-       u8                      alloc_type,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       u32                             list_id,
+       struct acpi_debug_mem_block     *address,
+       acpi_size                       size,
+       u8                              alloc_type,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
 acpi_status
 acpi_ut_remove_allocation (
-       u32                     list_id,
-       acpi_debug_mem_block    *address,
-       u32                     component,
-       char                    *module,
-       u32                     line);
+       u32                             list_id,
+       struct acpi_debug_mem_block     *address,
+       u32                             component,
+       char                            *module,
+       u32                             line);
 
 void
 acpi_ut_dump_allocation_info (
@@ -807,8 +807,8 @@ acpi_ut_dump_allocation_info (
 
 void
 acpi_ut_dump_allocations (
-       u32                     component,
-       char                    *module);
+       u32                             component,
+       char                            *module);
 #endif
 
 
index 6af01b0..f11d733 100644 (file)
@@ -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
index 099d174..1fecca5 100644 (file)
@@ -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
 #define ASL_RDESC_END_TAG_SIZE                  0x01
 
 
-typedef struct asl_resource_node
+struct asl_resource_node
 {
-       u32                         buffer_length;
-       void                        *buffer;
-       struct asl_resource_node    *next;
-
-} asl_resource_node;
+       u32                                 buffer_length;
+       void                                *buffer;
+       struct asl_resource_node            *next;
+};
 
 
 /*
@@ -86,213 +85,194 @@ typedef struct asl_resource_node
  */
 #pragma pack(1)
 
-typedef struct asl_irq_format_desc
+struct asl_irq_format_desc
 {
-       u8                          descriptor_type;
-       u16                         irq_mask;
-       u8                          flags;
-
-} asl_irq_format_desc;
+       u8                                  descriptor_type;
+       u16                                 irq_mask;
+       u8                                  flags;
+};
 
 
-typedef struct asl_irq_noflags_desc
+struct asl_irq_noflags_desc
 {
-       u8                          descriptor_type;
-       u16                         irq_mask;
-
-} asl_irq_noflags_desc;
+       u8                                  descriptor_type;
+       u16                                 irq_mask;
+};
 
 
-typedef struct asl_dma_format_desc
+struct asl_dma_format_desc
 {
-       u8                          descriptor_type;
-       u8                          dma_channel_mask;
-       u8                          flags;
+       u8                                  descriptor_type;
+       u8                                  dma_channel_mask;
+       u8                                  flags;
+};
 
-} asl_dma_format_desc;
 
-
-typedef struct asl_start_dependent_desc
+struct asl_start_dependent_desc
 {
-       u8                          descriptor_type;
-       u8                          flags;
-
-} asl_start_dependent_desc;
+       u8                                  descriptor_type;
+       u8                                  flags;
+};
 
 
-typedef struct asl_start_dependent_noprio_desc
+struct asl_start_dependent_noprio_desc
 {
-       u8                          descriptor_type;
+       u8                                  descriptor_type;
+};
 
-} asl_start_dependent_noprio_desc;
 
-
-typedef struct asl_end_dependent_desc
+struct asl_end_dependent_desc
 {
-       u8                          descriptor_type;
-
-} asl_end_dependent_desc;
+       u8                                  descriptor_type;
+};
 
 
-typedef struct asl_io_port_desc
+struct asl_io_port_desc
 {
-       u8                          descriptor_type;
-       u8                          information;
-       u16                         address_min;
-       u16                         address_max;
-       u8                          alignment;
-       u8                          length;
+       u8                                  descriptor_type;
+       u8                                  information;
+       u16                                 address_min;
+       u16                                 address_max;
+       u8                                  alignment;
+       u8                                  length;
+};
 
-} asl_io_port_desc;
 
-
-typedef struct asl_fixed_io_port_desc
+struct asl_fixed_io_port_desc
 {
-       u8                          descriptor_type;
-       u16                         base_address;
-       u8                          length;
-
-} asl_fixed_io_port_desc;
+       u8                                  descriptor_type;
+       u16                                 base_address;
+       u8                                  length;
+};
 
 
-typedef struct asl_small_vendor_desc
+struct asl_small_vendor_desc
 {
-       u8                          descriptor_type;
-       u8                          vendor_defined[7];
+       u8                                  descriptor_type;
+       u8                                  vendor_defined[7];
+};
 
-} asl_small_vendor_desc;
 
-
-typedef struct asl_end_tag_desc
+struct asl_end_tag_desc
 {
-       u8                          descriptor_type;
-       u8                          checksum;
-
-} asl_end_tag_desc;
+       u8                                  descriptor_type;
+       u8                                  checksum;
+};
 
 
 /* LARGE descriptors */
 
-typedef struct asl_memory_24_desc
+struct asl_memory_24_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          information;
-       u16                         address_min;
-       u16                         address_max;
-       u16                         alignment;
-       u16                         range_length;
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  information;
+       u16                                 address_min;
+       u16                                 address_max;
+       u16                                 alignment;
+       u16                                 range_length;
+};
 
-} asl_memory_24_desc;
 
-
-typedef struct asl_large_vendor_desc
+struct asl_large_vendor_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          vendor_defined[1];
-
-} asl_large_vendor_desc;
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  vendor_defined[1];
+};
 
 
-typedef struct asl_memory_32_desc
+struct asl_memory_32_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          information;
-       u32                         address_min;
-       u32                         address_max;
-       u32                         alignment;
-       u32                         range_length;
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  information;
+       u32                                 address_min;
+       u32                                 address_max;
+       u32                                 alignment;
+       u32                                 range_length;
+};
 
-} asl_memory_32_desc;
 
-
-typedef struct asl_fixed_memory_32_desc
+struct asl_fixed_memory_32_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          information;
-       u32                         base_address;
-       u32                         range_length;
-
-} asl_fixed_memory_32_desc;
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  information;
+       u32                                 base_address;
+       u32                                 range_length;
+};
 
 
-typedef struct asl_qword_address_desc
+struct asl_qword_address_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          resource_type;
-       u8                          flags;
-       u8                          specific_flags;
-       u64                         granularity;
-       u64                         address_min;
-       u64                         address_max;
-       u64                         translation_offset;
-       u64                         address_length;
-       u8                          optional_fields[2];
-
-} asl_qword_address_desc;
-
-
-typedef struct asl_dword_address_desc
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  resource_type;
+       u8                                  flags;
+       u8                                  specific_flags;
+       u64                                 granularity;
+       u64                                 address_min;
+       u64                                 address_max;
+       u64                                 translation_offset;
+       u64                                 address_length;
+       u8                                  optional_fields[2];
+};
+
+
+struct asl_dword_address_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          resource_type;
-       u8                          flags;
-       u8                          specific_flags;
-       u32                         granularity;
-       u32                         address_min;
-       u32                         address_max;
-       u32                         translation_offset;
-       u32                         address_length;
-       u8                          optional_fields[2];
-
-} asl_dword_address_desc;
-
-
-typedef struct asl_word_address_desc
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  resource_type;
+       u8                                  flags;
+       u8                                  specific_flags;
+       u32                                 granularity;
+       u32                                 address_min;
+       u32                                 address_max;
+       u32                                 translation_offset;
+       u32                                 address_length;
+       u8                                  optional_fields[2];
+};
+
+
+struct asl_word_address_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          resource_type;
-       u8                          flags;
-       u8                          specific_flags;
-       u16                         granularity;
-       u16                         address_min;
-       u16                         address_max;
-       u16                         translation_offset;
-       u16                         address_length;
-       u8                          optional_fields[2];
-
-} asl_word_address_desc;
-
-
-typedef struct asl_extended_xrupt_desc
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  resource_type;
+       u8                                  flags;
+       u8                                  specific_flags;
+       u16                                 granularity;
+       u16                                 address_min;
+       u16                                 address_max;
+       u16                                 translation_offset;
+       u16                                 address_length;
+       u8                                  optional_fields[2];
+};
+
+
+struct asl_extended_xrupt_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          flags;
-       u8                          table_length;
-       u32                         interrupt_number[1];
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  flags;
+       u8                                  table_length;
+       u32                                 interrupt_number[1];
        /* res_source_index, res_source optional fields follow */
+};
 
-} asl_extended_xrupt_desc;
 
-
-typedef struct asl_general_register_desc
+struct asl_general_register_desc
 {
-       u8                          descriptor_type;
-       u16                         length;
-       u8                          address_space_id;
-       u8                          bit_width;
-       u8                          bit_offset;
-       u8                          reserved;
-       u64                         address;
-
-} asl_general_register_desc;
+       u8                                  descriptor_type;
+       u16                                 length;
+       u8                                  address_space_id;
+       u8                                  bit_width;
+       u8                                  bit_offset;
+       u8                                  reserved;
+       u64                                 address;
+};
 
 /* restore default alignment */
 
@@ -300,31 +280,30 @@ typedef struct asl_general_register_desc
 
 /* Union of all resource descriptors, sow we can allocate the worst case */
 
-typedef union asl_resource_desc
+union asl_resource_desc
 {
-       asl_irq_format_desc         irq;
-       asl_dma_format_desc         dma;
-       asl_start_dependent_desc    std;
-       asl_end_dependent_desc      end;
-       asl_io_port_desc            iop;
-       asl_fixed_io_port_desc      fio;
-       asl_small_vendor_desc       smv;
-       asl_end_tag_desc            et;
-
-       asl_memory_24_desc          M24;
-       asl_large_vendor_desc       lgv;
-       asl_memory_32_desc          M32;
-       asl_fixed_memory_32_desc    F32;
-       asl_qword_address_desc      qas;
-       asl_dword_address_desc      das;
-       asl_word_address_desc       was;
-       asl_extended_xrupt_desc     exx;
-       asl_general_register_desc   grg;
-       u32                         u32_item;
-       u16                         u16_item;
-       u8                          U8item;
-
-} asl_resource_desc;
+       struct asl_irq_format_desc          irq;
+       struct asl_dma_format_desc          dma;
+       struct asl_start_dependent_desc     std;
+       struct asl_end_dependent_desc       end;
+       struct asl_io_port_desc             iop;
+       struct asl_fixed_io_port_desc       fio;
+       struct asl_small_vendor_desc        smv;
+       struct asl_end_tag_desc             et;
+
+       struct asl_memory_24_desc           M24;
+       struct asl_large_vendor_desc        lgv;
+       struct asl_memory_32_desc           M32;
+       struct asl_fixed_memory_32_desc     F32;
+       struct asl_qword_address_desc       qas;
+       struct asl_dword_address_desc       das;
+       struct asl_word_address_desc        was;
+       struct asl_extended_xrupt_desc      exx;
+       struct asl_general_register_desc    grg;
+       u32                                 u32_item;
+       u16                                 u16_item;
+       u8                                  U8item;
+};
 
 
 #endif
index 82b278b..f62fc26 100644 (file)
@@ -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
index 5be853f..5c04f01 100644 (file)
@@ -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
index b1e8e5f..ae866fa 100644 (file)
@@ -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
index 5a323c6..2027f40 100644 (file)
@@ -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
 acpi_status
 acpi_ns_root_initialize (void)
 {
-       acpi_status                 status;
-       const acpi_predefined_names *init_val = NULL;
-       acpi_namespace_node         *new_node;
-       acpi_operand_object         *obj_desc;
+       acpi_status                         status;
+       const struct acpi_predefined_names *init_val = NULL;
+       struct acpi_namespace_node          *new_node;
+       union acpi_operand_object           *obj_desc;
 
 
        ACPI_FUNCTION_TRACE ("ns_root_initialize");
@@ -232,26 +232,26 @@ unlock_and_exit:
 
 acpi_status
 acpi_ns_lookup (
-       acpi_generic_state      *scope_info,
-       char                    *pathname,
-       acpi_object_type        type,
-       acpi_interpreter_mode   interpreter_mode,
-       u32                     flags,
-       acpi_walk_state         *walk_state,
-       acpi_namespace_node     **return_node)
+       union acpi_generic_state        *scope_info,
+       char                            *pathname,
+       acpi_object_type                type,
+       acpi_interpreter_mode           interpreter_mode,
+       u32                             flags,
+       struct acpi_walk_state          *walk_state,
+       struct acpi_namespace_node      **return_node)
 {
-       acpi_status             status;
-       char                    *path = pathname;
-       acpi_namespace_node     *prefix_node;
-       acpi_namespace_node     *current_node = NULL;
-       acpi_namespace_node     *this_node = NULL;
-       u32                     num_segments;
-       u32                     num_carats;
-       acpi_name               simple_name;
-       acpi_object_type        type_to_check_for;
-       acpi_object_type        this_search_type;
-       u32                     search_parent_flag = ACPI_NS_SEARCH_PARENT;
-       u32                     local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
+       acpi_status                     status;
+       char                            *path = pathname;
+       struct acpi_namespace_node      *prefix_node;
+       struct acpi_namespace_node      *current_node = NULL;
+       struct acpi_namespace_node      *this_node = NULL;
+       u32                             num_segments;
+       u32                             num_carats;
+       acpi_name                       simple_name;
+       acpi_object_type                type_to_check_for;
+       acpi_object_type                this_search_type;
+       u32                             search_parent_flag = ACPI_NS_SEARCH_PARENT;
+       u32                             local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
                           ACPI_NS_SEARCH_PARENT);
 
 
index 7d5894b..5801666 100644 (file)
@@ -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
  *
  ******************************************************************************/
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_create_node (
-       u32                     name)
+       u32                             name)
 {
-       acpi_namespace_node     *node;
+       struct acpi_namespace_node      *node;
 
 
        ACPI_FUNCTION_TRACE ("ns_create_node");
 
 
-       node = ACPI_MEM_CALLOCATE (sizeof (acpi_namespace_node));
+       node = ACPI_MEM_CALLOCATE (sizeof (struct acpi_namespace_node));
        if (!node) {
                return_PTR (NULL);
        }
@@ -82,11 +82,11 @@ acpi_ns_create_node (
 
 void
 acpi_ns_delete_node (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
-       acpi_namespace_node     *parent_node;
-       acpi_namespace_node     *prev_node;
-       acpi_namespace_node     *next_node;
+       struct acpi_namespace_node      *parent_node;
+       struct acpi_namespace_node      *prev_node;
+       struct acpi_namespace_node      *next_node;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ns_delete_node", node);
@@ -141,13 +141,13 @@ acpi_ns_delete_node (
 
 int
 acpi_ns_compare_names (
-       char                    *name1,
-       char                    *name2)
+       char                            *name1,
+       char                            *name2)
 {
-       char                    reversed_name1[ACPI_NAME_SIZE];
-       char                    reversed_name2[ACPI_NAME_SIZE];
-       u32                     i;
-       u32                     j;
+       char                            reversed_name1[ACPI_NAME_SIZE];
+       char                            reversed_name2[ACPI_NAME_SIZE];
+       u32                             i;
+       u32                             j;
 
 
        /*
@@ -198,16 +198,16 @@ acpi_ns_compare_names (
 
 void
 acpi_ns_install_node (
-       acpi_walk_state         *walk_state,
-       acpi_namespace_node     *parent_node,   /* Parent */
-       acpi_namespace_node     *node,          /* New Child*/
-       acpi_object_type        type)
+       struct acpi_walk_state          *walk_state,
+       struct acpi_namespace_node      *parent_node,   /* Parent */
+       struct acpi_namespace_node      *node,          /* New Child*/
+       acpi_object_type                type)
 {
-       u16                     owner_id = TABLE_ID_DSDT;
-       acpi_namespace_node     *child_node;
+       u16                             owner_id = TABLE_ID_DSDT;
+       struct acpi_namespace_node      *child_node;
 #ifdef ACPI_ALPHABETIC_NAMESPACE
 
-       acpi_namespace_node     *previous_child_node;
+       struct acpi_namespace_node      *previous_child_node;
 #endif
 
 
@@ -332,11 +332,11 @@ acpi_ns_install_node (
 
 void
 acpi_ns_delete_children (
-       acpi_namespace_node     *parent_node)
+       struct acpi_namespace_node      *parent_node)
 {
-       acpi_namespace_node     *child_node;
-       acpi_namespace_node     *next_node;
-       u8                      flags;
+       struct acpi_namespace_node      *child_node;
+       struct acpi_namespace_node      *next_node;
+       u8                              flags;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ns_delete_children", parent_node);
@@ -412,10 +412,10 @@ acpi_ns_delete_children (
 
 void
 acpi_ns_delete_namespace_subtree (
-       acpi_namespace_node     *parent_node)
+       struct acpi_namespace_node      *parent_node)
 {
-       acpi_namespace_node     *child_node = NULL;
-       u32                     level = 1;
+       struct acpi_namespace_node      *child_node = NULL;
+       u32                             level = 1;
 
 
        ACPI_FUNCTION_TRACE ("ns_delete_namespace_subtree");
@@ -495,10 +495,10 @@ acpi_ns_delete_namespace_subtree (
 
 static void
 acpi_ns_remove_reference (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
-       acpi_namespace_node     *parent_node;
-       acpi_namespace_node     *this_node;
+       struct acpi_namespace_node      *parent_node;
+       struct acpi_namespace_node      *this_node;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -548,12 +548,12 @@ acpi_ns_remove_reference (
 
 void
 acpi_ns_delete_namespace_by_owner (
-       u16                     owner_id)
+       u16                             owner_id)
 {
-       acpi_namespace_node     *child_node;
-       acpi_namespace_node     *deletion_node;
-       u32                     level;
-       acpi_namespace_node     *parent_node;
+       struct acpi_namespace_node      *child_node;
+       struct acpi_namespace_node      *deletion_node;
+       u32                             level;
+       struct acpi_namespace_node      *parent_node;
 
 
        ACPI_FUNCTION_TRACE_U32 ("ns_delete_namespace_by_owner", owner_id);
index 6d8c32e..ee33916 100644 (file)
@@ -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,8 +47,8 @@
 
 void
 acpi_ns_print_pathname (
-       u32                     num_segments,
-       char                    *pathname)
+       u32                             num_segments,
+       char                            *pathname)
 {
        ACPI_FUNCTION_NAME ("ns_print_pathname");
 
@@ -91,10 +91,10 @@ acpi_ns_print_pathname (
 
 void
 acpi_ns_dump_pathname (
-       acpi_handle             handle,
-       char                    *msg,
-       u32                     level,
-       u32                     component)
+       acpi_handle                     handle,
+       char                            *msg,
+       u32                             level,
+       u32                             component)
 {
 
        ACPI_FUNCTION_TRACE ("ns_dump_pathname");
@@ -129,19 +129,19 @@ acpi_ns_dump_pathname (
 
 acpi_status
 acpi_ns_dump_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_walk_info          *info = (acpi_walk_info *) context;
-       acpi_namespace_node     *this_node;
-       acpi_operand_object     *obj_desc = NULL;
-       acpi_object_type        obj_type;
-       acpi_object_type        type;
-       u32                     bytes_to_dump;
-       u32                     dbg_level;
-       u32                     i;
+       struct acpi_walk_info           *info = (struct acpi_walk_info *) context;
+       struct acpi_namespace_node      *this_node;
+       union acpi_operand_object       *obj_desc = NULL;
+       acpi_object_type                obj_type;
+       acpi_object_type                type;
+       u32                             bytes_to_dump;
+       u32                             dbg_level;
+       u32                             i;
 
 
        ACPI_FUNCTION_NAME ("ns_dump_one_object");
@@ -335,7 +335,7 @@ acpi_ns_dump_one_object (
 
                case ACPI_TYPE_LOCAL_ALIAS:
 
-                       acpi_os_printf ("Target %4.4s (%p)\n", ((acpi_namespace_node *) obj_desc)->name.ascii, obj_desc);
+                       acpi_os_printf ("Target %4.4s (%p)\n", ((struct acpi_namespace_node *) obj_desc)->name.ascii, obj_desc);
                        break;
 
                default:
@@ -444,7 +444,7 @@ acpi_ns_dump_one_object (
                case ACPI_DESC_TYPE_NAMED:
 
                        acpi_os_printf ("(Ptr to Node)\n");
-                       bytes_to_dump = sizeof (acpi_namespace_node);
+                       bytes_to_dump = sizeof (struct acpi_namespace_node);
                        break;
 
 
@@ -459,7 +459,7 @@ acpi_ns_dump_one_object (
                        else {
                                acpi_os_printf ("(Ptr to ACPI Object type %s, %X)\n",
                                                   acpi_ut_get_type_name (obj_type), obj_type);
-                               bytes_to_dump = sizeof (acpi_operand_object);
+                               bytes_to_dump = sizeof (union acpi_operand_object);
                        }
                        break;
 
@@ -492,7 +492,7 @@ acpi_ns_dump_one_object (
                        break;
 
                case ACPI_TYPE_BUFFER_FIELD:
-                       obj_desc = (acpi_operand_object *) obj_desc->buffer_field.buffer_obj;
+                       obj_desc = (union acpi_operand_object *) obj_desc->buffer_field.buffer_obj;
                        break;
 
                case ACPI_TYPE_PACKAGE:
@@ -546,13 +546,13 @@ cleanup:
 
 void
 acpi_ns_dump_objects (
-       acpi_object_type        type,
-       u8                      display_type,
-       u32                     max_depth,
-       u32                     owner_id,
-       acpi_handle             start_handle)
+       acpi_object_type                type,
+       u8                              display_type,
+       u32                             max_depth,
+       u32                             owner_id,
+       acpi_handle                     start_handle)
 {
-       acpi_walk_info          info;
+       struct acpi_walk_info           info;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -584,10 +584,10 @@ acpi_ns_dump_objects (
 
 void
 acpi_ns_dump_tables (
-       acpi_handle             search_base,
-       u32                     max_depth)
+       acpi_handle                     search_base,
+       u32                             max_depth)
 {
-       acpi_handle             search_handle = search_base;
+       acpi_handle                     search_handle = search_base;
 
 
        ACPI_FUNCTION_TRACE ("ns_dump_tables");
@@ -629,10 +629,10 @@ acpi_ns_dump_tables (
 
 void
 acpi_ns_dump_entry (
-       acpi_handle             handle,
-       u32                     debug_level)
+       acpi_handle                     handle,
+       u32                             debug_level)
 {
-       acpi_walk_info          info;
+       struct acpi_walk_info           info;
 
 
        ACPI_FUNCTION_ENTRY ();
index 3485b4b..72bc535 100644 (file)
@@ -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
 
 acpi_status
 acpi_ns_dump_one_device (
-       acpi_handle             obj_handle,
-       u32                     level,
-       void                    *context,
-       void                    **return_value)
+       acpi_handle                     obj_handle,
+       u32                             level,
+       void                            *context,
+       void                            **return_value)
 {
-       acpi_device_info        info;
-       acpi_status             status;
-       u32                     i;
+       struct acpi_device_info         info;
+       acpi_status                     status;
+       u32                             i;
 
 
        ACPI_FUNCTION_NAME ("ns_dump_one_device");
@@ -92,8 +92,8 @@ acpi_ns_dump_one_device (
 void
 acpi_ns_dump_root_devices (void)
 {
-       acpi_handle             sys_bus_handle;
-       acpi_status             status;
+       acpi_handle                     sys_bus_handle;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_NAME ("ns_dump_root_devices");
index 37bcded..bff8b6a 100644 (file)
@@ -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
 
 acpi_status
 acpi_ns_evaluate_relative (
-       acpi_namespace_node     *handle,
-       char                    *pathname,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_object)
+       struct acpi_namespace_node      *handle,
+       char                            *pathname,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_object)
 {
-       acpi_namespace_node     *prefix_node;
-       acpi_status             status;
-       acpi_namespace_node     *node = NULL;
-       char                    *internal_path = NULL;
-       acpi_generic_state      scope_info;
+       struct acpi_namespace_node      *prefix_node;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node = NULL;
+       char                            *internal_path = NULL;
+       union acpi_generic_state        scope_info;
 
 
        ACPI_FUNCTION_TRACE ("ns_evaluate_relative");
@@ -157,13 +157,13 @@ cleanup:
 
 acpi_status
 acpi_ns_evaluate_by_name (
-       char                    *pathname,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_object)
+       char                            *pathname,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_object)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node = NULL;
-       char                    *internal_path = NULL;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node = NULL;
+       char                            *internal_path = NULL;
 
 
        ACPI_FUNCTION_TRACE ("ns_evaluate_by_name");
@@ -241,13 +241,13 @@ cleanup:
 
 acpi_status
 acpi_ns_evaluate_by_handle (
-       acpi_namespace_node     *handle,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_object)
+       struct acpi_namespace_node      *handle,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_object)
 {
-       acpi_namespace_node     *node;
-       acpi_status             status;
-       acpi_operand_object     *local_return_object;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
+       union acpi_operand_object       *local_return_object;
 
 
        ACPI_FUNCTION_TRACE ("ns_evaluate_by_handle");
@@ -361,12 +361,12 @@ acpi_ns_evaluate_by_handle (
 
 acpi_status
 acpi_ns_execute_control_method (
-       acpi_namespace_node     *method_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_obj_desc)
+       struct acpi_namespace_node      *method_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_obj_desc)
 {
-       acpi_status             status;
-       acpi_operand_object     *obj_desc;
+       acpi_status                     status;
+       union acpi_operand_object       *obj_desc;
 
 
        ACPI_FUNCTION_TRACE ("ns_execute_control_method");
@@ -433,11 +433,11 @@ acpi_ns_execute_control_method (
 
 acpi_status
 acpi_ns_get_object_value (
-       acpi_namespace_node     *node,
-       acpi_operand_object     **return_obj_desc)
+       struct acpi_namespace_node      *node,
+       union acpi_operand_object       **return_obj_desc)
 {
-       acpi_status             status = AE_OK;
-       acpi_namespace_node     *resolved_node = node;
+       acpi_status                     status = AE_OK;
+       struct acpi_namespace_node      *resolved_node = node;
 
 
        ACPI_FUNCTION_TRACE ("ns_get_object_value");
@@ -483,7 +483,7 @@ acpi_ns_get_object_value (
 
                if (ACPI_SUCCESS (status)) {
                        status = AE_CTRL_RETURN_VALUE;
-                       *return_obj_desc = ACPI_CAST_PTR (acpi_operand_object, resolved_node);
+                       *return_obj_desc = ACPI_CAST_PTR (union acpi_operand_object, resolved_node);
                        ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Returning object %p [%s]\n",
                                *return_obj_desc, acpi_ut_get_object_type_name (*return_obj_desc)));
                }
index 45b2e3f..ec55437 100644 (file)
@@ -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,8 +49,8 @@ acpi_status
 acpi_ns_initialize_objects (
        void)
 {
-       acpi_status             status;
-       acpi_init_walk_info     info;
+       acpi_status                     status;
+       struct acpi_init_walk_info      info;
 
 
        ACPI_FUNCTION_TRACE ("ns_initialize_objects");
@@ -62,7 +62,7 @@ acpi_ns_initialize_objects (
 
        /* Set all init info to zero */
 
-       ACPI_MEMSET (&info, 0, sizeof (acpi_init_walk_info));
+       ACPI_MEMSET (&info, 0, sizeof (struct acpi_init_walk_info));
 
        /* Walk entire namespace from the supplied root */
 
@@ -110,8 +110,8 @@ acpi_status
 acpi_ns_initialize_devices (
        void)
 {
-       acpi_status             status;
-       acpi_device_walk_info   info;
+       acpi_status                     status;
+       struct acpi_device_walk_info    info;
 
 
        ACPI_FUNCTION_TRACE ("ns_initialize_devices");
@@ -165,16 +165,16 @@ acpi_ns_initialize_devices (
 
 acpi_status
 acpi_ns_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_namespace_node     *node = (acpi_namespace_node *) obj_handle;
-       acpi_operand_object     *obj_desc;
+       acpi_object_type                type;
+       acpi_status                     status;
+       struct acpi_init_walk_info      *info = (struct acpi_init_walk_info *) context;
+       struct acpi_namespace_node      *node = (struct acpi_namespace_node *) obj_handle;
+       union acpi_operand_object       *obj_desc;
 
 
        ACPI_FUNCTION_NAME ("ns_init_one_object");
@@ -305,15 +305,15 @@ acpi_ns_init_one_object (
 
 acpi_status
 acpi_ns_init_one_device (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value)
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value)
 {
-       acpi_status             status;
-       acpi_namespace_node    *node;
-       u32                     flags;
-       acpi_device_walk_info  *info = (acpi_device_walk_info *) context;
+       acpi_status                     status;
+       struct acpi_namespace_node     *node;
+       u32                             flags;
+       struct acpi_device_walk_info   *info = (struct acpi_device_walk_info *) context;
 
 
        ACPI_FUNCTION_TRACE ("ns_init_one_device");
@@ -372,7 +372,7 @@ acpi_ns_init_one_device (
                        /* Ignore error and move on to next device */
 
        #ifdef ACPI_DEBUG_OUTPUT
-                       char        *scope_name = acpi_ns_get_external_pathname (obj_handle);
+                       char                *scope_name = acpi_ns_get_external_pathname (obj_handle);
 
                        ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "%s._INI failed: %s\n",
                                        scope_name, acpi_format_exception (status)));
index 885e67a..8a9f665 100644 (file)
@@ -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
 
 acpi_status
 acpi_ns_load_table (
-       acpi_table_desc         *table_desc,
-       acpi_namespace_node     *node)
+       struct acpi_table_desc          *table_desc,
+       struct acpi_namespace_node      *node)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ns_load_table");
@@ -137,11 +137,11 @@ acpi_ns_load_table (
 
 acpi_status
 acpi_ns_load_table_by_type (
-       acpi_table_type         table_type)
+       acpi_table_type                 table_type)
 {
-       u32                     i;
-       acpi_status             status;
-       acpi_table_desc         *table_desc;
+       u32                             i;
+       acpi_status                     status;
+       struct acpi_table_desc          *table_desc;
 
 
        ACPI_FUNCTION_TRACE ("ns_load_table_by_type");
@@ -266,7 +266,7 @@ acpi_status
 acpi_ns_load_namespace (
        void)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_load_name_space");
@@ -319,14 +319,14 @@ acpi_ns_load_namespace (
 
 acpi_status
 acpi_ns_delete_subtree (
-       acpi_handle             start_handle)
+       acpi_handle                     start_handle)
 {
-       acpi_status             status;
-       acpi_handle             child_handle;
-       acpi_handle             parent_handle;
-       acpi_handle             next_child_handle;
-       acpi_handle             dummy;
-       u32                     level;
+       acpi_status                     status;
+       acpi_handle                     child_handle;
+       acpi_handle                     parent_handle;
+       acpi_handle                     next_child_handle;
+       acpi_handle                     dummy;
+       u32                             level;
 
 
        ACPI_FUNCTION_TRACE ("ns_delete_subtree");
@@ -407,9 +407,9 @@ acpi_ns_delete_subtree (
 
 acpi_status
 acpi_ns_unload_namespace (
-       acpi_handle             handle)
+       acpi_handle                     handle)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ns_unload_name_space");
index 3944d3b..0b6f7c0 100644 (file)
@@ -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
 
 void
 acpi_ns_build_external_path (
-       acpi_namespace_node     *node,
-       acpi_size               size,
-       char                    *name_buffer)
+       struct acpi_namespace_node      *node,
+       acpi_size                       size,
+       char                            *name_buffer)
 {
-       acpi_size               index;
-       acpi_namespace_node     *parent_node;
+       acpi_size                       index;
+       struct acpi_namespace_node      *parent_node;
 
 
        ACPI_FUNCTION_NAME ("ns_build_external_path");
@@ -119,10 +119,10 @@ acpi_ns_build_external_path (
 
 char *
 acpi_ns_get_external_pathname (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
-       char                    *name_buffer;
-       acpi_size               size;
+       char                            *name_buffer;
+       acpi_size                       size;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ns_get_external_pathname", node);
@@ -162,10 +162,10 @@ acpi_ns_get_external_pathname (
 
 acpi_size
 acpi_ns_get_pathname_length (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
-       acpi_size               size;
-       acpi_namespace_node     *next_node;
+       acpi_size                       size;
+       struct acpi_namespace_node      *next_node;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -203,12 +203,12 @@ acpi_ns_get_pathname_length (
 
 acpi_status
 acpi_ns_handle_to_pathname (
-       acpi_handle             target_handle,
-       acpi_buffer             *buffer)
+       acpi_handle                     target_handle,
+       struct acpi_buffer              *buffer)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node;
-       acpi_size               required_size;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node;
+       acpi_size                       required_size;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ns_handle_to_pathname", target_handle);
index 5912121..4b67c8a 100644 (file)
@@ -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
 
 acpi_status
 acpi_ns_attach_object (
-       acpi_namespace_node     *node,
-       acpi_operand_object     *object,
-       acpi_object_type        type)
+       struct acpi_namespace_node      *node,
+       union acpi_operand_object       *object,
+       acpi_object_type                type)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_operand_object     *last_obj_desc;
-       acpi_object_type        object_type = ACPI_TYPE_ANY;
+       union acpi_operand_object       *obj_desc;
+       union acpi_operand_object       *last_obj_desc;
+       acpi_object_type                object_type = ACPI_TYPE_ANY;
 
 
        ACPI_FUNCTION_TRACE ("ns_attach_object");
@@ -110,13 +110,13 @@ acpi_ns_attach_object (
         * we will use that (attached) object
         */
        else if ((ACPI_GET_DESCRIPTOR_TYPE (object) == ACPI_DESC_TYPE_NAMED) &&
-                       ((acpi_namespace_node *) object)->object) {
+                       ((struct acpi_namespace_node *) object)->object) {
                /*
                 * Value passed is a name handle and that name has a
                 * non-null value.  Use that name's value and type.
                 */
-               obj_desc   = ((acpi_namespace_node *) object)->object;
-               object_type = ((acpi_namespace_node *) object)->type;
+               obj_desc   = ((struct acpi_namespace_node *) object)->object;
+               object_type = ((struct acpi_namespace_node *) object)->type;
        }
 
        /*
@@ -124,7 +124,7 @@ acpi_ns_attach_object (
         * it first
         */
        else {
-               obj_desc = (acpi_operand_object *) object;
+               obj_desc = (union acpi_operand_object   *) object;
 
                /* Use the given type */
 
@@ -184,9 +184,9 @@ acpi_ns_attach_object (
 
 void
 acpi_ns_detach_object (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
-       acpi_operand_object     *obj_desc;
+       union acpi_operand_object       *obj_desc;
 
 
        ACPI_FUNCTION_TRACE ("ns_detach_object");
@@ -237,9 +237,9 @@ acpi_ns_detach_object (
  *
  ******************************************************************************/
 
-acpi_operand_object *
+union acpi_operand_object *
 acpi_ns_get_attached_object (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
        ACPI_FUNCTION_TRACE_PTR ("ns_get_attached_object", node);
 
@@ -273,9 +273,9 @@ acpi_ns_get_attached_object (
  *
  ******************************************************************************/
 
-acpi_operand_object *
+union acpi_operand_object *
 acpi_ns_get_secondary_object (
-       acpi_operand_object     *obj_desc)
+       union acpi_operand_object       *obj_desc)
 {
        ACPI_FUNCTION_TRACE_PTR ("ns_get_secondary_object", obj_desc);
 
@@ -307,13 +307,13 @@ acpi_ns_get_secondary_object (
 
 acpi_status
 acpi_ns_attach_data (
-       acpi_namespace_node     *node,
-       acpi_object_handler     handler,
-       void                    *data)
+       struct acpi_namespace_node      *node,
+       acpi_object_handler             handler,
+       void                            *data)
 {
-       acpi_operand_object     *prev_obj_desc;
-       acpi_operand_object     *obj_desc;
-       acpi_operand_object     *data_desc;
+       union acpi_operand_object       *prev_obj_desc;
+       union acpi_operand_object       *obj_desc;
+       union acpi_operand_object       *data_desc;
 
 
        /* We only allow one attachment per handler */
@@ -369,11 +369,11 @@ acpi_ns_attach_data (
 
 acpi_status
 acpi_ns_detach_data (
-       acpi_namespace_node     *node,
-       acpi_object_handler     handler)
+       struct acpi_namespace_node      *node,
+       acpi_object_handler             handler)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_operand_object     *prev_obj_desc;
+       union acpi_operand_object       *obj_desc;
+       union acpi_operand_object       *prev_obj_desc;
 
 
        prev_obj_desc = NULL;
@@ -417,11 +417,11 @@ acpi_ns_detach_data (
 
 acpi_status
 acpi_ns_get_attached_data (
-       acpi_namespace_node     *node,
-       acpi_object_handler     handler,
-       void                    **data)
+       struct acpi_namespace_node      *node,
+       acpi_object_handler             handler,
+       void                            **data)
 {
-       acpi_operand_object     *obj_desc;
+       union acpi_operand_object       *obj_desc;
 
 
        obj_desc = node->object;
index d6cc4bd..a83b5a7 100644 (file)
@@ -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
 
 acpi_status
 acpi_ns_one_complete_parse (
-       u32                     pass_number,
-       acpi_table_desc         *table_desc)
+       u32                             pass_number,
+       struct acpi_table_desc          *table_desc)
 {
-       acpi_parse_object       *parse_root;
-       acpi_status             status;
-       acpi_walk_state         *walk_state;
+       union acpi_parse_object         *parse_root;
+       acpi_status                     status;
+       struct acpi_walk_state          *walk_state;
 
 
        ACPI_FUNCTION_TRACE ("ns_one_complete_parse");
@@ -108,10 +108,10 @@ acpi_ns_one_complete_parse (
 
 acpi_status
 acpi_ns_parse_table (
-       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_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ns_parse_table");
index bff2eab..1c70446 100644 (file)
@@ -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
 
 acpi_status
 acpi_ns_search_node (
-       u32                     target_name,
-       acpi_namespace_node     *node,
-       acpi_object_type        type,
-       acpi_namespace_node     **return_node)
+       u32                             target_name,
+       struct acpi_namespace_node      *node,
+       acpi_object_type                type,
+       struct acpi_namespace_node      **return_node)
 {
-       acpi_namespace_node     *next_node;
+       struct acpi_namespace_node      *next_node;
 
 
        ACPI_FUNCTION_TRACE ("ns_search_node");
@@ -73,7 +73,7 @@ acpi_ns_search_node (
 
 #ifdef ACPI_DEBUG_OUTPUT
        if (ACPI_LV_NAMES & acpi_dbg_level) {
-               char                *scope_name;
+               char                        *scope_name;
 
                scope_name = acpi_ns_get_external_pathname (node);
                if (scope_name) {
@@ -156,13 +156,13 @@ acpi_ns_search_node (
 
 static acpi_status
 acpi_ns_search_parent_tree (
-       u32                     target_name,
-       acpi_namespace_node     *node,
-       acpi_object_type        type,
-       acpi_namespace_node     **return_node)
+       u32                             target_name,
+       struct acpi_namespace_node      *node,
+       acpi_object_type                type,
+       struct acpi_namespace_node      **return_node)
 {
-       acpi_status             status;
-       acpi_namespace_node     *parent_node;
+       acpi_status                     status;
+       struct acpi_namespace_node      *parent_node;
 
 
        ACPI_FUNCTION_TRACE ("ns_search_parent_tree");
@@ -247,16 +247,16 @@ acpi_ns_search_parent_tree (
 
 acpi_status
 acpi_ns_search_and_enter (
-       u32                     target_name,
-       acpi_walk_state         *walk_state,
-       acpi_namespace_node     *node,
-       acpi_interpreter_mode   interpreter_mode,
-       acpi_object_type        type,
-       u32                     flags,
-       acpi_namespace_node     **return_node)
+       u32                             target_name,
+       struct acpi_walk_state          *walk_state,
+       struct acpi_namespace_node      *node,
+       acpi_interpreter_mode           interpreter_mode,
+       acpi_object_type                type,
+       u32                             flags,
+       struct acpi_namespace_node      **return_node)
 {
-       acpi_status             status;
-       acpi_namespace_node     *new_node;
+       acpi_status                     status;
+       struct acpi_namespace_node      *new_node;
 
 
        ACPI_FUNCTION_TRACE ("ns_search_and_enter");
index 4f3a025..5107995 100644 (file)
@@ -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
 
 void
 acpi_ns_report_error (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id,
-       char                    *internal_name,
-       acpi_status             lookup_status)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id,
+       char                            *internal_name,
+       acpi_status                     lookup_status)
 {
-       acpi_status             status;
-       char                    *name;
+       acpi_status                     status;
+       char                            *name;
 
 
        /* Convert path to external format */
@@ -102,16 +102,16 @@ acpi_ns_report_error (
 
 void
 acpi_ns_report_method_error (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id,
-       char                    *message,
-       acpi_namespace_node     *prefix_node,
-       char                    *path,
-       acpi_status             method_status)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id,
+       char                            *message,
+       struct acpi_namespace_node      *prefix_node,
+       char                            *path,
+       acpi_status                     method_status)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node = prefix_node;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node = prefix_node;
 
 
        if (path) {
@@ -142,11 +142,11 @@ acpi_ns_report_method_error (
 
 void
 acpi_ns_print_node_pathname (
-       acpi_namespace_node     *node,
-       char                    *msg)
+       struct acpi_namespace_node      *node,
+       char                            *msg)
 {
-       acpi_buffer             buffer;
-       acpi_status             status;
+       struct acpi_buffer              buffer;
+       acpi_status                     status;
 
 
        /* Convert handle to a full pathname and print it (with supplied message) */
@@ -175,7 +175,7 @@ acpi_ns_print_node_pathname (
 
 u8
 acpi_ns_valid_root_prefix (
-       char                    prefix)
+       char                            prefix)
 {
 
        return ((u8) (prefix == '\\'));
@@ -196,7 +196,7 @@ acpi_ns_valid_root_prefix (
 
 u8
 acpi_ns_valid_path_separator (
-       char                    sep)
+       char                            sep)
 {
 
        return ((u8) (sep == '.'));
@@ -215,7 +215,7 @@ acpi_ns_valid_path_separator (
 
 acpi_object_type
 acpi_ns_get_type (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
        ACPI_FUNCTION_TRACE ("ns_get_type");
 
@@ -242,7 +242,7 @@ acpi_ns_get_type (
 
 u32
 acpi_ns_local (
-       acpi_object_type        type)
+       acpi_object_type                type)
 {
        ACPI_FUNCTION_TRACE ("ns_local");
 
@@ -274,10 +274,10 @@ acpi_ns_local (
 
 void
 acpi_ns_get_internal_name_length (
-       acpi_namestring_info    *info)
+       struct acpi_namestring_info     *info)
 {
-       char                    *next_external_char;
-       u32                     i;
+       char                            *next_external_char;
+       u32                             i;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -348,13 +348,13 @@ acpi_ns_get_internal_name_length (
 
 acpi_status
 acpi_ns_build_internal_name (
-       acpi_namestring_info    *info)
+       struct acpi_namestring_info     *info)
 {
-       u32                     num_segments = info->num_segments;
-       char                    *internal_name = info->internal_name;
-       char                    *external_name = info->next_external_char;
-       char                    *result = NULL;
-       acpi_native_uint        i;
+       u32                             num_segments = info->num_segments;
+       char                            *internal_name = info->internal_name;
+       char                            *external_name = info->next_external_char;
+       char                            *result = NULL;
+       acpi_native_uint                i;
 
 
        ACPI_FUNCTION_TRACE ("ns_build_internal_name");
@@ -469,12 +469,12 @@ acpi_ns_build_internal_name (
 
 acpi_status
 acpi_ns_internalize_name (
-       char                    *external_name,
-       char                    **converted_name)
+       char                            *external_name,
+       char                            **converted_name)
 {
-       char                    *internal_name;
-       acpi_namestring_info    info;
-       acpi_status             status;
+       char                            *internal_name;
+       struct acpi_namestring_info     info;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ns_internalize_name");
@@ -529,17 +529,17 @@ acpi_ns_internalize_name (
 
 acpi_status
 acpi_ns_externalize_name (
-       u32                     internal_name_length,
-       char                    *internal_name,
-       u32                     *converted_name_length,
-       char                    **converted_name)
+       u32                             internal_name_length,
+       char                            *internal_name,
+       u32                             *converted_name_length,
+       char                            **converted_name)
 {
-       acpi_native_uint        names_index = 0;
-       acpi_native_uint        num_segments = 0;
-       acpi_native_uint        required_length;
-       acpi_native_uint        prefix_length = 0;
-       acpi_native_uint        i = 0;
-       acpi_native_uint        j = 0;
+       acpi_native_uint                names_index = 0;
+       acpi_native_uint                num_segments = 0;
+       acpi_native_uint                required_length;
+       acpi_native_uint                prefix_length = 0;
+       acpi_native_uint                i = 0;
+       acpi_native_uint                j = 0;
 
 
        ACPI_FUNCTION_TRACE ("ns_externalize_name");
@@ -686,9 +686,9 @@ acpi_ns_externalize_name (
  *
  ******************************************************************************/
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_map_handle_to_node (
-       acpi_handle             handle)
+       acpi_handle                     handle)
 {
 
        ACPI_FUNCTION_ENTRY ();
@@ -711,7 +711,7 @@ acpi_ns_map_handle_to_node (
                return (NULL);
        }
 
-       return ((acpi_namespace_node *) handle);
+       return ((struct acpi_namespace_node *) handle);
 }
 
 
@@ -729,7 +729,7 @@ acpi_ns_map_handle_to_node (
 
 acpi_handle
 acpi_ns_convert_entry_to_handle (
-       acpi_namespace_node         *node)
+       struct acpi_namespace_node          *node)
 {
 
 
@@ -772,8 +772,8 @@ acpi_ns_convert_entry_to_handle (
 void
 acpi_ns_terminate (void)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_namespace_node     *this_node;
+       union acpi_operand_object       *obj_desc;
+       struct acpi_namespace_node      *this_node;
 
 
        ACPI_FUNCTION_TRACE ("ns_terminate");
@@ -824,7 +824,7 @@ acpi_ns_terminate (void)
 
 u32
 acpi_ns_opens_scope (
-       acpi_object_type        type)
+       acpi_object_type                type)
 {
        ACPI_FUNCTION_TRACE_STR ("ns_opens_scope", acpi_ut_get_type_name (type));
 
@@ -864,14 +864,14 @@ acpi_ns_opens_scope (
 
 acpi_status
 acpi_ns_get_node_by_path (
-       char                    *pathname,
-       acpi_namespace_node     *start_node,
-       u32                     flags,
-       acpi_namespace_node     **return_node)
+       char                            *pathname,
+       struct acpi_namespace_node      *start_node,
+       u32                             flags,
+       struct acpi_namespace_node      **return_node)
 {
-       acpi_generic_state      scope_info;
-       acpi_status             status;
-       char                    *internal_path = NULL;
+       union acpi_generic_state        scope_info;
+       acpi_status                     status;
+       char                            *internal_path = NULL;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ns_get_node_by_path", pathname);
@@ -935,9 +935,9 @@ acpi_ns_get_node_by_path (
 
 acpi_name
 acpi_ns_find_parent_name (
-       acpi_namespace_node     *child_node)
+       struct acpi_namespace_node      *child_node)
 {
-       acpi_namespace_node     *parent_node;
+       struct acpi_namespace_node      *parent_node;
 
 
        ACPI_FUNCTION_TRACE ("ns_find_parent_name");
@@ -978,9 +978,9 @@ acpi_ns_find_parent_name (
  ******************************************************************************/
 
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_get_parent_node (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
        ACPI_FUNCTION_ENTRY ();
 
@@ -1020,9 +1020,9 @@ acpi_ns_get_parent_node (
  ******************************************************************************/
 
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_get_next_valid_node (
-       acpi_namespace_node     *node)
+       struct acpi_namespace_node      *node)
 {
 
        /* If we are at the end of this peer list, return NULL */
index 80400f9..a1461ce 100644 (file)
@@ -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
@@ -41,7 +41,7 @@
  *              child_node          - Previous child that was found.
  *                                    The NEXT child will be returned
  *
- * RETURN:      acpi_namespace_node - Pointer to the NEXT child or NULL if
+ * RETURN:      struct acpi_namespace_node - Pointer to the NEXT child or NULL if
  *                                    none is found.
  *
  * DESCRIPTION: Return the next peer node within the namespace.  If Handle
  *
  ******************************************************************************/
 
-acpi_namespace_node *
+struct acpi_namespace_node *
 acpi_ns_get_next_node (
-       acpi_object_type        type,
-       acpi_namespace_node     *parent_node,
-       acpi_namespace_node     *child_node)
+       acpi_object_type                type,
+       struct acpi_namespace_node      *parent_node,
+       struct acpi_namespace_node      *child_node)
 {
-       acpi_namespace_node     *next_node = NULL;
+       struct acpi_namespace_node      *next_node = NULL;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -136,19 +136,19 @@ acpi_ns_get_next_node (
 
 acpi_status
 acpi_ns_walk_namespace (
-       acpi_object_type        type,
-       acpi_handle             start_node,
-       u32                     max_depth,
-       u8                      unlock_before_callback,
-       acpi_walk_callback      user_function,
-       void                    *context,
-       void                    **return_value)
+       acpi_object_type                type,
+       acpi_handle                     start_node,
+       u32                             max_depth,
+       u8                              unlock_before_callback,
+       acpi_walk_callback              user_function,
+       void                            *context,
+       void                            **return_value)
 {
-       acpi_status             status;
-       acpi_namespace_node     *child_node;
-       acpi_namespace_node     *parent_node;
-       acpi_object_type        child_type;
-       u32                     level;
+       acpi_status                     status;
+       struct acpi_namespace_node      *child_node;
+       struct acpi_namespace_node      *parent_node;
+       acpi_object_type                child_type;
+       u32                             level;
 
 
        ACPI_FUNCTION_TRACE ("ns_walk_namespace");
index ad2d54a..8b0fa0f 100644 (file)
@@ -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
 
 acpi_status
 acpi_evaluate_object_typed (
-       acpi_handle             handle,
-       acpi_string             pathname,
-       acpi_object_list        *external_params,
-       acpi_buffer             *return_buffer,
-       acpi_object_type        return_type)
+       acpi_handle                     handle,
+       acpi_string                     pathname,
+       struct acpi_object_list         *external_params,
+       struct acpi_buffer              *return_buffer,
+       acpi_object_type                return_type)
 {
-       acpi_status             status;
-       u8                      must_free = FALSE;
+       acpi_status                     status;
+       u8                              must_free = FALSE;
 
 
        ACPI_FUNCTION_TRACE ("acpi_evaluate_object_typed");
@@ -102,7 +102,7 @@ acpi_evaluate_object_typed (
 
        /* Examine the object type returned from evaluate_object */
 
-       if (((acpi_object *) return_buffer->pointer)->type == return_type) {
+       if (((union acpi_object *) return_buffer->pointer)->type == return_type) {
                return_ACPI_STATUS (AE_OK);
        }
 
@@ -110,7 +110,7 @@ acpi_evaluate_object_typed (
 
        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                "Incorrect return type [%s] requested [%s]\n",
-               acpi_ut_get_type_name (((acpi_object *) return_buffer->pointer)->type),
+               acpi_ut_get_type_name (((union acpi_object *) return_buffer->pointer)->type),
                acpi_ut_get_type_name (return_type)));
 
        if (must_free) {
@@ -147,16 +147,16 @@ acpi_evaluate_object_typed (
 
 acpi_status
 acpi_evaluate_object (
-       acpi_handle             handle,
-       acpi_string             pathname,
-       acpi_object_list        *external_params,
-       acpi_buffer             *return_buffer)
+       acpi_handle                     handle,
+       acpi_string                     pathname,
+       struct acpi_object_list         *external_params,
+       struct acpi_buffer              *return_buffer)
 {
-       acpi_status             status;
-       acpi_operand_object     **internal_params = NULL;
-       acpi_operand_object     *internal_return_obj = NULL;
-       acpi_size               buffer_space_needed;
-       u32                     i;
+       acpi_status                     status;
+       union acpi_operand_object       **internal_params = NULL;
+       union acpi_operand_object       *internal_return_obj = NULL;
+       acpi_size                       buffer_space_needed;
+       u32                             i;
 
 
        ACPI_FUNCTION_TRACE ("acpi_evaluate_object");
@@ -357,14 +357,14 @@ acpi_evaluate_object (
 
 acpi_status
 acpi_walk_namespace (
-       acpi_object_type        type,
-       acpi_handle             start_object,
-       u32                     max_depth,
-       acpi_walk_callback      user_function,
-       void                    *context,
-       void                    **return_value)
+       acpi_object_type                type,
+       acpi_handle                     start_object,
+       u32                             max_depth,
+       acpi_walk_callback              user_function,
+       void                            *context,
+       void                            **return_value)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_walk_namespace");
@@ -413,17 +413,17 @@ acpi_walk_namespace (
 
 static acpi_status
 acpi_ns_get_device_callback (
-       acpi_handle             obj_handle,
-       u32                     nesting_level,
-       void                    *context,
-       void                    **return_value)
+       acpi_handle                     obj_handle,
+       u32                             nesting_level,
+       void                            *context,
+       void                            **return_value)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node;
-       u32                     flags;
-       acpi_device_id          hid;
-       acpi_device_id          cid;
-       acpi_get_devices_info   *info;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node;
+       u32                             flags;
+       struct acpi_device_id           hid;
+       struct acpi_device_id           cid;
+       struct acpi_get_devices_info    *info;
 
 
        info = context;
@@ -517,13 +517,13 @@ acpi_ns_get_device_callback (
 
 acpi_status
 acpi_get_devices (
-       char                    *HID,
-       acpi_walk_callback      user_function,
-       void                    *context,
-       void                    **return_value)
+       char                            *HID,
+       acpi_walk_callback              user_function,
+       void                            *context,
+       void                            **return_value)
 {
-       acpi_status             status;
-       acpi_get_devices_info   info;
+       acpi_status                     status;
+       struct acpi_get_devices_info    info;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_devices");
@@ -581,12 +581,12 @@ acpi_get_devices (
 
 acpi_status
 acpi_attach_data (
-       acpi_handle             obj_handle,
-       acpi_object_handler     handler,
-       void                    *data)
+       acpi_handle                     obj_handle,
+       acpi_object_handler             handler,
+       void                            *data)
 {
-       acpi_namespace_node     *node;
-       acpi_status             status;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
 
 
        /* Parameter validation */
@@ -633,11 +633,11 @@ unlock_and_exit:
 
 acpi_status
 acpi_detach_data (
-       acpi_handle             obj_handle,
-       acpi_object_handler     handler)
+       acpi_handle                     obj_handle,
+       acpi_object_handler             handler)
 {
-       acpi_namespace_node     *node;
-       acpi_status             status;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
 
 
        /* Parameter validation */
@@ -684,12 +684,12 @@ unlock_and_exit:
 
 acpi_status
 acpi_get_data (
-       acpi_handle             obj_handle,
-       acpi_object_handler     handler,
-       void                    **data)
+       acpi_handle                     obj_handle,
+       acpi_object_handler             handler,
+       void                            **data)
 {
-       acpi_namespace_node     *node;
-       acpi_status             status;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
 
 
        /* Parameter validation */
index 82e66ce..7968df9 100644 (file)
@@ -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
 
 acpi_status
 acpi_get_handle (
-       acpi_handle             parent,
-       acpi_string             pathname,
-       acpi_handle             *ret_handle)
+       acpi_handle                     parent,
+       acpi_string                     pathname,
+       acpi_handle                     *ret_handle)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node = NULL;
-       acpi_namespace_node     *prefix_node = NULL;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node = NULL;
+       struct acpi_namespace_node      *prefix_node = NULL;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -129,12 +129,12 @@ acpi_get_handle (
 
 acpi_status
 acpi_get_name (
-       acpi_handle             handle,
-       u32                     name_type,
-       acpi_buffer             *buffer)
+       acpi_handle                     handle,
+       u32                             name_type,
+       struct acpi_buffer              *buffer)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node;
 
 
        /* Parameter validation */
@@ -209,15 +209,15 @@ unlock_and_exit:
 
 acpi_status
 acpi_get_object_info (
-       acpi_handle             handle,
-       acpi_device_info        *info)
+       acpi_handle                     handle,
+       struct acpi_device_info         *info)
 {
-       acpi_device_id          hid;
-       acpi_device_id          uid;
-       acpi_status             status;
-       u32                     device_status = 0;
-       acpi_integer            address = 0;
-       acpi_namespace_node     *node;
+       struct acpi_device_id           hid;
+       struct acpi_device_id           uid;
+       acpi_status                     status;
+       u32                             device_status = 0;
+       acpi_integer                    address = 0;
+       struct acpi_namespace_node      *node;
 
 
        /* Parameter validation */
index 1c803ee..87c06e2 100644 (file)
@@ -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
 
 acpi_status
 acpi_get_type (
-       acpi_handle             handle,
-       acpi_object_type        *ret_type)
+       acpi_handle                     handle,
+       acpi_object_type                *ret_type)
 {
-       acpi_namespace_node     *node;
-       acpi_status             status;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
 
 
        /* Parameter Validation */
@@ -105,11 +105,11 @@ acpi_get_type (
 
 acpi_status
 acpi_get_parent (
-       acpi_handle             handle,
-       acpi_handle             *ret_handle)
+       acpi_handle                     handle,
+       acpi_handle                     *ret_handle)
 {
-       acpi_namespace_node     *node;
-       acpi_status             status;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
 
 
        if (!ret_handle) {
@@ -174,15 +174,15 @@ unlock_and_exit:
 
 acpi_status
 acpi_get_next_object (
-       acpi_object_type        type,
-       acpi_handle             parent,
-       acpi_handle             child,
-       acpi_handle             *ret_handle)
+       acpi_object_type                type,
+       acpi_handle                     parent,
+       acpi_handle                     child,
+       acpi_handle                     *ret_handle)
 {
-       acpi_status             status;
-       acpi_namespace_node     *node;
-       acpi_namespace_node     *parent_node = NULL;
-       acpi_namespace_node     *child_node = NULL;
+       acpi_status                     status;
+       struct acpi_namespace_node      *node;
+       struct acpi_namespace_node      *parent_node = NULL;
+       struct acpi_namespace_node      *child_node = NULL;
 
 
        /* Parameter validation */
index b51c45d..545562f 100644 (file)
@@ -138,7 +138,7 @@ acpi_os_free(void *ptr)
 }
 
 acpi_status
-acpi_os_get_root_pointer(u32 flags, acpi_pointer *addr)
+acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
 {
 #ifdef CONFIG_ACPI_EFI
        addr->pointer_type = ACPI_PHYSICAL_POINTER;
@@ -204,7 +204,8 @@ acpi_os_get_physical_address(void *virt, acpi_physical_address *phys)
 }
 
 acpi_status
-acpi_os_table_override (acpi_table_header *existing_table, acpi_table_header **new_table)
+acpi_os_table_override (struct acpi_table_header *existing_table,
+                       struct acpi_table_header **new_table)
 {
        if (!existing_table || !new_table)
                return AE_BAD_PARAMETER;
@@ -418,10 +419,10 @@ acpi_os_write_memory(
 
 acpi_status
 acpi_os_read_pci_configuration (
-       acpi_pci_id             *pci_id,
-       u32                     reg,
-       void                    *value,
-       u32                     width)
+       struct acpi_pci_id      *pci_id,
+       u32                     reg,
+       void                    *value,
+       u32                     width)
 {
        int                     result = 0;
        int                     size = 0;
@@ -454,10 +455,10 @@ acpi_os_read_pci_configuration (
 
 acpi_status
 acpi_os_write_pci_configuration (
-       acpi_pci_id             *pci_id,
-       u32                     reg,
-       acpi_integer            value,
-       u32                     width)
+       struct acpi_pci_id      *pci_id,
+       u32                     reg,
+       acpi_integer            value,
+       u32                     width)
 {
        int                     result = 0;
        int                     size = 0;
@@ -487,16 +488,16 @@ acpi_os_write_pci_configuration (
 /* TODO: Change code to take advantage of driver model more */
 void
 acpi_os_derive_pci_id (
-       acpi_handle     rhandle,        /* upper bound  */
-       acpi_handle     chandle,        /* current node */
-       acpi_pci_id     **id)
-{
-       acpi_handle     handle;
-       acpi_pci_id     *pci_id = *id;
-       acpi_status     status;
-       unsigned long   temp;
-       acpi_object_type type;
-       u8              tu8;
+       acpi_handle             rhandle,        /* upper bound  */
+       acpi_handle             chandle,        /* current node */
+       struct acpi_pci_id      **id)
+{
+       acpi_handle             handle;
+       struct acpi_pci_id      *pci_id = *id;
+       acpi_status             status;
+       unsigned long           temp;
+       acpi_object_type        type;
+       u8                      tu8;
 
        acpi_get_parent(chandle, &handle);
        if (handle != rhandle) {
index 61f8b9d..c70500e 100644 (file)
@@ -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
 
 u32
 acpi_ps_get_next_package_length (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
-       u32                     encoded_length;
-       u32                     length = 0;
+       u32                             encoded_length;
+       u32                             length = 0;
 
 
        ACPI_FUNCTION_TRACE ("ps_get_next_package_length");
@@ -118,10 +118,10 @@ acpi_ps_get_next_package_length (
 
 u8 *
 acpi_ps_get_next_package_end (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
-       u8                      *start = parser_state->aml;
-       acpi_native_uint        length;
+       u8                              *start = parser_state->aml;
+       acpi_native_uint                length;
 
 
        ACPI_FUNCTION_TRACE ("ps_get_next_package_end");
@@ -152,10 +152,10 @@ acpi_ps_get_next_package_end (
 
 char *
 acpi_ps_get_next_namestring (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
-       u8                      *start = parser_state->aml;
-       u8                      *end = parser_state->aml;
+       u8                              *start = parser_state->aml;
+       u8                              *end = parser_state->aml;
 
 
        ACPI_FUNCTION_TRACE ("ps_get_next_namestring");
@@ -232,17 +232,17 @@ acpi_ps_get_next_namestring (
 
 acpi_status
 acpi_ps_get_next_namepath (
-       acpi_walk_state         *walk_state,
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       *arg,
-       u8                      method_call)
+       struct acpi_walk_state          *walk_state,
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         *arg,
+       u8                              method_call)
 {
-       char                    *path;
-       acpi_parse_object       *name_op;
-       acpi_status             status = AE_OK;
-       acpi_operand_object     *method_desc;
-       acpi_namespace_node     *node;
-       acpi_generic_state      scope_info;
+       char                            *path;
+       union acpi_parse_object         *name_op;
+       acpi_status                     status = AE_OK;
+       union acpi_operand_object       *method_desc;
+       struct acpi_namespace_node      *node;
+       union acpi_generic_state        scope_info;
 
 
        ACPI_FUNCTION_TRACE ("ps_get_next_namepath");
@@ -370,9 +370,9 @@ acpi_ps_get_next_namepath (
 
 void
 acpi_ps_get_next_simple_arg (
-       acpi_parse_state        *parser_state,
-       u32                     arg_type,
-       acpi_parse_object       *arg)
+       struct acpi_parse_state         *parser_state,
+       u32                             arg_type,
+       union acpi_parse_object         *arg)
 {
 
        ACPI_FUNCTION_TRACE_U32 ("ps_get_next_simple_arg", arg_type);
@@ -462,15 +462,15 @@ acpi_ps_get_next_simple_arg (
  *
  ******************************************************************************/
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_next_field (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
-       u32                     aml_offset = ACPI_PTR_DIFF (parser_state->aml,
+       u32                             aml_offset = ACPI_PTR_DIFF (parser_state->aml,
                         parser_state->aml_start);
-       acpi_parse_object       *field;
-       u16                     opcode;
-       u32                     name;
+       union acpi_parse_object         *field;
+       u16                             opcode;
+       u32                             name;
 
 
        ACPI_FUNCTION_TRACE ("ps_get_next_field");
@@ -572,16 +572,16 @@ acpi_ps_get_next_field (
 
 acpi_status
 acpi_ps_get_next_arg (
-       acpi_walk_state         *walk_state,
-       acpi_parse_state        *parser_state,
-       u32                     arg_type,
-       acpi_parse_object       **return_arg)
+       struct acpi_walk_state          *walk_state,
+       struct acpi_parse_state         *parser_state,
+       u32                             arg_type,
+       union acpi_parse_object         **return_arg)
 {
-       acpi_parse_object       *arg = NULL;
-       acpi_parse_object       *prev = NULL;
-       acpi_parse_object       *field;
-       u32                     subop;
-       acpi_status             status = AE_OK;
+       union acpi_parse_object         *arg = NULL;
+       union acpi_parse_object         *prev = NULL;
+       union acpi_parse_object         *field;
+       u32                             subop;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_get_next_arg", parser_state);
index ce06d32..98d292f 100644 (file)
@@ -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
  */
 
 
-const acpi_opcode_info    acpi_gbl_aml_op_info[AML_NUM_OPCODES] =
+const struct acpi_opcode_info     acpi_gbl_aml_op_info[AML_NUM_OPCODES] =
 {
 /*! [Begin] no source code translation */
 /* Index           Name                 Parser Args               Interpreter Args                ObjectType                    Class                      Type                  Flags */
@@ -675,9 +675,9 @@ static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] =
  *
  ******************************************************************************/
 
-const acpi_opcode_info *
+const struct acpi_opcode_info *
 acpi_ps_get_opcode_info (
-       u16                     opcode)
+       u16                             opcode)
 {
        ACPI_FUNCTION_NAME ("ps_get_opcode_info");
 
@@ -731,11 +731,11 @@ acpi_ps_get_opcode_info (
 
 char *
 acpi_ps_get_opcode_name (
-       u16                     opcode)
+       u16                             opcode)
 {
 #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG_OUTPUT)
 
-       const acpi_opcode_info  *op;
+       const struct acpi_opcode_info   *op;
 
 
        op = acpi_ps_get_opcode_info (opcode);
index 4532904..fc1a1c9 100644 (file)
@@ -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
@@ -43,7 +43,7 @@
         ACPI_MODULE_NAME    ("psparse")
 
 
-static u32                  acpi_gbl_depth = 0;
+static u32                          acpi_gbl_depth = 0;
 
 
 /*******************************************************************************
@@ -60,7 +60,7 @@ static u32                  acpi_gbl_depth = 0;
 
 u32
 acpi_ps_get_opcode_size (
-       u32                     opcode)
+       u32                             opcode)
 {
 
        /* Extended (2-byte) opcode if > 255 */
@@ -89,10 +89,10 @@ acpi_ps_get_opcode_size (
 
 u16
 acpi_ps_peek_opcode (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
-       u8                      *aml;
-       u16                     opcode;
+       u8                              *aml;
+       u16                             opcode;
 
 
        aml = parser_state->aml;
@@ -125,13 +125,13 @@ acpi_ps_peek_opcode (
 
 void
 acpi_ps_complete_this_op (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op)
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op)
 {
-       acpi_parse_object       *prev;
-       acpi_parse_object       *next;
-       const acpi_opcode_info  *parent_info;
-       acpi_parse_object       *replacement_op = NULL;
+       union acpi_parse_object         *prev;
+       union acpi_parse_object         *next;
+       const struct acpi_opcode_info   *parent_info;
+       union acpi_parse_object         *replacement_op = NULL;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_complete_this_op", op);
@@ -281,12 +281,12 @@ acpi_ps_complete_this_op (
 
 acpi_status
 acpi_ps_next_parse_state (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       acpi_status             callback_status)
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       acpi_status                     callback_status)
 {
-       acpi_parse_state        *parser_state = &walk_state->parser_state;
-       acpi_status             status = AE_CTRL_PENDING;
+       struct acpi_parse_state         *parser_state = &walk_state->parser_state;
+       acpi_status                     status = AE_CTRL_PENDING;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_next_parse_state", op);
@@ -402,14 +402,14 @@ acpi_ps_next_parse_state (
 
 acpi_status
 acpi_ps_parse_loop (
-       acpi_walk_state         *walk_state)
+       struct acpi_walk_state          *walk_state)
 {
-       acpi_status             status = AE_OK;
-       acpi_parse_object       *op = NULL;     /* current op */
-       acpi_parse_object       *arg = NULL;
-       acpi_parse_object       pre_op;
-       acpi_parse_state        *parser_state;
-       u8                      *aml_op_start = NULL;
+       acpi_status                     status = AE_OK;
+       union acpi_parse_object         *op = NULL;     /* current op */
+       union acpi_parse_object         *arg = NULL;
+       union acpi_parse_object         pre_op;
+       struct acpi_parse_state         *parser_state;
+       u8                              *aml_op_start = NULL;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_parse_loop", walk_state);
@@ -1029,13 +1029,13 @@ close_this_op:
 
 acpi_status
 acpi_ps_parse_aml (
-       acpi_walk_state         *walk_state)
+       struct acpi_walk_state          *walk_state)
 {
-       acpi_status             status;
-       acpi_status             terminate_status;
-       acpi_thread_state       *thread;
-       acpi_thread_state       *prev_walk_list = acpi_gbl_current_walk_list;
-       acpi_walk_state         *previous_walk_state;
+       acpi_status                     status;
+       acpi_status                     terminate_status;
+       struct acpi_thread_state        *thread;
+       struct acpi_thread_state        *prev_walk_list = acpi_gbl_current_walk_list;
+       struct acpi_walk_state          *previous_walk_state;
 
 
        ACPI_FUNCTION_TRACE ("ps_parse_aml");
@@ -1175,7 +1175,7 @@ acpi_ps_parse_aml (
        /* Normal exit */
 
        acpi_ex_release_all_mutexes (thread);
-       acpi_ut_delete_generic_state (ACPI_CAST_PTR (acpi_generic_state, thread));
+       acpi_ut_delete_generic_state (ACPI_CAST_PTR (union acpi_generic_state, thread));
        acpi_gbl_current_walk_list = prev_walk_list;
        return_ACPI_STATUS (status);
 }
index 9595dae..96426a6 100644 (file)
@@ -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
@@ -42,9 +42,9 @@
  *
  ******************************************************************************/
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_parent_scope (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
        return (parser_state->scope->parse_scope.op);
 }
@@ -66,7 +66,7 @@ acpi_ps_get_parent_scope (
 
 u8
 acpi_ps_has_completed_scope (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
        return ((u8) ((parser_state->aml >= parser_state->scope->parse_scope.arg_end ||
                           !parser_state->scope->parse_scope.arg_count)));
@@ -88,10 +88,10 @@ acpi_ps_has_completed_scope (
 
 acpi_status
 acpi_ps_init_scope (
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       *root_op)
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         *root_op)
 {
-       acpi_generic_state      *scope;
+       union acpi_generic_state        *scope;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_init_scope", root_op);
@@ -132,12 +132,12 @@ acpi_ps_init_scope (
 
 acpi_status
 acpi_ps_push_scope (
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       *op,
-       u32                     remaining_args,
-       u32                     arg_count)
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         *op,
+       u32                             remaining_args,
+       u32                             arg_count)
 {
-       acpi_generic_state      *scope;
+       union acpi_generic_state        *scope;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_push_scope", op);
@@ -194,12 +194,12 @@ acpi_ps_push_scope (
 
 void
 acpi_ps_pop_scope (
-       acpi_parse_state        *parser_state,
-       acpi_parse_object       **op,
-       u32                     *arg_list,
-       u32                     *arg_count)
+       struct acpi_parse_state         *parser_state,
+       union acpi_parse_object         **op,
+       u32                             *arg_list,
+       u32                             *arg_count)
 {
-       acpi_generic_state      *scope = parser_state->scope;
+       union acpi_generic_state        *scope = parser_state->scope;
 
 
        ACPI_FUNCTION_TRACE ("ps_pop_scope");
@@ -252,9 +252,9 @@ acpi_ps_pop_scope (
 
 void
 acpi_ps_cleanup_scope (
-       acpi_parse_state        *parser_state)
+       struct acpi_parse_state         *parser_state)
 {
-       acpi_generic_state      *scope;
+       union acpi_generic_state        *scope;
 
        ACPI_FUNCTION_TRACE_PTR ("ps_cleanup_scope", parser_state);
 
index 9d61738..7a26b07 100644 (file)
@@ -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
  *
  ******************************************************************************/
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_arg (
-       acpi_parse_object       *op,
-       u32                     argn)
+       union acpi_parse_object         *op,
+       u32                             argn)
 {
-       acpi_parse_object       *arg = NULL;
-       const acpi_opcode_info  *op_info;
+       union acpi_parse_object         *arg = NULL;
+       const struct acpi_opcode_info   *op_info;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -100,11 +100,11 @@ acpi_ps_get_arg (
 
 void
 acpi_ps_append_arg (
-       acpi_parse_object       *op,
-       acpi_parse_object       *arg)
+       union acpi_parse_object         *op,
+       union acpi_parse_object         *arg)
 {
-       acpi_parse_object       *prev_arg;
-       const acpi_opcode_info  *op_info;
+       union acpi_parse_object         *prev_arg;
+       const struct acpi_opcode_info   *op_info;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -174,11 +174,11 @@ acpi_ps_append_arg (
  *
  ******************************************************************************/
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_child (
-       acpi_parse_object       *op)
+       union acpi_parse_object         *op)
 {
-       acpi_parse_object       *child = NULL;
+       union acpi_parse_object         *child = NULL;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -243,14 +243,14 @@ acpi_ps_get_child (
  *
  ******************************************************************************/
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_get_depth_next (
-       acpi_parse_object       *origin,
-       acpi_parse_object       *op)
+       union acpi_parse_object         *origin,
+       union acpi_parse_object         *op)
 {
-       acpi_parse_object       *next = NULL;
-       acpi_parse_object       *parent;
-       acpi_parse_object       *arg;
+       union acpi_parse_object         *next = NULL;
+       union acpi_parse_object         *parent;
+       union acpi_parse_object         *arg;
 
 
        ACPI_FUNCTION_ENTRY ();
index ce44501..aea613f 100644 (file)
@@ -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
  *
  ******************************************************************************/
 
-acpi_parse_object *
+union acpi_parse_object *
 acpi_ps_create_scope_op (
        void)
 {
-       acpi_parse_object       *scope_op;
+       union acpi_parse_object         *scope_op;
 
 
        scope_op = acpi_ps_alloc_op (AML_SCOPE_OP);
@@ -78,8 +78,8 @@ acpi_ps_create_scope_op (
 
 void
 acpi_ps_init_op (
-       acpi_parse_object       *op,
-       u16                     opcode)
+       union acpi_parse_object         *op,
+       u16                             opcode)
 {
        ACPI_FUNCTION_ENTRY ();
 
@@ -106,14 +106,14 @@ acpi_ps_init_op (
  *
  ******************************************************************************/
 
-acpi_parse_object*
+union acpi_parse_object*
 acpi_ps_alloc_op (
-       u16                     opcode)
+       u16                             opcode)
 {
-       acpi_parse_object       *op = NULL;
-       u32                     size;
-       u8                      flags;
-       const acpi_opcode_info  *op_info;
+       union acpi_parse_object         *op = NULL;
+       u32                             size;
+       u8                              flags;
+       const struct acpi_opcode_info   *op_info;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -124,23 +124,23 @@ acpi_ps_alloc_op (
        /* Allocate the minimum required size object */
 
        if (op_info->flags & AML_DEFER) {
-               size = sizeof (acpi_parse_obj_named);
+               size = sizeof (struct acpi_parse_obj_named);
                flags = ACPI_PARSEOP_DEFERRED;
        }
        else if (op_info->flags & AML_NAMED) {
-               size = sizeof (acpi_parse_obj_named);
+               size = sizeof (struct acpi_parse_obj_named);
                flags = ACPI_PARSEOP_NAMED;
        }
        else if (opcode == AML_INT_BYTELIST_OP) {
-               size = sizeof (acpi_parse_obj_named);
+               size = sizeof (struct acpi_parse_obj_named);
                flags = ACPI_PARSEOP_BYTELIST;
        }
        else {
-               size = sizeof (acpi_parse_obj_common);
+               size = sizeof (struct acpi_parse_obj_common);
                flags = ACPI_PARSEOP_GENERIC;
        }
 
-       if (size == sizeof (acpi_parse_obj_common)) {
+       if (size == sizeof (struct acpi_parse_obj_common)) {
                /*
                 * The generic op is by far the most common (16 to 1)
                 */
@@ -176,7 +176,7 @@ acpi_ps_alloc_op (
 
 void
 acpi_ps_free_op (
-       acpi_parse_object       *op)
+       union acpi_parse_object         *op)
 {
        ACPI_FUNCTION_NAME ("ps_free_op");
 
@@ -233,7 +233,7 @@ acpi_ps_delete_parse_cache (
  */
 u8
 acpi_ps_is_leading_char (
-       u32                     c)
+       u32                             c)
 {
        return ((u8) (c == '_' || (c >= 'A' && c <= 'Z')));
 }
@@ -244,7 +244,7 @@ acpi_ps_is_leading_char (
  */
 u8
 acpi_ps_is_prefix_char (
-       u32                     c)
+       u32                             c)
 {
        return ((u8) (c == '\\' || c == '^'));
 }
@@ -255,7 +255,7 @@ acpi_ps_is_prefix_char (
  */
 u32
 acpi_ps_get_name (
-       acpi_parse_object       *op)
+       union acpi_parse_object         *op)
 {
 
 
@@ -276,8 +276,8 @@ acpi_ps_get_name (
  */
 void
 acpi_ps_set_name (
-       acpi_parse_object       *op,
-       u32                     name)
+       union acpi_parse_object         *op,
+       u32                             name)
 {
 
        /* The "generic" object has no name associated with it */
index 81766b1..78d98da 100644 (file)
@@ -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
 
 acpi_status
 acpi_ps_get_next_walk_op (
-       acpi_walk_state         *walk_state,
-       acpi_parse_object       *op,
-       acpi_parse_upwards      ascending_callback)
+       struct acpi_walk_state          *walk_state,
+       union acpi_parse_object         *op,
+       acpi_parse_upwards              ascending_callback)
 {
-       acpi_parse_object       *next;
-       acpi_parse_object       *parent;
-       acpi_parse_object       *grand_parent;
-       acpi_status             status;
+       union acpi_parse_object         *next;
+       union acpi_parse_object         *parent;
+       union acpi_parse_object         *grand_parent;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_get_next_walk_op", op);
@@ -208,7 +208,7 @@ acpi_ps_get_next_walk_op (
 
 acpi_status
 acpi_ps_delete_completed_op (
-       acpi_walk_state         *walk_state)
+       struct acpi_walk_state          *walk_state)
 {
 
        acpi_ps_free_op (walk_state->op);
@@ -230,11 +230,11 @@ acpi_ps_delete_completed_op (
 
 void
 acpi_ps_delete_parse_tree (
-       acpi_parse_object       *subtree_root)
+       union acpi_parse_object         *subtree_root)
 {
-       acpi_walk_state         *walk_state;
-       acpi_thread_state       *thread;
-       acpi_status             status;
+       struct acpi_walk_state          *walk_state;
+       struct acpi_thread_state        *thread;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ps_delete_parse_tree", subtree_root);
@@ -279,7 +279,7 @@ acpi_ps_delete_parse_tree (
 
        /* We are done with this walk */
 
-       acpi_ut_delete_generic_state (ACPI_CAST_PTR (acpi_generic_state, thread));
+       acpi_ut_delete_generic_state (ACPI_CAST_PTR (union acpi_generic_state, thread));
        acpi_ds_delete_walk_state (walk_state);
 
        return_VOID;
index 629072c..e5ef29d 100644 (file)
@@ -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
 
 acpi_status
 acpi_psx_execute (
-       acpi_namespace_node     *method_node,
-       acpi_operand_object     **params,
-       acpi_operand_object     **return_obj_desc)
+       struct acpi_namespace_node      *method_node,
+       union acpi_operand_object       **params,
+       union acpi_operand_object       **return_obj_desc)
 {
-       acpi_status             status;
-       acpi_operand_object     *obj_desc;
-       u32                     i;
-       acpi_parse_object       *op;
-       acpi_walk_state         *walk_state;
+       acpi_status                     status;
+       union acpi_operand_object       *obj_desc;
+       u32                             i;
+       union acpi_parse_object         *op;
+       struct acpi_walk_state          *walk_state;
 
 
        ACPI_FUNCTION_TRACE ("psx_execute");
index 80cdd4b..08c4c87 100644 (file)
@@ -40,7 +40,7 @@
 ACPI_MODULE_NAME               ("pci_bind")
 
 struct acpi_pci_data {
-       acpi_pci_id             id;
+       struct acpi_pci_id      id;
        struct pci_bus          *bus;
        struct pci_dev          *dev;
 };
@@ -70,7 +70,7 @@ acpi_pci_data_handler (
 acpi_status
 acpi_os_get_pci_id (
        acpi_handle             handle,
-       acpi_pci_id             *id)
+       struct acpi_pci_id      *id)
 {
        int                     result = 0;
        acpi_status             status = AE_OK;
@@ -125,7 +125,7 @@ acpi_pci_bind (
        struct acpi_pci_data    *data = NULL;
        struct acpi_pci_data    *pdata = NULL;
        char                    pathname[ACPI_PATHNAME_MAX] = {0};
-       acpi_buffer             buffer = {ACPI_PATHNAME_MAX, pathname};
+       struct acpi_buffer      buffer = {ACPI_PATHNAME_MAX, pathname};
        acpi_handle             handle = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_pci_bind");
@@ -261,14 +261,14 @@ end:
 int 
 acpi_pci_bind_root (
        struct acpi_device      *device,
-       acpi_pci_id             *id,
+       struct acpi_pci_id      *id,
        struct pci_bus          *bus) 
 {
        int                     result = 0;
        acpi_status             status = AE_OK;
        struct acpi_pci_data    *data = NULL;
        char                    pathname[ACPI_PATHNAME_MAX] = {0};
-       acpi_buffer             buffer = {ACPI_PATHNAME_MAX, pathname};
+       struct acpi_buffer      buffer = {ACPI_PATHNAME_MAX, pathname};
 
        ACPI_FUNCTION_TRACE("acpi_pci_bind_root");
 
index 167b18c..34bc972 100644 (file)
@@ -88,10 +88,10 @@ acpi_pci_irq_find_prt_entry (
 
 static int
 acpi_pci_irq_add_entry (
-       acpi_handle             handle,
-       int                     segment,
-       int                     bus,
-       acpi_pci_routing_table  *prt)
+       acpi_handle                     handle,
+       int                             segment,
+       int                             bus,
+       struct acpi_pci_routing_table   *prt)
 {
        struct acpi_prt_entry   *entry = NULL;
 
@@ -157,12 +157,12 @@ acpi_pci_irq_add_prt (
        int                     segment,
        int                     bus)
 {
-       acpi_status             status = AE_OK;
-       char                    pathname[ACPI_PATHNAME_MAX] = {0};
-       acpi_buffer             buffer = {0, NULL};
-       acpi_pci_routing_table  *prt = NULL;
-       acpi_pci_routing_table  *entry = NULL;
-       static int              first_time = 1;
+       acpi_status                     status = AE_OK;
+       char                            pathname[ACPI_PATHNAME_MAX] = {0};
+       struct acpi_buffer              buffer = {0, NULL};
+       struct acpi_pci_routing_table   *prt = NULL;
+       struct acpi_pci_routing_table   *entry = NULL;
+       static int                      first_time = 1;
 
        ACPI_FUNCTION_TRACE("acpi_pci_irq_add_prt");
 
@@ -215,7 +215,7 @@ acpi_pci_irq_add_prt (
 
        while (entry && (entry->length > 0)) {
                acpi_pci_irq_add_entry(handle, segment, bus, entry);
-               entry = (acpi_pci_routing_table *)
+               entry = (struct acpi_pci_routing_table *)
                        ((unsigned long) entry + entry->length);
        }
 
index e963e70..f29ca7b 100644 (file)
@@ -96,8 +96,8 @@ acpi_pci_link_get_possible (
 {
        int                     result = 0;
        acpi_status             status = AE_OK;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       acpi_resource           *resource = NULL;
+       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_resource    *resource = NULL;
        int                     i = 0;
 
        ACPI_FUNCTION_TRACE("acpi_pci_link_get_possible");
@@ -112,7 +112,7 @@ acpi_pci_link_get_possible (
                goto end;
        }
 
-       resource = (acpi_resource *) buffer.pointer;
+       resource = (struct acpi_resource *) buffer.pointer;
 
        /* skip past dependent function resource (if present) */
        if (resource->id == ACPI_RSTYPE_START_DPF)
@@ -121,7 +121,7 @@ acpi_pci_link_get_possible (
        switch (resource->id) {
        case ACPI_RSTYPE_IRQ:
        {
-               acpi_resource_irq *p = &resource->data.irq;
+               struct acpi_resource_irq *p = &resource->data.irq;
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Blank IRQ resource\n"));
                        result = -ENODEV;
@@ -139,7 +139,7 @@ acpi_pci_link_get_possible (
        }
        case ACPI_RSTYPE_EXT_IRQ:
        {
-               acpi_resource_ext_irq *p = &resource->data.extended_irq;
+               struct acpi_resource_ext_irq *p = &resource->data.extended_irq;
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, 
                                "Blank IRQ resource\n"));
@@ -180,8 +180,8 @@ acpi_pci_link_get_current (
 {
        int                     result = 0;
        acpi_status             status = AE_OK;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       acpi_resource           *resource = NULL;
+       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_resource    *resource = NULL;
        int                     irq = 0;
 
        ACPI_FUNCTION_TRACE("acpi_pci_link_get_current");
@@ -212,12 +212,12 @@ acpi_pci_link_get_current (
                result = -ENODEV;
                goto end;
        }
-       resource = (acpi_resource *) buffer.pointer;
+       resource = (struct acpi_resource *) buffer.pointer;
 
        switch (resource->id) {
        case ACPI_RSTYPE_IRQ:
        {
-               acpi_resource_irq *p = &resource->data.irq;
+               struct acpi_resource_irq *p = &resource->data.irq;
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, 
                                "Blank IRQ resource\n"));
@@ -229,7 +229,7 @@ acpi_pci_link_get_current (
        }
        case ACPI_RSTYPE_EXT_IRQ:
        {
-               acpi_resource_ext_irq *p = &resource->data.extended_irq;
+               struct acpi_resource_ext_irq *p = &resource->data.extended_irq;
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
                                "Blank IRQ resource\n"));
@@ -277,10 +277,10 @@ acpi_pci_link_set (
        int                     result = 0;
        acpi_status             status = AE_OK;
        struct {
-               acpi_resource   res;
-               acpi_resource   end;
+               struct acpi_resource    res;
+               struct acpi_resource    end;
        }                       resource;
-       acpi_buffer             buffer = {sizeof(resource)+1, &resource};
+       struct acpi_buffer      buffer = {sizeof(resource)+1, &resource};
        int                     i = 0;
        int                     valid = 0;
 
@@ -307,7 +307,7 @@ acpi_pci_link_set (
 
        /* NOTE: PCI interrupts are always level / active_low / shared. */
        resource.res.id = ACPI_RSTYPE_IRQ;
-       resource.res.length = sizeof(acpi_resource);
+       resource.res.length = sizeof(struct acpi_resource);
        resource.res.data.irq.edge_level = ACPI_LEVEL_SENSITIVE;
        resource.res.data.irq.active_high_low = ACPI_ACTIVE_LOW;
        resource.res.data.irq.shared_exclusive = ACPI_SHARED;
index 2b49bf7..cf5c07e 100644 (file)
@@ -62,7 +62,7 @@ static struct acpi_driver acpi_pci_root_driver = {
  struct acpi_pci_root {
        struct list_head        node;
        acpi_handle             handle;
-       acpi_pci_id             id;
+       struct acpi_pci_id      id;
        struct pci_bus          *bus;
        u64                     mem_tra;
        u64                     io_tra;
@@ -73,7 +73,7 @@ struct list_head              acpi_pci_roots;
 
 void
 acpi_pci_get_translations (
-       acpi_pci_id             *id,
+       struct acpi_pci_id      *id,
        u64                     *mem_tra,
        u64                     *io_tra)
 {
@@ -98,12 +98,12 @@ acpi_pci_get_translations (
 
 static u64
 acpi_pci_root_bus_tra (
-       acpi_resource           *resource,
-       int                     type)
+       struct acpi_resource    *resource,
+       int                     type)
 {
-       acpi_resource_address16 *address16;
-       acpi_resource_address32 *address32;
-       acpi_resource_address64 *address64;
+       struct acpi_resource_address16 *address16;
+       struct acpi_resource_address32 *address32;
+       struct acpi_resource_address64 *address64;
 
        while (1) {
                switch (resource->id) {
@@ -111,27 +111,27 @@ acpi_pci_root_bus_tra (
                        return 0;
 
                case ACPI_RSTYPE_ADDRESS16:
-                       address16 = (acpi_resource_address16 *) &resource->data;
+                       address16 = (struct acpi_resource_address16 *) &resource->data;
                        if (type == address16->resource_type) {
                                return address16->address_translation_offset;
                        }
                        break;
 
                case ACPI_RSTYPE_ADDRESS32:
-                       address32 = (acpi_resource_address32 *) &resource->data;
+                       address32 = (struct acpi_resource_address32 *) &resource->data;
                        if (type == address32->resource_type) {
                                return address32->address_translation_offset;
                        }
                        break;
 
                case ACPI_RSTYPE_ADDRESS64:
-                       address64 = (acpi_resource_address64 *) &resource->data;
+                       address64 = (struct acpi_resource_address64 *) &resource->data;
                        if (type == address64->resource_type) {
                                return address64->address_translation_offset;
                        }
                        break;
                }
-               resource = ACPI_PTR_ADD (acpi_resource,
+               resource = ACPI_PTR_ADD (struct acpi_resource,
                                resource, resource->length);
        }
 
@@ -144,7 +144,7 @@ acpi_pci_evaluate_crs (
        struct acpi_pci_root    *root)
 {
        acpi_status             status;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
 
        ACPI_FUNCTION_TRACE("acpi_pci_evaluate_crs");
 
@@ -152,9 +152,9 @@ acpi_pci_evaluate_crs (
        if (ACPI_FAILURE(status))
                return_VALUE(-ENODEV);
 
-       root->io_tra = acpi_pci_root_bus_tra ((acpi_resource *)
+       root->io_tra = acpi_pci_root_bus_tra ((struct acpi_resource *)
                        buffer.pointer, ACPI_IO_RANGE);
-       root->mem_tra = acpi_pci_root_bus_tra ((acpi_resource *)
+       root->mem_tra = acpi_pci_root_bus_tra ((struct acpi_resource *)
                        buffer.pointer, ACPI_MEMORY_RANGE);
 
        acpi_os_free(buffer.pointer);
index bbca62c..22e524c 100644 (file)
@@ -487,8 +487,8 @@ acpi_power_add (
        int                     result = 0;
        acpi_status             status = AE_OK;
        struct acpi_power_resource *resource = NULL;
-       acpi_object             acpi_object;
-       acpi_buffer             buffer = {sizeof(acpi_object), &acpi_object};
+       union acpi_object       acpi_object;
+       struct acpi_buffer      buffer = {sizeof(acpi_object), &acpi_object};
 
        ACPI_FUNCTION_TRACE("acpi_power_add");
 
index 800598d..dd91d2c 100644 (file)
@@ -915,9 +915,9 @@ acpi_processor_get_performance_control (
 {
        int                     result = 0;
        acpi_status             status = 0;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       acpi_object             *pct = NULL;
-       acpi_object             obj = {0};
+       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       union acpi_object       *pct = NULL;
+       union acpi_object       obj = {0};
        struct acpi_pct_register *reg = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_processor_get_performance_control");
@@ -928,7 +928,7 @@ acpi_processor_get_performance_control (
                return_VALUE(-ENODEV);
        }
 
-       pct = (acpi_object *) buffer.pointer;
+       pct = (union acpi_object *) buffer.pointer;
        if (!pct || (pct->type != ACPI_TYPE_PACKAGE) 
                || (pct->package.count != 2)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PCT data\n"));
@@ -1008,10 +1008,10 @@ acpi_processor_get_performance_states (
 {
        int                     result = 0;
        acpi_status             status = AE_OK;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       acpi_buffer             format = {sizeof("NNNNNN"), "NNNNNN"};
-       acpi_buffer             state = {0, NULL};
-       acpi_object             *pss = NULL;
+       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_buffer      format = {sizeof("NNNNNN"), "NNNNNN"};
+       struct acpi_buffer      state = {0, NULL};
+       union acpi_object       *pss = NULL;
        int                     i = 0;
 
        ACPI_FUNCTION_TRACE("acpi_processor_get_performance_states");
@@ -1022,7 +1022,7 @@ acpi_processor_get_performance_states (
                return_VALUE(-ENODEV);
        }
 
-       pss = (acpi_object *) buffer.pointer;
+       pss = (union acpi_object *) buffer.pointer;
        if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSS data\n"));
                result = -EFAULT;
@@ -2366,8 +2366,8 @@ acpi_processor_get_info (
        struct acpi_processor   *pr)
 {
        acpi_status             status = 0;
-       acpi_object             object = {0};
-       acpi_buffer             buffer = {sizeof(acpi_object), &object};
+       union acpi_object       object = {0};
+       struct acpi_buffer      buffer = {sizeof(union acpi_object), &object};
        static int              cpu_count = 0;
 
        ACPI_FUNCTION_TRACE("acpi_processor_get_info");
index 8fc0107..1a088df 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_address16_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u8                      *temp_ptr;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_address16);
-       u32                     index;
-       u16                     temp16;
-       u8                      temp8;
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u8                              *temp_ptr;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address16);
+       u32                             index;
+       u16                             temp16;
+       u8                              temp8;
 
 
        ACPI_FUNCTION_TRACE ("rs_address16_resource");
@@ -265,15 +265,15 @@ acpi_rs_address16_resource (
 
 acpi_status
 acpi_rs_address16_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u8                      *length_field;
-       u8                      temp8;
-       char                    *temp_pointer = NULL;
-       acpi_size               actual_bytes;
+       u8                              *buffer = *output_buffer;
+       u8                              *length_field;
+       u8                              temp8;
+       char                            *temp_pointer = NULL;
+       acpi_size                       actual_bytes;
 
 
        ACPI_FUNCTION_TRACE ("rs_address16_stream");
@@ -431,25 +431,25 @@ acpi_rs_address16_stream (
 
 acpi_status
 acpi_rs_address32_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer;
-       acpi_resource           *output_struct= (void *) *output_buffer;
-       u16                     temp16;
-       u8                      temp8;
-       u8                      *temp_ptr;
-       acpi_size               struct_size;
-       u32                     index;
+       u8                              *buffer;
+       struct acpi_resource            *output_struct= (void *) *output_buffer;
+       u16                             temp16;
+       u8                              temp8;
+       u8                              *temp_ptr;
+       acpi_size                       struct_size;
+       u32                             index;
 
 
        ACPI_FUNCTION_TRACE ("rs_address32_resource");
 
 
        buffer = byte_stream_buffer;
-       struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_address32);
+       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address32);
 
        /*
         * Point past the Descriptor to get the number of bytes consumed
@@ -648,14 +648,14 @@ acpi_rs_address32_resource (
 
 acpi_status
 acpi_rs_address32_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer;
-       u16                     *length_field;
-       u8                      temp8;
-       char                    *temp_pointer;
+       u8                              *buffer;
+       u16                             *length_field;
+       u8                              temp8;
+       char                            *temp_pointer;
 
 
        ACPI_FUNCTION_TRACE ("rs_address32_stream");
@@ -813,25 +813,25 @@ acpi_rs_address32_stream (
 
 acpi_status
 acpi_rs_address64_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16;
-       u8                      temp8;
-       u8                      *temp_ptr;
-       acpi_size               struct_size;
-       u32                     index;
+       u8                              *buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16;
+       u8                              temp8;
+       u8                              *temp_ptr;
+       acpi_size                       struct_size;
+       u32                             index;
 
 
        ACPI_FUNCTION_TRACE ("rs_address64_resource");
 
 
        buffer = byte_stream_buffer;
-       struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_address64);
+       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address64);
 
        /*
         * Point past the Descriptor to get the number of bytes consumed
@@ -1034,14 +1034,14 @@ acpi_rs_address64_resource (
 
 acpi_status
 acpi_rs_address64_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer;
-       u16                     *length_field;
-       u8                      temp8;
-       char                    *temp_pointer;
+       u8                              *buffer;
+       u16                             *length_field;
+       u8                              temp8;
+       char                            *temp_pointer;
 
 
        ACPI_FUNCTION_TRACE ("rs_address64_stream");
index c43f629..4275bd3 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_get_byte_stream_length (
-       acpi_resource           *linked_list,
-       acpi_size               *size_needed)
+       struct acpi_resource            *linked_list,
+       acpi_size                       *size_needed)
 {
-       acpi_size               byte_stream_size_needed = 0;
-       acpi_size               segment_size;
-       acpi_resource_ext_irq   *ex_irq = NULL;
-       u8                      done = FALSE;
+       acpi_size                       byte_stream_size_needed = 0;
+       acpi_size                       segment_size;
+       struct acpi_resource_ext_irq    *ex_irq = NULL;
+       u8                              done = FALSE;
 
 
        ACPI_FUNCTION_TRACE ("rs_get_byte_stream_length");
@@ -253,7 +253,7 @@ acpi_rs_get_byte_stream_length (
                /*
                 * Point to the next object
                 */
-               linked_list = ACPI_PTR_ADD (acpi_resource,
+               linked_list = ACPI_PTR_ADD (struct acpi_resource,
                                  linked_list, linked_list->length);
        }
 
@@ -285,22 +285,22 @@ acpi_rs_get_byte_stream_length (
 
 acpi_status
 acpi_rs_get_list_length (
-       u8                      *byte_stream_buffer,
-       u32                     byte_stream_buffer_length,
-       acpi_size               *size_needed)
+       u8                              *byte_stream_buffer,
+       u32                             byte_stream_buffer_length,
+       acpi_size                       *size_needed)
 {
-       u32                     buffer_size = 0;
-       u32                     bytes_parsed = 0;
-       u8                      number_of_interrupts = 0;
-       u8                      number_of_channels = 0;
-       u8                      resource_type;
-       u32                     structure_size;
-       u32                     bytes_consumed;
-       u8                      *buffer;
-       u8                      temp8;
-       u16                     temp16;
-       u8                      index;
-       u8                      additional_bytes;
+       u32                             buffer_size = 0;
+       u32                             bytes_parsed = 0;
+       u8                              number_of_interrupts = 0;
+       u8                              number_of_channels = 0;
+       u8                              resource_type;
+       u32                             structure_size;
+       u32                             bytes_consumed;
+       u8                              *buffer;
+       u8                              temp8;
+       u16                             temp16;
+       u8                              index;
+       u8                              additional_bytes;
 
 
        ACPI_FUNCTION_TRACE ("rs_get_list_length");
@@ -319,7 +319,7 @@ acpi_rs_get_list_length (
                         */
                        bytes_consumed = 12;
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_mem24);
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_mem24);
                        break;
 
 
@@ -338,7 +338,7 @@ acpi_rs_get_list_length (
                         */
                        temp16 = (u16) ACPI_ROUND_UP_to_32_bITS (temp16);
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_vendor) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_vendor) +
                                           (temp16 * sizeof (u8));
                        break;
 
@@ -350,7 +350,7 @@ acpi_rs_get_list_length (
 
                        bytes_consumed = 20;
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_mem32);
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_mem32);
                        break;
 
 
@@ -360,7 +360,7 @@ acpi_rs_get_list_length (
                         */
                        bytes_consumed = 12;
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_fixed_mem32);
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_fixed_mem32);
                        break;
 
 
@@ -397,7 +397,7 @@ acpi_rs_get_list_length (
                         */
                        temp8 = (u8) ACPI_ROUND_UP_to_64_bITS (temp8);
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_address64) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address64) +
                                           (temp8 * sizeof (u8));
                        break;
 
@@ -435,7 +435,7 @@ acpi_rs_get_list_length (
                         */
                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS (temp8);
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_address32) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address32) +
                                           (temp8 * sizeof (u8));
                        break;
 
@@ -473,7 +473,7 @@ acpi_rs_get_list_length (
                         */
                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS (temp8);
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_address16) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_address16) +
                                           (temp8 * sizeof (u8));
                        break;
 
@@ -525,7 +525,7 @@ acpi_rs_get_list_length (
                         */
                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS (temp8);
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_ext_irq) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_ext_irq) +
                                           (additional_bytes * sizeof (u8)) +
                                           (temp8 * sizeof (u8));
                        break;
@@ -564,7 +564,7 @@ acpi_rs_get_list_length (
                                temp16 >>= 1;
                        }
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_io) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_io) +
                                           (number_of_interrupts * sizeof (u32));
                        break;
 
@@ -594,7 +594,7 @@ acpi_rs_get_list_length (
                                temp8 >>= 1;
                        }
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_dma) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_dma) +
                                           (number_of_channels * sizeof (u32));
                        break;
 
@@ -614,7 +614,7 @@ acpi_rs_get_list_length (
                                bytes_consumed = 1;
                        }
 
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_start_dpf);
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_start_dpf);
                        break;
 
 
@@ -632,7 +632,7 @@ acpi_rs_get_list_length (
                         * IO Port Resource
                         */
                        bytes_consumed = 8;
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_io);
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_io);
                        break;
 
 
@@ -641,7 +641,7 @@ acpi_rs_get_list_length (
                         * Fixed IO Port Resource
                         */
                        bytes_consumed = 4;
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_fixed_io);
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_fixed_io);
                        break;
 
 
@@ -659,7 +659,7 @@ acpi_rs_get_list_length (
                         * Ensure a 32-bit boundary for the structure
                         */
                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS (temp8);
-                       structure_size = ACPI_SIZEOF_RESOURCE (acpi_resource_vendor) +
+                       structure_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_vendor) +
                                           (temp8 * sizeof (u8));
                        break;
 
@@ -721,17 +721,17 @@ acpi_rs_get_list_length (
 
 acpi_status
 acpi_rs_get_pci_routing_table_length (
-       acpi_operand_object     *package_object,
-       acpi_size               *buffer_size_needed)
+       union acpi_operand_object       *package_object,
+       acpi_size                       *buffer_size_needed)
 {
-       u32                     number_of_elements;
-       acpi_size               temp_size_needed = 0;
-       acpi_operand_object     **top_object_list;
-       u32                     index;
-       acpi_operand_object     *package_element;
-       acpi_operand_object     **sub_object_list;
-       u8                      name_found;
-       u32                     table_index;
+       u32                             number_of_elements;
+       acpi_size                       temp_size_needed = 0;
+       union acpi_operand_object       **top_object_list;
+       u32                             index;
+       union acpi_operand_object       *package_element;
+       union acpi_operand_object       **sub_object_list;
+       u8                              name_found;
+       u32                             table_index;
 
 
        ACPI_FUNCTION_TRACE ("rs_get_pci_routing_table_length");
@@ -782,7 +782,7 @@ acpi_rs_get_pci_routing_table_length (
                        }
                }
 
-               temp_size_needed += (sizeof (acpi_pci_routing_table) - 4);
+               temp_size_needed += (sizeof (struct acpi_pci_routing_table) - 4);
 
                /*
                 * Was a String type found?
@@ -813,7 +813,7 @@ acpi_rs_get_pci_routing_table_length (
                temp_size_needed = ACPI_ROUND_UP_to_64_bITS (temp_size_needed);
 
                /*
-                * Point to the next acpi_operand_object
+                * Point to the next union acpi_operand_object
                 */
                top_object_list++;
        }
@@ -821,6 +821,6 @@ acpi_rs_get_pci_routing_table_length (
        /*
         * Adding an extra element to the end of the list, essentially a NULL terminator
         */
-       *buffer_size_needed = temp_size_needed + sizeof (acpi_pci_routing_table);
+       *buffer_size_needed = temp_size_needed + sizeof (struct acpi_pci_routing_table);
        return_ACPI_STATUS (AE_OK);
 }
index a8a0a34..1af681c 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_create_resource_list (
-       acpi_operand_object     *byte_stream_buffer,
-       acpi_buffer             *output_buffer)
+       union acpi_operand_object       *byte_stream_buffer,
+       struct acpi_buffer              *output_buffer)
 {
 
-       acpi_status             status;
-       u8                      *byte_stream_start;
-       acpi_size               list_size_needed = 0;
-       u32                     byte_stream_buffer_length;
+       acpi_status                     status;
+       u8                              *byte_stream_start;
+       acpi_size                       list_size_needed = 0;
+       u32                             byte_stream_buffer_length;
 
 
        ACPI_FUNCTION_TRACE ("rs_create_resource_list");
@@ -112,7 +112,7 @@ acpi_rs_create_resource_list (
  *
  * FUNCTION:    acpi_rs_create_pci_routing_table
  *
- * PARAMETERS:  package_object          - Pointer to an acpi_operand_object
+ * PARAMETERS:  package_object          - Pointer to an union acpi_operand_object
  *                                        package
  *              output_buffer           - Pointer to the user's buffer
  *
@@ -121,7 +121,7 @@ acpi_rs_create_resource_list (
  *              AE_BUFFER_OVERFLOW and output_buffer->Length will point
  *              to the size buffer needed.
  *
- * DESCRIPTION: Takes the acpi_operand_object  package and creates a
+ * DESCRIPTION: Takes the union acpi_operand_object    package and creates a
  *              linked list of PCI interrupt descriptions
  *
  * NOTE: It is the caller's responsibility to ensure that the start of the
@@ -131,20 +131,20 @@ acpi_rs_create_resource_list (
 
 acpi_status
 acpi_rs_create_pci_routing_table (
-       acpi_operand_object     *package_object,
-       acpi_buffer             *output_buffer)
+       union acpi_operand_object       *package_object,
+       struct acpi_buffer              *output_buffer)
 {
-       u8                      *buffer;
-       acpi_operand_object     **top_object_list;
-       acpi_operand_object     **sub_object_list;
-       acpi_operand_object     *obj_desc;
-       acpi_size               buffer_size_needed = 0;
-       u32                     number_of_elements;
-       u32                     index;
-       acpi_pci_routing_table  *user_prt;
-       acpi_namespace_node     *node;
-       acpi_status             status;
-       acpi_buffer             path_buffer;
+       u8                              *buffer;
+       union acpi_operand_object       **top_object_list;
+       union acpi_operand_object       **sub_object_list;
+       union acpi_operand_object       *obj_desc;
+       acpi_size                       buffer_size_needed = 0;
+       u32                             number_of_elements;
+       u32                             index;
+       struct acpi_pci_routing_table   *user_prt;
+       struct acpi_namespace_node      *node;
+       acpi_status                     status;
+       struct acpi_buffer              path_buffer;
 
 
        ACPI_FUNCTION_TRACE ("rs_create_pci_routing_table");
@@ -179,7 +179,7 @@ acpi_rs_create_pci_routing_table (
        top_object_list  = package_object->package.elements;
        number_of_elements = package_object->package.count;
        buffer           = output_buffer->pointer;
-       user_prt         = ACPI_CAST_PTR (acpi_pci_routing_table, buffer);
+       user_prt         = ACPI_CAST_PTR (struct acpi_pci_routing_table, buffer);
 
        for (index = 0; index < number_of_elements; index++) {
                /*
@@ -189,14 +189,14 @@ acpi_rs_create_pci_routing_table (
                 * be zero because we cleared the return buffer earlier
                 */
                buffer += user_prt->length;
-               user_prt = ACPI_CAST_PTR (acpi_pci_routing_table, buffer);
+               user_prt = ACPI_CAST_PTR (struct acpi_pci_routing_table, buffer);
 
                /*
                 * Fill in the Length field with the information we have at this point.
                 * The minus four is to subtract the size of the u8 Source[4] member
                 * because it is added below.
                 */
-               user_prt->length = (sizeof (acpi_pci_routing_table) - 4);
+               user_prt->length = (sizeof (struct acpi_pci_routing_table) - 4);
 
                /*
                 * Each element of the top-level package must also be a package
@@ -328,7 +328,7 @@ acpi_rs_create_pci_routing_table (
                        return_ACPI_STATUS (AE_BAD_DATA);
                }
 
-               /* Point to the next acpi_operand_object in the top level package */
+               /* Point to the next union acpi_operand_object in the top level package */
 
                top_object_list++;
        }
@@ -359,11 +359,11 @@ acpi_rs_create_pci_routing_table (
 
 acpi_status
 acpi_rs_create_byte_stream (
-       acpi_resource           *linked_list_buffer,
-       acpi_buffer             *output_buffer)
+       struct acpi_resource            *linked_list_buffer,
+       struct acpi_buffer              *output_buffer)
 {
-       acpi_status             status;
-       acpi_size               byte_stream_size_needed = 0;
+       acpi_status                     status;
+       acpi_size                       byte_stream_size_needed = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_create_byte_stream");
index 37fe982..babc76a 100644 (file)
@@ -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
 
 void
 acpi_rs_dump_irq (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_irq       *irq_data = (acpi_resource_irq *) data;
-       u8                      index = 0;
+       struct acpi_resource_irq        *irq_data = (struct acpi_resource_irq *) data;
+       u8                              index = 0;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -91,10 +91,10 @@ acpi_rs_dump_irq (
 
 void
 acpi_rs_dump_dma (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_dma       *dma_data = (acpi_resource_dma *) data;
-       u8                      index = 0;
+       struct acpi_resource_dma        *dma_data = (struct acpi_resource_dma *) data;
+       u8                              index = 0;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -171,9 +171,9 @@ acpi_rs_dump_dma (
 
 void
 acpi_rs_dump_start_depend_fns (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_start_dpf *sdf_data = (acpi_resource_start_dpf *) data;
+       struct acpi_resource_start_dpf *sdf_data = (struct acpi_resource_start_dpf *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -236,9 +236,9 @@ acpi_rs_dump_start_depend_fns (
 
 void
 acpi_rs_dump_io (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_io        *io_data = (acpi_resource_io *) data;
+       struct acpi_resource_io         *io_data = (struct acpi_resource_io *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -279,9 +279,9 @@ acpi_rs_dump_io (
 
 void
 acpi_rs_dump_fixed_io (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_fixed_io  *fixed_io_data = (acpi_resource_fixed_io *) data;
+       struct acpi_resource_fixed_io   *fixed_io_data = (struct acpi_resource_fixed_io *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -312,10 +312,10 @@ acpi_rs_dump_fixed_io (
 
 void
 acpi_rs_dump_vendor_specific (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_vendor    *vendor_data = (acpi_resource_vendor *) data;
-       u16                     index = 0;
+       struct acpi_resource_vendor     *vendor_data = (struct acpi_resource_vendor *) data;
+       u16                             index = 0;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -348,9 +348,9 @@ acpi_rs_dump_vendor_specific (
 
 void
 acpi_rs_dump_memory24 (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_mem24     *memory24_data = (acpi_resource_mem24 *) data;
+       struct acpi_resource_mem24      *memory24_data = (struct acpi_resource_mem24 *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -393,9 +393,9 @@ acpi_rs_dump_memory24 (
 
 void
 acpi_rs_dump_memory32 (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_mem32     *memory32_data = (acpi_resource_mem32 *) data;
+       struct acpi_resource_mem32      *memory32_data = (struct acpi_resource_mem32 *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -438,9 +438,9 @@ acpi_rs_dump_memory32 (
 
 void
 acpi_rs_dump_fixed_memory32 (
-       acpi_resource_data          *data)
+       union acpi_resource_data            *data)
 {
-       acpi_resource_fixed_mem32   *fixed_memory32_data = (acpi_resource_fixed_mem32 *) data;
+       struct acpi_resource_fixed_mem32    *fixed_memory32_data = (struct acpi_resource_fixed_mem32 *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -477,9 +477,9 @@ acpi_rs_dump_fixed_memory32 (
 
 void
 acpi_rs_dump_address16 (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_address16 *address16_data = (acpi_resource_address16 *) data;
+       struct acpi_resource_address16 *address16_data = (struct acpi_resource_address16 *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -620,9 +620,9 @@ acpi_rs_dump_address16 (
 
 void
 acpi_rs_dump_address32 (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_address32 *address32_data = (acpi_resource_address32 *) data;
+       struct acpi_resource_address32 *address32_data = (struct acpi_resource_address32 *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -762,9 +762,9 @@ acpi_rs_dump_address32 (
 
 void
 acpi_rs_dump_address64 (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_address64 *address64_data = (acpi_resource_address64 *) data;
+       struct acpi_resource_address64 *address64_data = (struct acpi_resource_address64 *) data;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -909,10 +909,10 @@ acpi_rs_dump_address64 (
 
 void
 acpi_rs_dump_extended_irq (
-       acpi_resource_data      *data)
+       union acpi_resource_data        *data)
 {
-       acpi_resource_ext_irq   *ext_irq_data = (acpi_resource_ext_irq *) data;
-       u8                      index = 0;
+       struct acpi_resource_ext_irq    *ext_irq_data = (struct acpi_resource_ext_irq *) data;
+       u8                              index = 0;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -970,10 +970,10 @@ acpi_rs_dump_extended_irq (
 
 void
 acpi_rs_dump_resource_list (
-       acpi_resource       *resource)
+       struct acpi_resource        *resource)
 {
-       u8                  count = 0;
-       u8                  done = FALSE;
+       u8                          count = 0;
+       u8                          done = FALSE;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -1053,7 +1053,7 @@ acpi_rs_dump_resource_list (
 
                        }
 
-                       resource = ACPI_PTR_ADD (acpi_resource, resource, resource->length);
+                       resource = ACPI_PTR_ADD (struct acpi_resource, resource, resource->length);
                }
        }
 
@@ -1074,19 +1074,19 @@ acpi_rs_dump_resource_list (
 
 void
 acpi_rs_dump_irq_list (
-       u8                      *route_table)
+       u8                              *route_table)
 {
-       u8                      *buffer = route_table;
-       u8                      count = 0;
-       u8                      done = FALSE;
-       acpi_pci_routing_table  *prt_element;
+       u8                              *buffer = route_table;
+       u8                              count = 0;
+       u8                              done = FALSE;
+       struct acpi_pci_routing_table   *prt_element;
 
 
        ACPI_FUNCTION_ENTRY ();
 
 
        if (acpi_dbg_level & ACPI_LV_RESOURCES && _COMPONENT & acpi_dbg_layer) {
-               prt_element = ACPI_CAST_PTR (acpi_pci_routing_table, buffer);
+               prt_element = ACPI_CAST_PTR (struct acpi_pci_routing_table, buffer);
 
                while (!done) {
                        acpi_os_printf ("PCI IRQ Routing Table structure %X.\n", count++);
@@ -1104,7 +1104,7 @@ acpi_rs_dump_irq_list (
 
                        buffer += prt_element->length;
 
-                       prt_element = ACPI_CAST_PTR (acpi_pci_routing_table, buffer);
+                       prt_element = ACPI_CAST_PTR (struct acpi_pci_routing_table, buffer);
 
                        if(0 == prt_element->length) {
                                done = TRUE;
index 89365a5..b7db066 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_io_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_io);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_io);
 
 
        ACPI_FUNCTION_TRACE ("rs_io_resource");
@@ -151,16 +151,16 @@ acpi_rs_io_resource (
 
 acpi_status
 acpi_rs_fixed_io_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_fixed_io);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_fixed_io);
 
 
        ACPI_FUNCTION_TRACE ("rs_fixed_io_resource");
@@ -220,13 +220,13 @@ acpi_rs_fixed_io_resource (
 
 acpi_status
 acpi_rs_io_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_io_stream");
@@ -304,13 +304,13 @@ acpi_rs_io_stream (
 
 acpi_status
 acpi_rs_fixed_io_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_fixed_io_stream");
@@ -370,17 +370,17 @@ acpi_rs_fixed_io_stream (
 
 acpi_status
 acpi_rs_dma_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u8                      temp8 = 0;
-       u8                      index;
-       u8                      i;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_dma);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u8                              temp8 = 0;
+       u8                              index;
+       u8                              i;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_dma);
 
 
        ACPI_FUNCTION_TRACE ("rs_dma_resource");
@@ -474,14 +474,14 @@ acpi_rs_dma_resource (
 
 acpi_status
 acpi_rs_dma_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       u8                      index;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       u8                              index;
 
 
        ACPI_FUNCTION_TRACE ("rs_dma_stream");
index e76dc52..1cadd04 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_irq_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       u8                      index;
-       u8                      i;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_irq);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       u8                              index;
+       u8                              i;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_irq);
 
 
        ACPI_FUNCTION_TRACE ("rs_irq_resource");
@@ -181,15 +181,15 @@ acpi_rs_irq_resource (
 
 acpi_status
 acpi_rs_irq_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       u8                      index;
-       u8                      IRqinfo_byte_needed;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       u8                              index;
+       u8                              IRqinfo_byte_needed;
 
 
        ACPI_FUNCTION_TRACE ("rs_irq_stream");
@@ -277,18 +277,18 @@ acpi_rs_irq_stream (
 
 acpi_status
 acpi_rs_extended_irq_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       u8                      *temp_ptr;
-       u8                      index;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_ext_irq);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       u8                              *temp_ptr;
+       u8                              index;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_ext_irq);
 
 
        ACPI_FUNCTION_TRACE ("rs_extended_irq_resource");
@@ -451,15 +451,15 @@ acpi_rs_extended_irq_resource (
 
 acpi_status
 acpi_rs_extended_irq_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     *length_field;
-       u8                      temp8 = 0;
-       u8                      index;
-       char                    *temp_pointer = NULL;
+       u8                              *buffer = *output_buffer;
+       u16                             *length_field;
+       u8                              temp8 = 0;
+       u8                              index;
+       char                            *temp_pointer = NULL;
 
 
        ACPI_FUNCTION_TRACE ("rs_extended_irq_stream");
index adf2be7..94a972f 100644 (file)
@@ -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 @@
 
 u8
 acpi_rs_get_resource_type (
-       u8                      resource_start_byte)
+       u8                              resource_start_byte)
 {
 
        ACPI_FUNCTION_ENTRY ();
@@ -98,18 +98,18 @@ acpi_rs_get_resource_type (
 
 acpi_status
 acpi_rs_byte_stream_to_list (
-       u8                      *byte_stream_buffer,
-       u32                     byte_stream_buffer_length,
-       u8                      *output_buffer)
+       u8                              *byte_stream_buffer,
+       u32                             byte_stream_buffer_length,
+       u8                              *output_buffer)
 {
-       acpi_status             status;
-       acpi_size               bytes_parsed = 0;
-       u8                      resource_type = 0;
-       acpi_size               bytes_consumed = 0;
-       u8                      *buffer = output_buffer;
-       acpi_size               structure_size = 0;
-       u8                      end_tag_processed = FALSE;
-       acpi_resource           *resource;
+       acpi_status                     status;
+       acpi_size                       bytes_parsed = 0;
+       u8                              resource_type = 0;
+       acpi_size                       bytes_consumed = 0;
+       u8                              *buffer = output_buffer;
+       acpi_size                       structure_size = 0;
+       u8                              end_tag_processed = FALSE;
+       struct acpi_resource            *resource;
 
        ACPI_FUNCTION_TRACE ("rs_byte_stream_to_list");
 
@@ -292,7 +292,7 @@ acpi_rs_byte_stream_to_list (
                /*
                 * Set the Buffer to the next structure
                 */
-               resource = ACPI_CAST_PTR (acpi_resource, buffer);
+               resource = ACPI_CAST_PTR (struct acpi_resource, buffer);
                resource->length = ACPI_ALIGN_RESOURCE_SIZE(resource->length);
                buffer += ACPI_ALIGN_RESOURCE_SIZE(structure_size);
 
@@ -332,14 +332,14 @@ acpi_rs_byte_stream_to_list (
 
 acpi_status
 acpi_rs_list_to_byte_stream (
-       acpi_resource           *linked_list,
-       acpi_size               byte_stream_size_needed,
-       u8                      *output_buffer)
+       struct acpi_resource            *linked_list,
+       acpi_size                       byte_stream_size_needed,
+       u8                              *output_buffer)
 {
-       acpi_status             status;
-       u8                      *buffer = output_buffer;
-       acpi_size               bytes_consumed = 0;
-       u8                      done = FALSE;
+       acpi_status                     status;
+       u8                              *buffer = output_buffer;
+       acpi_size                       bytes_consumed = 0;
+       u8                              done = FALSE;
 
 
        ACPI_FUNCTION_TRACE ("rs_list_to_byte_stream");
@@ -489,7 +489,7 @@ acpi_rs_list_to_byte_stream (
                /*
                 * Point to the next object
                 */
-               linked_list = ACPI_PTR_ADD (acpi_resource,
+               linked_list = ACPI_PTR_ADD (struct acpi_resource,
                                  linked_list, linked_list->length);
        }
 
index 9503cab..1cfcfe1 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_memory24_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_mem24);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_mem24);
 
 
        ACPI_FUNCTION_TRACE ("rs_memory24_resource");
@@ -143,13 +143,13 @@ acpi_rs_memory24_resource (
 
 acpi_status
 acpi_rs_memory24_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_memory24_stream");
@@ -230,16 +230,16 @@ acpi_rs_memory24_stream (
 
 acpi_status
 acpi_rs_memory32_range_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_mem32);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_mem32);
 
 
        ACPI_FUNCTION_TRACE ("rs_memory32_range_resource");
@@ -335,16 +335,16 @@ acpi_rs_memory32_range_resource (
 
 acpi_status
 acpi_rs_fixed_memory32_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_fixed_mem32);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_fixed_mem32);
 
 
        ACPI_FUNCTION_TRACE ("rs_fixed_memory32_resource");
@@ -412,13 +412,13 @@ acpi_rs_fixed_memory32_resource (
 
 acpi_status
 acpi_rs_memory32_range_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_memory32_range_stream");
@@ -495,13 +495,13 @@ acpi_rs_memory32_range_stream (
 
 acpi_status
 acpi_rs_fixed_memory32_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_fixed_memory32_stream");
index 6b77d2b..cdec584 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_end_tag_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       acpi_size               struct_size = ACPI_RESOURCE_LENGTH;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       acpi_size                       struct_size = ACPI_RESOURCE_LENGTH;
 
 
        ACPI_FUNCTION_TRACE ("rs_end_tag_resource");
@@ -106,12 +106,12 @@ acpi_rs_end_tag_resource (
 
 acpi_status
 acpi_rs_end_tag_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_end_tag_stream");
@@ -163,17 +163,17 @@ acpi_rs_end_tag_stream (
 
 acpi_status
 acpi_rs_vendor_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       u8                      index;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_vendor);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       u8                              index;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_vendor);
 
 
        ACPI_FUNCTION_TRACE ("rs_vendor_resource");
@@ -263,14 +263,14 @@ acpi_rs_vendor_resource (
 
 acpi_status
 acpi_rs_vendor_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u16                     temp16 = 0;
-       u8                      temp8 = 0;
-       u8                      index;
+       u8                              *buffer = *output_buffer;
+       u16                             temp16 = 0;
+       u8                              temp8 = 0;
+       u8                              index;
 
 
        ACPI_FUNCTION_TRACE ("rs_vendor_stream");
@@ -343,15 +343,15 @@ acpi_rs_vendor_stream (
 
 acpi_status
 acpi_rs_start_depend_fns_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       u8                      *buffer = byte_stream_buffer;
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       u8                      temp8 = 0;
-       acpi_size               struct_size = ACPI_SIZEOF_RESOURCE (acpi_resource_start_dpf);
+       u8                              *buffer = byte_stream_buffer;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       u8                              temp8 = 0;
+       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_start_dpf);
 
 
        ACPI_FUNCTION_TRACE ("rs_start_depend_fns_resource");
@@ -435,13 +435,13 @@ acpi_rs_start_depend_fns_resource (
 
 acpi_status
 acpi_rs_end_depend_fns_resource (
-       u8                      *byte_stream_buffer,
-       acpi_size               *bytes_consumed,
-       u8                      **output_buffer,
-       acpi_size               *structure_size)
+       u8                              *byte_stream_buffer,
+       acpi_size                       *bytes_consumed,
+       u8                              **output_buffer,
+       acpi_size                       *structure_size)
 {
-       acpi_resource           *output_struct = (void *) *output_buffer;
-       acpi_size               struct_size = ACPI_RESOURCE_LENGTH;
+       struct acpi_resource            *output_struct = (void *) *output_buffer;
+       acpi_size                       struct_size = ACPI_RESOURCE_LENGTH;
 
 
        ACPI_FUNCTION_TRACE ("rs_end_depend_fns_resource");
@@ -489,12 +489,12 @@ acpi_rs_end_depend_fns_resource (
 
 acpi_status
 acpi_rs_start_depend_fns_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
-       u8                      temp8 = 0;
+       u8                              *buffer = *output_buffer;
+       u8                              temp8 = 0;
 
 
        ACPI_FUNCTION_TRACE ("rs_start_depend_fns_stream");
@@ -553,11 +553,11 @@ acpi_rs_start_depend_fns_stream (
 
 acpi_status
 acpi_rs_end_depend_fns_stream (
-       acpi_resource           *linked_list,
-       u8                      **output_buffer,
-       acpi_size               *bytes_consumed)
+       struct acpi_resource            *linked_list,
+       u8                              **output_buffer,
+       acpi_size                       *bytes_consumed)
 {
-       u8                      *buffer = *output_buffer;
+       u8                              *buffer = *output_buffer;
 
 
        ACPI_FUNCTION_TRACE ("rs_end_depend_fns_stream");
index 5460d64..fb61e73 100644 (file)
@@ -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
 
 acpi_status
 acpi_rs_get_prt_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer)
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("rs_get_prt_method_data");
@@ -105,11 +105,11 @@ acpi_rs_get_prt_method_data (
 
 acpi_status
 acpi_rs_get_crs_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer)
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("rs_get_crs_method_data");
@@ -159,11 +159,11 @@ acpi_rs_get_crs_method_data (
 
 acpi_status
 acpi_rs_get_prs_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *ret_buffer)
+       acpi_handle                     handle,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("rs_get_prs_method_data");
@@ -213,12 +213,12 @@ acpi_rs_get_prs_method_data (
 
 acpi_status
 acpi_rs_set_srs_method_data (
-       acpi_handle             handle,
-       acpi_buffer             *in_buffer)
+       acpi_handle                     handle,
+       struct acpi_buffer              *in_buffer)
 {
-       acpi_operand_object     *params[2];
-       acpi_status             status;
-       acpi_buffer             buffer;
+       union acpi_operand_object       *params[2];
+       acpi_status                     status;
+       struct acpi_buffer              buffer;
 
 
        ACPI_FUNCTION_TRACE ("rs_set_srs_method_data");
index 34243f1..69835b4 100644 (file)
@@ -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
 
 acpi_status
 acpi_get_irq_routing_table (
-       acpi_handle             device_handle,
-       acpi_buffer             *ret_buffer)
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_irq_routing_table ");
@@ -110,10 +110,10 @@ acpi_get_irq_routing_table (
 
 acpi_status
 acpi_get_current_resources (
-       acpi_handle             device_handle,
-       acpi_buffer             *ret_buffer)
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_current_resources");
@@ -162,10 +162,10 @@ acpi_get_current_resources (
 
 acpi_status
 acpi_get_possible_resources (
-       acpi_handle             device_handle,
-       acpi_buffer             *ret_buffer)
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_possible_resources");
@@ -211,10 +211,10 @@ acpi_get_possible_resources (
 
 acpi_status
 acpi_set_current_resources (
-       acpi_handle             device_handle,
-       acpi_buffer             *in_buffer)
+       acpi_handle                     device_handle,
+       struct acpi_buffer              *in_buffer)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_set_current_resources");
index bc00a36..03bf4ac 100644 (file)
@@ -187,23 +187,23 @@ acpi_bus_match (
        struct acpi_driver      *driver)
 {
        int error = 0;
-       acpi_buffer     buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
 
        if (device->flags.hardware_id)
                if (strstr(driver->ids, device->pnp.hardware_id))
                        goto Done;
 
        if (device->flags.compatible_ids) {
-               acpi_status     status = AE_OK;
-               acpi_object     *object = NULL;
-               char            cid[256] = {};
+               acpi_status             status = AE_OK;
+               union acpi_object       *object = NULL;
+               char                    cid[256] = {};
 
                status = acpi_evaluate_object(device->handle, "_CID", NULL, 
                        &buffer);
                if (ACPI_FAILURE(status) || !buffer.pointer)
                        return -ENOENT;
 
-               object = (acpi_object *) buffer.pointer;
+               object = (union acpi_object *) buffer.pointer;
 
                switch (object->type) {
                case ACPI_TYPE_INTEGER:
@@ -480,7 +480,7 @@ acpi_bus_get_flags (
 static void acpi_device_get_busid(struct acpi_device * device, acpi_handle handle, int type)
 {
        char                    bus_id[5] = {'?',0};
-       acpi_buffer             buffer = {sizeof(bus_id), bus_id};
+       struct acpi_buffer      buffer = {sizeof(bus_id), bus_id};
        int                     i = 0;
 
        /*
@@ -516,7 +516,7 @@ static void acpi_device_get_busid(struct acpi_device * device, acpi_handle handl
 static void acpi_device_set_id(struct acpi_device * device, struct acpi_device * parent,
                               acpi_handle handle, int type)
 {
-       acpi_device_info        info;
+       struct acpi_device_info info;
        char                    *hid = NULL;
        char                    *uid = NULL;
        acpi_status             status;
index 287044f..f96ce34 100644 (file)
@@ -91,7 +91,7 @@ acpi_system_read_dsdt (
        loff_t                  *ppos)
 {
        acpi_status             status = AE_OK;
-       acpi_buffer             dsdt = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_buffer      dsdt = {ACPI_ALLOCATE_BUFFER, NULL};
        void                    *data = 0;
        size_t                  size = 0;
 
@@ -134,7 +134,7 @@ acpi_system_read_fadt (
        loff_t                  *ppos)
 {
        acpi_status             status = AE_OK;
-       acpi_buffer             fadt = {ACPI_ALLOCATE_BUFFER, NULL};
+       struct acpi_buffer      fadt = {ACPI_ALLOCATE_BUFFER, NULL};
        void                    *data = 0;
        size_t                  size = 0;
 
index b5e8294..70532e6 100644 (file)
@@ -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
 
 u32
 acpi_tb_get_table_count (
-       rsdp_descriptor         *RSDP,
-       acpi_table_header       *RSDT)
+       struct rsdp_descriptor          *RSDP,
+       struct acpi_table_header        *RSDT)
 {
-       u32                     pointer_size;
+       u32                             pointer_size;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -73,7 +73,7 @@ acpi_tb_get_table_count (
         * pointers contained within the RSDT/XSDT.  The size of the pointers
         * is architecture-dependent.
         */
-       return ((RSDT->length - sizeof (acpi_table_header)) / pointer_size);
+       return ((RSDT->length - sizeof (struct acpi_table_header)) / pointer_size);
 }
 
 
@@ -91,11 +91,11 @@ acpi_tb_get_table_count (
 
 acpi_status
 acpi_tb_convert_to_xsdt (
-       acpi_table_desc         *table_info)
+       struct acpi_table_desc          *table_info)
 {
-       acpi_size               table_size;
-       u32                     i;
-       xsdt_descriptor         *new_table;
+       acpi_size                       table_size;
+       u32                             i;
+       XSDT_DESCRIPTOR         *new_table;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -104,7 +104,7 @@ acpi_tb_convert_to_xsdt (
        /* Compute size of the converted XSDT */
 
        table_size = ((acpi_size) acpi_gbl_rsdt_table_count * sizeof (u64)) +
-                         sizeof (acpi_table_header);
+                         sizeof (struct acpi_table_header);
 
        /* Allocate an XSDT */
 
@@ -115,7 +115,7 @@ acpi_tb_convert_to_xsdt (
 
        /* Copy the header and set the length */
 
-       ACPI_MEMCPY (new_table, table_info->pointer, sizeof (acpi_table_header));
+       ACPI_MEMCPY (new_table, table_info->pointer, sizeof (struct acpi_table_header));
        new_table->header.length = (u32) table_size;
 
        /* Copy the table pointers */
@@ -123,11 +123,11 @@ acpi_tb_convert_to_xsdt (
        for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
                if (acpi_gbl_RSDP->revision < 2) {
                        ACPI_STORE_ADDRESS (new_table->table_offset_entry[i],
-                               ((RSDT_DESCRIPTOR_REV1 *) table_info->pointer)->table_offset_entry[i]);
+                               ((struct rsdt_descriptor_rev1 *) table_info->pointer)->table_offset_entry[i]);
                }
                else {
                        new_table->table_offset_entry[i] =
-                               ((xsdt_descriptor *) table_info->pointer)->table_offset_entry[i];
+                               ((XSDT_DESCRIPTOR *) table_info->pointer)->table_offset_entry[i];
                }
        }
 
@@ -137,7 +137,7 @@ acpi_tb_convert_to_xsdt (
 
        /* Point the table descriptor to the new table */
 
-       table_info->pointer     = (acpi_table_header *) new_table;
+       table_info->pointer     = (struct acpi_table_header *) new_table;
        table_info->length      = table_size;
        table_info->allocation  = ACPI_MEM_ALLOCATED;
 
@@ -160,8 +160,8 @@ acpi_tb_convert_to_xsdt (
 
 static void
 acpi_tb_convert_fadt1 (
-       fadt_descriptor_rev2   *local_fadt,
-       fadt_descriptor_rev1   *original_fadt)
+       struct fadt_descriptor_rev2    *local_fadt,
+       struct fadt_descriptor_rev1    *original_fadt)
 {
 
 
@@ -174,7 +174,7 @@ acpi_tb_convert_fadt1 (
         * The 2.0 table is an extension of the 1.0 table, so the entire 1.0
         * table can be copied first, then expand some fields to 64 bits.
         */
-       ACPI_MEMCPY (local_fadt, original_fadt, sizeof (fadt_descriptor_rev1));
+       ACPI_MEMCPY (local_fadt, original_fadt, sizeof (struct fadt_descriptor_rev1));
 
        /* Convert table pointers to 64-bit fields */
 
@@ -242,13 +242,13 @@ acpi_tb_convert_fadt1 (
 
 static void
 acpi_tb_convert_fadt2 (
-       fadt_descriptor_rev2   *local_fadt,
-       fadt_descriptor_rev2   *original_fadt)
+       struct fadt_descriptor_rev2    *local_fadt,
+       struct fadt_descriptor_rev2    *original_fadt)
 {
 
        /* We have an ACPI 2.0 FADT but we must copy it to our local buffer */
 
-       ACPI_MEMCPY (local_fadt, original_fadt, sizeof (fadt_descriptor_rev2));
+       ACPI_MEMCPY (local_fadt, original_fadt, sizeof (struct fadt_descriptor_rev2));
 
        /*
         * "X" fields are optional extensions to the original V1.0 fields, so
@@ -323,8 +323,8 @@ acpi_tb_convert_fadt2 (
 acpi_status
 acpi_tb_convert_table_fadt (void)
 {
-       fadt_descriptor_rev2   *local_fadt;
-       acpi_table_desc        *table_desc;
+       struct fadt_descriptor_rev2    *local_fadt;
+       struct acpi_table_desc         *table_desc;
 
 
        ACPI_FUNCTION_TRACE ("tb_convert_table_fadt");
@@ -334,7 +334,7 @@ acpi_tb_convert_table_fadt (void)
         * acpi_gbl_FADT is valid
         * Allocate and zero the 2.0 FADT buffer
         */
-       local_fadt = ACPI_MEM_CALLOCATE (sizeof (fadt_descriptor_rev2));
+       local_fadt = ACPI_MEM_CALLOCATE (sizeof (struct fadt_descriptor_rev2));
        if (local_fadt == NULL) {
                return_ACPI_STATUS (AE_NO_MEMORY);
        }
@@ -343,13 +343,13 @@ acpi_tb_convert_table_fadt (void)
         * FADT length and version validation.  The table must be at least as
         * long as the version 1.0 FADT
         */
-       if (acpi_gbl_FADT->header.length < sizeof (fadt_descriptor_rev1)) {
+       if (acpi_gbl_FADT->header.length < sizeof (struct fadt_descriptor_rev1)) {
                ACPI_REPORT_ERROR (("Invalid FADT table length: 0x%X\n", acpi_gbl_FADT->header.length));
                return_ACPI_STATUS (AE_INVALID_TABLE_LENGTH);
        }
 
        if (acpi_gbl_FADT->header.revision >= FADT2_REVISION_ID) {
-               if (acpi_gbl_FADT->header.length < sizeof (fadt_descriptor_rev2)) {
+               if (acpi_gbl_FADT->header.length < sizeof (struct fadt_descriptor_rev2)) {
                        /* Length is too short to be a V2.0 table */
 
                        ACPI_REPORT_WARNING (("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n",
@@ -382,9 +382,9 @@ acpi_tb_convert_table_fadt (void)
 
        /* Install the new table */
 
-       table_desc->pointer     = (acpi_table_header *) acpi_gbl_FADT;
+       table_desc->pointer     = (struct acpi_table_header *) acpi_gbl_FADT;
        table_desc->allocation  = ACPI_MEM_ALLOCATED;
-       table_desc->length      = sizeof (fadt_descriptor_rev2);
+       table_desc->length      = sizeof (struct fadt_descriptor_rev2);
 
        /* Dump the entire FADT */
 
@@ -412,7 +412,7 @@ acpi_tb_convert_table_fadt (void)
 
 acpi_status
 acpi_tb_build_common_facs (
-       acpi_table_desc         *table_info)
+       struct acpi_table_desc          *table_info)
 {
 
        ACPI_FUNCTION_TRACE ("tb_build_common_facs");
index 7fac9e9..6f5ac92 100644 (file)
@@ -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
 
 acpi_status
 acpi_tb_get_table (
-       acpi_pointer            *address,
-       acpi_table_desc         *table_info)
+       struct acpi_pointer             *address,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_status             status;
-       acpi_table_header       header;
+       acpi_status                     status;
+       struct acpi_table_header        header;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_table");
@@ -97,11 +97,11 @@ acpi_tb_get_table (
 
 acpi_status
 acpi_tb_get_table_header (
-       acpi_pointer            *address,
-       acpi_table_header       *return_header)
+       struct acpi_pointer             *address,
+       struct acpi_table_header        *return_header)
 {
-       acpi_status             status = AE_OK;
-       acpi_table_header       *header = NULL;
+       acpi_status                     status = AE_OK;
+       struct acpi_table_header        *header = NULL;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_table_header");
@@ -117,7 +117,7 @@ acpi_tb_get_table_header (
 
                /* Pointer matches processor mode, copy the header */
 
-               ACPI_MEMCPY (return_header, address->pointer.logical, sizeof (acpi_table_header));
+               ACPI_MEMCPY (return_header, address->pointer.logical, sizeof (struct acpi_table_header));
                break;
 
 
@@ -125,20 +125,20 @@ acpi_tb_get_table_header (
 
                /* Create a logical address for the physical pointer*/
 
-               status = acpi_os_map_memory (address->pointer.physical, sizeof (acpi_table_header),
+               status = acpi_os_map_memory (address->pointer.physical, sizeof (struct acpi_table_header),
                                  (void **) &header);
                if (ACPI_FAILURE (status)) {
                        ACPI_REPORT_ERROR (("Could not map memory at %8.8X%8.8X for length %X\n",
                                ACPI_HIDWORD (address->pointer.physical),
                                ACPI_LODWORD (address->pointer.physical),
-                               sizeof (acpi_table_header)));
+                               sizeof (struct acpi_table_header)));
                        return_ACPI_STATUS (status);
                }
 
                /* Copy header and delete mapping */
 
-               ACPI_MEMCPY (return_header, header, sizeof (acpi_table_header));
-               acpi_os_unmap_memory (header, sizeof (acpi_table_header));
+               ACPI_MEMCPY (return_header, header, sizeof (struct acpi_table_header));
+               acpi_os_unmap_memory (header, sizeof (struct acpi_table_header));
                break;
 
 
@@ -175,11 +175,11 @@ acpi_tb_get_table_header (
 
 acpi_status
 acpi_tb_get_table_body (
-       acpi_pointer            *address,
-       acpi_table_header       *header,
-       acpi_table_desc         *table_info)
+       struct acpi_pointer             *address,
+       struct acpi_table_header        *header,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_table_body");
@@ -222,12 +222,12 @@ acpi_tb_get_table_body (
 
 acpi_status
 acpi_tb_table_override (
-       acpi_table_header       *header,
-       acpi_table_desc         *table_info)
+       struct acpi_table_header        *header,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_table_header       *new_table;
-       acpi_status             status;
-       acpi_pointer            address;
+       struct acpi_table_header        *new_table;
+       acpi_status                     status;
+       struct acpi_pointer             address;
 
 
        ACPI_FUNCTION_TRACE ("tb_table_override");
@@ -296,13 +296,13 @@ acpi_tb_table_override (
 
 acpi_status
 acpi_tb_get_this_table (
-       acpi_pointer            *address,
-       acpi_table_header       *header,
-       acpi_table_desc         *table_info)
+       struct acpi_pointer             *address,
+       struct acpi_table_header        *header,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_table_header       *full_table = NULL;
-       u8                      allocation;
-       acpi_status             status = AE_OK;
+       struct acpi_table_header        *full_table = NULL;
+       u8                              allocation;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_this_table");
@@ -413,12 +413,12 @@ acpi_tb_get_this_table (
 
 acpi_status
 acpi_tb_get_table_ptr (
-       acpi_table_type         table_type,
-       u32                     instance,
-       acpi_table_header       **table_ptr_loc)
+       acpi_table_type                 table_type,
+       u32                             instance,
+       struct acpi_table_header        **table_ptr_loc)
 {
-       acpi_table_desc         *table_desc;
-       u32                     i;
+       struct acpi_table_desc          *table_desc;
+       u32                             i;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_table_ptr");
index 6f4e494..bb93aff 100644 (file)
@@ -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
 
 acpi_status
 acpi_tb_get_primary_table (
-       acpi_pointer            *address,
-       acpi_table_desc         *table_info)
+       struct acpi_pointer             *address,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_status             status;
-       acpi_table_header       header;
+       acpi_status                     status;
+       struct acpi_table_header        header;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_primary_table");
@@ -72,7 +72,7 @@ acpi_tb_get_primary_table (
 
        /* Clear the table_info */
 
-       ACPI_MEMSET (table_info, 0, sizeof (acpi_table_desc));
+       ACPI_MEMSET (table_info, 0, sizeof (struct acpi_table_desc));
 
        /*
         * Check the table signature and make sure it is recognized.
@@ -113,12 +113,12 @@ acpi_tb_get_primary_table (
 
 acpi_status
 acpi_tb_get_secondary_table (
-       acpi_pointer            *address,
-       acpi_string             signature,
-       acpi_table_desc         *table_info)
+       struct acpi_pointer             *address,
+       acpi_string                     signature,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_status             status;
-       acpi_table_header       header;
+       acpi_status                     status;
+       struct acpi_table_header        header;
 
 
        ACPI_FUNCTION_TRACE_STR ("tb_get_secondary_table", signature);
@@ -186,10 +186,10 @@ acpi_status
 acpi_tb_get_required_tables (
        void)
 {
-       acpi_status             status = AE_OK;
-       u32                     i;
-       acpi_table_desc         table_info;
-       acpi_pointer            address;
+       acpi_status                     status = AE_OK;
+       u32                             i;
+       struct acpi_table_desc          table_info;
+       struct acpi_pointer             address;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_required_tables");
index e59ba8c..ada6eb0 100644 (file)
@@ -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
 
 acpi_status
 acpi_tb_match_signature (
-       char                    *signature,
-       acpi_table_desc         *table_info,
-       u8                      search_type)
+       char                            *signature,
+       struct acpi_table_desc          *table_info,
+       u8                              search_type)
 {
-       acpi_native_uint        i;
+       acpi_native_uint                i;
 
 
        ACPI_FUNCTION_TRACE ("tb_match_signature");
@@ -105,9 +105,9 @@ acpi_tb_match_signature (
 
 acpi_status
 acpi_tb_install_table (
-       acpi_table_desc         *table_info)
+       struct acpi_table_desc          *table_info)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
        ACPI_FUNCTION_TRACE ("tb_install_table");
 
@@ -159,11 +159,11 @@ acpi_tb_install_table (
 
 acpi_status
 acpi_tb_recognize_table (
-       acpi_table_desc         *table_info,
-       u8                      search_type)
+       struct acpi_table_desc          *table_info,
+       u8                              search_type)
 {
-       acpi_table_header       *table_header;
-       acpi_status             status;
+       struct acpi_table_header        *table_header;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("tb_recognize_table");
@@ -171,7 +171,7 @@ acpi_tb_recognize_table (
 
        /* Ensure that we have a valid table pointer */
 
-       table_header = (acpi_table_header *) table_info->pointer;
+       table_header = (struct acpi_table_header *) table_info->pointer;
        if (!table_header) {
                return_ACPI_STATUS (AE_BAD_PARAMETER);
        }
@@ -217,11 +217,11 @@ acpi_tb_recognize_table (
 
 acpi_status
 acpi_tb_init_table_descriptor (
-       acpi_table_type         table_type,
-       acpi_table_desc         *table_info)
+       acpi_table_type                 table_type,
+       struct acpi_table_desc          *table_info)
 {
-       acpi_table_desc         *list_head;
-       acpi_table_desc         *table_desc;
+       struct acpi_table_desc          *list_head;
+       struct acpi_table_desc          *table_desc;
 
 
        ACPI_FUNCTION_TRACE_U32 ("tb_init_table_descriptor", table_type);
@@ -256,7 +256,7 @@ acpi_tb_init_table_descriptor (
                 * the new table in to the list of tables of this type.
                 */
                if (list_head->pointer) {
-                       table_desc = ACPI_MEM_CALLOCATE (sizeof (acpi_table_desc));
+                       table_desc = ACPI_MEM_CALLOCATE (sizeof (struct acpi_table_desc));
                        if (!table_desc) {
                                return_ACPI_STATUS (AE_NO_MEMORY);
                        }
@@ -289,7 +289,7 @@ acpi_tb_init_table_descriptor (
        table_desc->allocation          = table_info->allocation;
        table_desc->aml_start           = (u8 *) (table_desc->pointer + 1),
        table_desc->aml_length          = (u32) (table_desc->length -
-                        (u32) sizeof (acpi_table_header));
+                        (u32) sizeof (struct acpi_table_header));
        table_desc->table_id            = acpi_ut_allocate_owner_id (ACPI_OWNER_TYPE_TABLE);
        table_desc->loaded_into_namespace = FALSE;
 
@@ -325,7 +325,7 @@ acpi_tb_init_table_descriptor (
 void
 acpi_tb_delete_acpi_tables (void)
 {
-       acpi_table_type             type;
+       acpi_table_type                     type;
 
 
        /*
@@ -353,7 +353,7 @@ acpi_tb_delete_acpi_tables (void)
 
 void
 acpi_tb_delete_acpi_table (
-       acpi_table_type             type)
+       acpi_table_type                     type)
 {
 
        ACPI_FUNCTION_TRACE_U32 ("tb_delete_acpi_table", type);
@@ -420,11 +420,11 @@ acpi_tb_delete_acpi_table (
 
 void
 acpi_tb_free_acpi_tables_of_type (
-       acpi_table_desc         *list_head)
+       struct acpi_table_desc          *list_head)
 {
-       acpi_table_desc         *table_desc;
-       u32                     count;
-       u32                     i;
+       struct acpi_table_desc          *table_desc;
+       u32                             count;
+       u32                             i;
 
 
        ACPI_FUNCTION_TRACE_PTR ("tb_free_acpi_tables_of_type", list_head);
@@ -462,7 +462,7 @@ acpi_tb_free_acpi_tables_of_type (
 
 void
 acpi_tb_delete_single_table (
-       acpi_table_desc         *table_desc)
+       struct acpi_table_desc          *table_desc)
 {
 
        if (!table_desc) {
@@ -507,11 +507,11 @@ acpi_tb_delete_single_table (
  *
  ******************************************************************************/
 
-acpi_table_desc *
+struct acpi_table_desc *
 acpi_tb_uninstall_table (
-       acpi_table_desc         *table_desc)
+       struct acpi_table_desc          *table_desc)
 {
-       acpi_table_desc         *next_desc;
+       struct acpi_table_desc          *next_desc;
 
 
        ACPI_FUNCTION_TRACE_PTR ("acpi_tb_uninstall_table", table_desc);
index d93af66..ea104c0 100644 (file)
@@ -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
 
 acpi_status
 acpi_tb_verify_rsdp (
-       acpi_pointer            *address)
+       struct acpi_pointer             *address)
 {
-       acpi_table_desc         table_info;
-       acpi_status             status;
-       rsdp_descriptor         *rsdp;
+       struct acpi_table_desc          table_info;
+       acpi_status                     status;
+       struct rsdp_descriptor          *rsdp;
 
 
        ACPI_FUNCTION_TRACE ("tb_verify_rsdp");
@@ -65,7 +65,7 @@ acpi_tb_verify_rsdp (
                /*
                 * Obtain access to the RSDP structure
                 */
-               status = acpi_os_map_memory (address->pointer.physical, sizeof (rsdp_descriptor),
+               status = acpi_os_map_memory (address->pointer.physical, sizeof (struct rsdp_descriptor),
                                  (void **) &rsdp);
                if (ACPI_FAILURE (status)) {
                        return_ACPI_STATUS (status);
@@ -104,8 +104,8 @@ acpi_tb_verify_rsdp (
 
        /* The RSDP supplied is OK */
 
-       table_info.pointer     = ACPI_CAST_PTR (acpi_table_header, rsdp);
-       table_info.length      = sizeof (rsdp_descriptor);
+       table_info.pointer     = ACPI_CAST_PTR (struct acpi_table_header, rsdp);
+       table_info.length      = sizeof (struct rsdp_descriptor);
        table_info.allocation  = ACPI_MEM_MAPPED;
 
        /* Save the table pointers and allocation info */
@@ -117,7 +117,7 @@ acpi_tb_verify_rsdp (
 
        /* Save the RSDP in a global for easy access */
 
-       acpi_gbl_RSDP = ACPI_CAST_PTR (rsdp_descriptor, table_info.pointer);
+       acpi_gbl_RSDP = ACPI_CAST_PTR (struct rsdp_descriptor, table_info.pointer);
        return_ACPI_STATUS (status);
 
 
@@ -125,7 +125,7 @@ acpi_tb_verify_rsdp (
 cleanup:
 
        if (acpi_gbl_table_flags & ACPI_PHYSICAL_POINTER) {
-               acpi_os_unmap_memory (rsdp, sizeof (rsdp_descriptor));
+               acpi_os_unmap_memory (rsdp, sizeof (struct rsdp_descriptor));
        }
        return_ACPI_STATUS (status);
 }
@@ -146,7 +146,7 @@ cleanup:
 
 void
 acpi_tb_get_rsdt_address (
-       acpi_pointer            *out_address)
+       struct acpi_pointer             *out_address)
 {
 
        ACPI_FUNCTION_ENTRY ();
@@ -181,9 +181,9 @@ acpi_tb_get_rsdt_address (
 
 acpi_status
 acpi_tb_validate_rsdt (
-       acpi_table_header       *table_ptr)
+       struct acpi_table_header        *table_ptr)
 {
-       int                     no_match;
+       int                             no_match;
 
 
        ACPI_FUNCTION_NAME ("tb_validate_rsdt");
@@ -237,9 +237,9 @@ acpi_status
 acpi_tb_get_table_rsdt (
        void)
 {
-       acpi_table_desc         table_info;
-       acpi_status             status;
-       acpi_pointer            address;
+       struct acpi_table_desc          table_info;
+       acpi_status                     status;
+       struct acpi_pointer             address;
 
 
        ACPI_FUNCTION_TRACE ("tb_get_table_rsdt");
@@ -287,7 +287,7 @@ acpi_tb_get_table_rsdt (
                return_ACPI_STATUS (status);
        }
 
-       acpi_gbl_XSDT = (xsdt_descriptor *) table_info.pointer;
+       acpi_gbl_XSDT = (XSDT_DESCRIPTOR *) table_info.pointer;
 
        ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "XSDT located at %p\n", acpi_gbl_XSDT));
        return_ACPI_STATUS (status);
index 3e17a4f..584cc22 100644 (file)
@@ -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
 
 acpi_status
 acpi_tb_handle_to_object (
-       u16                     table_id,
-       acpi_table_desc         **table_desc)
+       u16                             table_id,
+       struct acpi_table_desc          **table_desc)
 {
-       u32                     i;
-       acpi_table_desc         *list_head;
+       u32                             i;
+       struct acpi_table_desc          *list_head;
 
 
        ACPI_FUNCTION_NAME ("tb_handle_to_object");
@@ -96,9 +96,9 @@ acpi_tb_handle_to_object (
 
 acpi_status
 acpi_tb_validate_table_header (
-       acpi_table_header       *table_header)
+       struct acpi_table_header        *table_header)
 {
-       acpi_name               signature;
+       acpi_name                       signature;
 
 
        ACPI_FUNCTION_NAME ("tb_validate_table_header");
@@ -106,7 +106,7 @@ acpi_tb_validate_table_header (
 
        /* Verify that this is a valid address */
 
-       if (!acpi_os_readable (table_header, sizeof (acpi_table_header))) {
+       if (!acpi_os_readable (table_header, sizeof (struct acpi_table_header))) {
                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                        "Cannot read table header at %p\n", table_header));
                return (AE_BAD_ADDRESS);
@@ -122,20 +122,20 @@ acpi_tb_validate_table_header (
 
                ACPI_REPORT_WARNING (("Invalid table signature found: [%4.4s]\n",
                        (char *) &signature));
-               ACPI_DUMP_BUFFER (table_header, sizeof (acpi_table_header));
+               ACPI_DUMP_BUFFER (table_header, sizeof (struct acpi_table_header));
                return (AE_BAD_SIGNATURE);
        }
 
        /* Validate the table length */
 
-       if (table_header->length < sizeof (acpi_table_header)) {
+       if (table_header->length < sizeof (struct acpi_table_header)) {
                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                        "Invalid length in table header %p name %4.4s\n",
                        table_header, (char *) &signature));
 
                ACPI_REPORT_WARNING (("Invalid table header length (0x%X) found\n",
                        (u32) table_header->length));
-               ACPI_DUMP_BUFFER (table_header, sizeof (acpi_table_header));
+               ACPI_DUMP_BUFFER (table_header, sizeof (struct acpi_table_header));
                return (AE_BAD_HEADER);
        }
 
@@ -158,10 +158,10 @@ acpi_tb_validate_table_header (
 
 acpi_status
 acpi_tb_verify_table_checksum (
-       acpi_table_header       *table_header)
+       struct acpi_table_header        *table_header)
 {
-       u8                      checksum;
-       acpi_status             status = AE_OK;
+       u8                              checksum;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("tb_verify_table_checksum");
@@ -198,12 +198,12 @@ acpi_tb_verify_table_checksum (
 
 u8
 acpi_tb_checksum (
-       void                    *buffer,
-       u32                     length)
+       void                            *buffer,
+       u32                             length)
 {
-       const u8                *limit;
-       const u8                *rover;
-       u8                      sum = 0;
+       const u8                        *limit;
+       const u8                        *rover;
+       u8                              sum = 0;
 
 
        if (buffer && length) {
index 572f948..f563028 100644 (file)
@@ -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,8 +49,8 @@
 acpi_status
 acpi_load_tables (void)
 {
-       acpi_pointer            rsdp_address;
-       acpi_status             status;
+       struct acpi_pointer             rsdp_address;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_load_tables");
@@ -136,11 +136,11 @@ error_exit:
 
 acpi_status
 acpi_load_table (
-       acpi_table_header       *table_ptr)
+       struct acpi_table_header        *table_ptr)
 {
-       acpi_status             status;
-       acpi_table_desc         table_info;
-       acpi_pointer            address;
+       acpi_status                     status;
+       struct acpi_table_desc          table_info;
+       struct acpi_pointer             address;
 
 
        ACPI_FUNCTION_TRACE ("acpi_load_table");
@@ -214,9 +214,9 @@ acpi_load_table (
 
 acpi_status
 acpi_unload_table (
-       acpi_table_type         table_type)
+       acpi_table_type                 table_type)
 {
-       acpi_table_desc         *list_head;
+       struct acpi_table_desc          *list_head;
 
 
        ACPI_FUNCTION_TRACE ("acpi_unload_table");
@@ -259,11 +259,11 @@ acpi_unload_table (
  *              Instance        - the non zero instance of the table, allows
  *                                support for multiple tables of the same type
  *                                see acpi_gbl_acpi_table_flag
- *              out_table_header - pointer to the acpi_table_header if successful
+ *              out_table_header - pointer to the struct acpi_table_header if successful
  *
  * DESCRIPTION: This function is called to get an ACPI table header.  The caller
  *              supplies an pointer to a data area sufficient to contain an ACPI
- *              acpi_table_header structure.
+ *              struct acpi_table_header structure.
  *
  *              The header contains a length field that can be used to determine
  *              the size of the buffer needed to contain the entire table.  This
@@ -274,12 +274,12 @@ acpi_unload_table (
 
 acpi_status
 acpi_get_table_header (
-       acpi_table_type         table_type,
-       u32                     instance,
-       acpi_table_header       *out_table_header)
+       acpi_table_type                 table_type,
+       u32                             instance,
+       struct acpi_table_header        *out_table_header)
 {
-       acpi_table_header       *tbl_ptr;
-       acpi_status             status;
+       struct acpi_table_header        *tbl_ptr;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_table_header");
@@ -318,7 +318,7 @@ acpi_get_table_header (
         * Copy the header to the caller's buffer
         */
        ACPI_MEMCPY ((void *) out_table_header, (void *) tbl_ptr,
-                        sizeof (acpi_table_header));
+                        sizeof (struct acpi_table_header));
 
        return_ACPI_STATUS (status);
 }
@@ -349,13 +349,13 @@ acpi_get_table_header (
 
 acpi_status
 acpi_get_table (
-       acpi_table_type         table_type,
-       u32                     instance,
-       acpi_buffer             *ret_buffer)
+       acpi_table_type                 table_type,
+       u32                             instance,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_table_header       *tbl_ptr;
-       acpi_status             status;
-       acpi_size               table_length;
+       struct acpi_table_header        *tbl_ptr;
+       acpi_status                     status;
+       acpi_size                       table_length;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_table");
@@ -402,7 +402,7 @@ acpi_get_table (
                /*
                 *  RSD PTR is the only "table" without a header
                 */
-               table_length = sizeof (rsdp_descriptor);
+               table_length = sizeof (struct rsdp_descriptor);
        }
        else {
                table_length = (acpi_size) tbl_ptr->length;
index fac9385..2f04110 100644 (file)
@@ -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
 
 acpi_status
 acpi_tb_find_table (
-       char                    *signature,
-       char                    *oem_id,
-       char                    *oem_table_id,
-       acpi_table_header       **table_ptr)
+       char                            *signature,
+       char                            *oem_id,
+       char                            *oem_table_id,
+       struct acpi_table_header        **table_ptr)
 {
-       acpi_status             status;
-       acpi_table_header       *table;
+       acpi_status                     status;
+       struct acpi_table_header        *table;
 
 
        ACPI_FUNCTION_TRACE ("tb_find_table");
@@ -112,20 +112,20 @@ acpi_tb_find_table (
 
 acpi_status
 acpi_get_firmware_table (
-       acpi_string             signature,
-       u32                     instance,
-       u32                     flags,
-       acpi_table_header       **table_pointer)
+       acpi_string                     signature,
+       u32                             instance,
+       u32                             flags,
+       struct acpi_table_header        **table_pointer)
 {
-       acpi_pointer            rsdp_address;
-       acpi_pointer            address;
-       acpi_status             status;
-       acpi_table_header       header;
-       acpi_table_desc         table_info;
-       acpi_table_desc         rsdt_info;
-       u32                     table_count;
-       u32                     i;
-       u32                     j;
+       struct acpi_pointer             rsdp_address;
+       struct acpi_pointer             address;
+       acpi_status                     status;
+       struct acpi_table_header        header;
+       struct acpi_table_desc          table_info;
+       struct acpi_table_desc          rsdt_info;
+       u32                             table_count;
+       u32                             i;
+       u32                             j;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_firmware_table");
@@ -159,7 +159,7 @@ acpi_get_firmware_table (
                /* Map and validate the RSDP */
 
                if ((flags & ACPI_MEMORY_MODE) == ACPI_LOGICAL_ADDRESSING) {
-                       status = acpi_os_map_memory (rsdp_address.pointer.physical, sizeof (rsdp_descriptor),
+                       status = acpi_os_map_memory (rsdp_address.pointer.physical, sizeof (struct rsdp_descriptor),
                                          (void **) &acpi_gbl_RSDP);
                        if (ACPI_FAILURE (status)) {
                                return_ACPI_STATUS (status);
@@ -227,7 +227,7 @@ acpi_get_firmware_table (
                }
                else {
                        address.pointer.value =
-                               ((xsdt_descriptor *) rsdt_info.pointer)->table_offset_entry[i];
+                               ((XSDT_DESCRIPTOR *) rsdt_info.pointer)->table_offset_entry[i];
                }
 
                /* Get the table header */
@@ -287,11 +287,11 @@ cleanup:
 
 acpi_status
 acpi_find_root_pointer (
-       u32                     flags,
-       acpi_pointer            *rsdp_address)
+       u32                             flags,
+       struct acpi_pointer             *rsdp_address)
 {
-       acpi_table_desc         table_info;
-       acpi_status             status;
+       struct acpi_table_desc          table_info;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_find_root_pointer");
@@ -327,11 +327,11 @@ acpi_find_root_pointer (
 
 u8 *
 acpi_tb_scan_memory_for_rsdp (
-       u8                      *start_address,
-       u32                     length)
+       u8                              *start_address,
+       u32                             length)
 {
-       u32                     offset;
-       u8                      *mem_rover;
+       u32                             offset;
+       u8                              *mem_rover;
 
 
        ACPI_FUNCTION_TRACE ("tb_scan_memory_for_rsdp");
@@ -384,13 +384,13 @@ acpi_tb_scan_memory_for_rsdp (
 
 acpi_status
 acpi_tb_find_rsdp (
-       acpi_table_desc         *table_info,
-       u32                     flags)
+       struct acpi_table_desc          *table_info,
+       u32                             flags)
 {
-       u8                      *table_ptr;
-       u8                      *mem_rover;
-       u64                     phys_addr;
-       acpi_status             status = AE_OK;
+       u8                              *table_ptr;
+       u8                              *mem_rover;
+       u64                             phys_addr;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("tb_find_rsdp");
index 536d8aa..a5386b0 100644 (file)
@@ -270,8 +270,8 @@ acpi_thermal_set_cooling_mode (
        int                     mode)
 {
        acpi_status             status = AE_OK;
-       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_handle             handle = NULL;
 
        ACPI_FUNCTION_TRACE("acpi_thermal_set_cooling_mode");
index 388e9ec..40eb512 100644 (file)
@@ -174,8 +174,8 @@ snscanf(const char* str, int n, const char* format, ...)
 static int
 write_acpi_int(const char* methodName, int val)
 {
-       acpi_object_list params;
-       acpi_object in_objs[1];
+       struct acpi_object_list params;
+       union acpi_object in_objs[1];
        acpi_status status;
 
        params.count = sizeof(in_objs)/sizeof(in_objs[0]);
@@ -211,10 +211,10 @@ read_acpi_int(const char* methodName, int* pVal)
 static acpi_status
 hci_raw(const u32 in[HCI_WORDS], u32 out[HCI_WORDS])
 {
-       acpi_object_list params;
-       acpi_object in_objs[HCI_WORDS];
-       acpi_buffer results;
-       acpi_object out_objs[HCI_WORDS+1];
+       struct acpi_object_list params;
+       union acpi_object in_objs[HCI_WORDS];
+       struct acpi_buffer results;
+       union acpi_object out_objs[HCI_WORDS+1];
        acpi_status status;
        int i;
 
index 918e4f9..abedbd2 100644 (file)
@@ -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
 
 void
 acpi_ut_release_to_cache (
-       u32                     list_id,
-       void                    *object)
+       u32                             list_id,
+       void                            *object)
 {
-       acpi_memory_list        *cache_info;
+       struct acpi_memory_list         *cache_info;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -101,10 +101,10 @@ acpi_ut_release_to_cache (
 
 void *
 acpi_ut_acquire_from_cache (
-       u32                     list_id)
+       u32                             list_id)
 {
-       acpi_memory_list        *cache_info;
-       void                    *object;
+       struct acpi_memory_list         *cache_info;
+       void                            *object;
 
 
        ACPI_FUNCTION_NAME ("ut_acquire_from_cache");
@@ -173,10 +173,10 @@ acpi_ut_acquire_from_cache (
 
 void
 acpi_ut_delete_generic_cache (
-       u32                     list_id)
+       u32                             list_id)
 {
-       acpi_memory_list        *cache_info;
-       char                    *next;
+       struct acpi_memory_list         *cache_info;
+       char                            *next;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -203,13 +203,13 @@ acpi_ut_delete_generic_cache (
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Perform parameter validation checks on an acpi_buffer
+ * DESCRIPTION: Perform parameter validation checks on an struct acpi_buffer
  *
  ******************************************************************************/
 
 acpi_status
 acpi_ut_validate_buffer (
-       acpi_buffer             *buffer)
+       struct acpi_buffer              *buffer)
 {
 
        /* Obviously, the structure pointer must be valid */
@@ -252,10 +252,10 @@ acpi_ut_validate_buffer (
 
 acpi_status
 acpi_ut_initialize_buffer (
-       acpi_buffer             *buffer,
-       acpi_size               required_length)
+       struct acpi_buffer              *buffer,
+       acpi_size                       required_length)
 {
-       acpi_status             status = AE_OK;
+       acpi_status                     status = AE_OK;
 
 
        switch (buffer->length) {
@@ -329,12 +329,12 @@ acpi_ut_initialize_buffer (
 
 void *
 acpi_ut_allocate (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       void                    *allocation;
+       void                            *allocation;
 
 
        ACPI_FUNCTION_TRACE_U32 ("ut_allocate", size);
@@ -379,12 +379,12 @@ acpi_ut_allocate (
 
 void *
 acpi_ut_callocate (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       void                    *allocation;
+       void                            *allocation;
 
 
        ACPI_FUNCTION_TRACE_U32 ("ut_callocate", size);
@@ -444,16 +444,16 @@ acpi_ut_callocate (
 
 void *
 acpi_ut_allocate_and_track (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       acpi_debug_mem_block    *allocation;
-       acpi_status             status;
+       struct acpi_debug_mem_block     *allocation;
+       acpi_status                     status;
 
 
-       allocation = acpi_ut_allocate (size + sizeof (acpi_debug_mem_block), component,
+       allocation = acpi_ut_allocate (size + sizeof (struct acpi_debug_mem_block), component,
                          module, line);
        if (!allocation) {
                return (NULL);
@@ -490,16 +490,16 @@ acpi_ut_allocate_and_track (
 
 void *
 acpi_ut_callocate_and_track (
-       acpi_size               size,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       acpi_size                       size,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       acpi_debug_mem_block    *allocation;
-       acpi_status             status;
+       struct acpi_debug_mem_block     *allocation;
+       acpi_status                     status;
 
 
-       allocation = acpi_ut_callocate (size + sizeof (acpi_debug_mem_block), component,
+       allocation = acpi_ut_callocate (size + sizeof (struct acpi_debug_mem_block), component,
                          module, line);
        if (!allocation) {
                /* Report allocation error */
@@ -540,13 +540,13 @@ acpi_ut_callocate_and_track (
 
 void
 acpi_ut_free_and_track (
-       void                    *allocation,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       void                            *allocation,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       acpi_debug_mem_block    *debug_block;
-       acpi_status             status;
+       struct acpi_debug_mem_block     *debug_block;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_free", allocation);
@@ -559,8 +559,8 @@ acpi_ut_free_and_track (
                return_VOID;
        }
 
-       debug_block = ACPI_CAST_PTR (acpi_debug_mem_block,
-                         (((char *) allocation) - sizeof (acpi_debug_mem_header)));
+       debug_block = ACPI_CAST_PTR (struct acpi_debug_mem_block,
+                         (((char *) allocation) - sizeof (struct acpi_debug_mem_header)));
 
        acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].total_freed++;
        acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].current_total_size -= debug_block->size;
@@ -592,12 +592,12 @@ acpi_ut_free_and_track (
  *
  ******************************************************************************/
 
-acpi_debug_mem_block *
+struct acpi_debug_mem_block *
 acpi_ut_find_allocation (
-       u32                     list_id,
-       void                    *allocation)
+       u32                             list_id,
+       void                            *allocation)
 {
-       acpi_debug_mem_block    *element;
+       struct acpi_debug_mem_block     *element;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -642,17 +642,17 @@ acpi_ut_find_allocation (
 
 acpi_status
 acpi_ut_track_allocation (
-       u32                     list_id,
-       acpi_debug_mem_block    *allocation,
-       acpi_size               size,
-       u8                      alloc_type,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       u32                             list_id,
+       struct acpi_debug_mem_block     *allocation,
+       acpi_size                       size,
+       u8                              alloc_type,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       acpi_memory_list        *mem_list;
-       acpi_debug_mem_block    *element;
-       acpi_status             status = AE_OK;
+       struct acpi_memory_list         *mem_list;
+       struct acpi_debug_mem_block     *element;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_track_allocation", allocation);
@@ -695,7 +695,7 @@ acpi_ut_track_allocation (
        /* Insert at list head */
 
        if (mem_list->list_head) {
-               ((acpi_debug_mem_block *)(mem_list->list_head))->previous = allocation;
+               ((struct acpi_debug_mem_block *)(mem_list->list_head))->previous = allocation;
        }
 
        allocation->next = mem_list->list_head;
@@ -727,14 +727,14 @@ unlock_and_exit:
 
 acpi_status
 acpi_ut_remove_allocation (
-       u32                     list_id,
-       acpi_debug_mem_block    *allocation,
-       u32                     component,
-       char                    *module,
-       u32                     line)
+       u32                             list_id,
+       struct acpi_debug_mem_block     *allocation,
+       u32                             component,
+       char                            *module,
+       u32                             line)
 {
-       acpi_memory_list        *mem_list;
-       acpi_status             status;
+       struct acpi_memory_list         *mem_list;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_remove_allocation");
@@ -800,7 +800,7 @@ acpi_ut_dump_allocation_info (
        void)
 {
 /*
-       acpi_memory_list        *mem_list;
+       struct acpi_memory_list         *mem_list;
 */
 
        ACPI_FUNCTION_TRACE ("ut_dump_allocation_info");
@@ -836,7 +836,7 @@ acpi_ut_dump_allocation_info (
        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
                          ("%30s: %4d (%3d Kb)\n", "Max Nodes",
                          acpi_gbl_max_concurrent_node_count,
-                         ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count * sizeof (acpi_namespace_node)))));
+                         ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count * sizeof (struct acpi_namespace_node)))));
 */
        return_VOID;
 }
@@ -857,12 +857,12 @@ acpi_ut_dump_allocation_info (
 
 void
 acpi_ut_dump_allocations (
-       u32                     component,
-       char                    *module)
+       u32                             component,
+       char                            *module)
 {
-       acpi_debug_mem_block    *element;
-       acpi_descriptor         *descriptor;
-       u32                     num_outstanding = 0;
+       struct acpi_debug_mem_block     *element;
+       union acpi_descriptor           *descriptor;
+       u32                             num_outstanding = 0;
 
 
        ACPI_FUNCTION_TRACE ("ut_dump_allocations");
@@ -881,7 +881,7 @@ acpi_ut_dump_allocations (
                        ((module == NULL) || (0 == ACPI_STRCMP (module, element->module)))) {
                        /* Ignore allocated objects that are in a cache */
 
-                       descriptor = ACPI_CAST_PTR (acpi_descriptor, &element->user_space);
+                       descriptor = ACPI_CAST_PTR (union acpi_descriptor, &element->user_space);
                        if (descriptor->descriptor_id != ACPI_DESC_TYPE_CACHED) {
                                acpi_os_printf ("%p Len %04X %9.9s-%d ",
                                                 descriptor, element->size, element->module,
index c31b087..3dcb31a 100644 (file)
@@ -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
 
 static acpi_status
 acpi_ut_copy_isimple_to_esimple (
-       acpi_operand_object     *internal_object,
-       acpi_object             *external_object,
-       u8                      *data_space,
-       acpi_size               *buffer_space_used)
+       union acpi_operand_object       *internal_object,
+       union acpi_object               *external_object,
+       u8                              *data_space,
+       acpi_size                       *buffer_space_used)
 {
-       acpi_status             status = AE_OK;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_isimple_to_esimple");
@@ -73,7 +73,7 @@ acpi_ut_copy_isimple_to_esimple (
 
        /* Always clear the external object */
 
-       ACPI_MEMSET (external_object, 0, sizeof (acpi_object));
+       ACPI_MEMSET (external_object, 0, sizeof (union acpi_object));
 
        /*
         * In general, the external object will be the same type as
@@ -177,24 +177,24 @@ acpi_ut_copy_isimple_to_esimple (
 
 acpi_status
 acpi_ut_copy_ielement_to_eelement (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context)
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context)
 {
-       acpi_status             status = AE_OK;
-       acpi_pkg_info           *info = (acpi_pkg_info *) context;
-       acpi_size               object_space;
-       u32                     this_index;
-       acpi_object             *target_object;
+       acpi_status                     status = AE_OK;
+       struct acpi_pkg_info            *info = (struct acpi_pkg_info *) context;
+       acpi_size                       object_space;
+       u32                             this_index;
+       union acpi_object               *target_object;
 
 
        ACPI_FUNCTION_ENTRY ();
 
 
        this_index   = state->pkg.index;
-       target_object = (acpi_object *)
-                         &((acpi_object *)(state->pkg.dest_object))->package.elements[this_index];
+       target_object = (union acpi_object *)
+                         &((union acpi_object *)(state->pkg.dest_object))->package.elements[this_index];
 
        switch (object_type) {
        case ACPI_COPY_TYPE_SIMPLE:
@@ -217,7 +217,7 @@ acpi_ut_copy_ielement_to_eelement (
                 */
                target_object->type             = ACPI_TYPE_PACKAGE;
                target_object->package.count    = source_object->package.count;
-               target_object->package.elements = ACPI_CAST_PTR (acpi_object, info->free_space);
+               target_object->package.elements = ACPI_CAST_PTR (union acpi_object, info->free_space);
 
                /*
                 * Pass the new package object back to the package walk routine
@@ -229,7 +229,7 @@ acpi_ut_copy_ielement_to_eelement (
                 * update the buffer length counter
                 */
                object_space = ACPI_ROUND_UP_TO_NATIVE_WORD (
-                                  (acpi_size) target_object->package.count * sizeof (acpi_object));
+                                  (acpi_size) target_object->package.count * sizeof (union acpi_object));
                break;
 
 
@@ -264,13 +264,13 @@ acpi_ut_copy_ielement_to_eelement (
 
 static acpi_status
 acpi_ut_copy_ipackage_to_epackage (
-       acpi_operand_object     *internal_object,
-       u8                      *buffer,
-       acpi_size               *space_used)
+       union acpi_operand_object       *internal_object,
+       u8                              *buffer,
+       acpi_size                       *space_used)
 {
-       acpi_object             *external_object;
-       acpi_status             status;
-       acpi_pkg_info           info;
+       union acpi_object               *external_object;
+       acpi_status                     status;
+       struct acpi_pkg_info            info;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_ipackage_to_epackage");
@@ -279,28 +279,28 @@ acpi_ut_copy_ipackage_to_epackage (
        /*
         * First package at head of the buffer
         */
-       external_object = ACPI_CAST_PTR (acpi_object, buffer);
+       external_object = ACPI_CAST_PTR (union acpi_object, buffer);
 
        /*
         * Free space begins right after the first package
         */
-       info.length      = ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object));
-       info.free_space  = buffer + ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object));
+       info.length      = ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
+       info.free_space  = buffer + ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
        info.object_space = 0;
        info.num_packages = 1;
 
        external_object->type            = ACPI_GET_OBJECT_TYPE (internal_object);
        external_object->package.count   = internal_object->package.count;
-       external_object->package.elements = ACPI_CAST_PTR (acpi_object, info.free_space);
+       external_object->package.elements = ACPI_CAST_PTR (union acpi_object, info.free_space);
 
        /*
         * Leave room for an array of ACPI_OBJECTS in the buffer
         * and move the free space past it
         */
        info.length    += (acpi_size) external_object->package.count *
-                        ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object));
+                        ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
        info.free_space += external_object->package.count *
-                        ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object));
+                        ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
 
        status = acpi_ut_walk_package_tree (internal_object, external_object,
                         acpi_ut_copy_ielement_to_eelement, &info);
@@ -326,10 +326,10 @@ acpi_ut_copy_ipackage_to_epackage (
 
 acpi_status
 acpi_ut_copy_iobject_to_eobject (
-       acpi_operand_object     *internal_object,
-       acpi_buffer             *ret_buffer)
+       union acpi_operand_object       *internal_object,
+       struct acpi_buffer              *ret_buffer)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_iobject_to_eobject");
@@ -348,15 +348,15 @@ acpi_ut_copy_iobject_to_eobject (
                 * Build a simple object (no nested objects)
                 */
                status = acpi_ut_copy_isimple_to_esimple (internal_object,
-                                 (acpi_object *) ret_buffer->pointer,
+                                 (union acpi_object *) ret_buffer->pointer,
                                  ((u8 *) ret_buffer->pointer +
-                                 ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object))),
+                                 ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object))),
                                  &ret_buffer->length);
                /*
                 * build simple does not include the object size in the length
                 * so we add it in here
                 */
-               ret_buffer->length += sizeof (acpi_object);
+               ret_buffer->length += sizeof (union acpi_object);
        }
 
        return_ACPI_STATUS (status);
@@ -381,10 +381,10 @@ acpi_ut_copy_iobject_to_eobject (
 
 acpi_status
 acpi_ut_copy_esimple_to_isimple (
-       acpi_object             *external_object,
-       acpi_operand_object     **ret_internal_object)
+       union acpi_object               *external_object,
+       union acpi_operand_object       **ret_internal_object)
 {
-       acpi_operand_object     *internal_object;
+       union acpi_operand_object       *internal_object;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_esimple_to_isimple");
@@ -488,17 +488,17 @@ acpi_ut_copy_esimple_to_isimple (
 
 static acpi_status
 acpi_ut_copy_epackage_to_ipackage (
-       acpi_operand_object     *internal_object,
-       u8                      *buffer,
-       u32                     *space_used)
+       union acpi_operand_object       *internal_object,
+       u8                              *buffer,
+       u32                             *space_used)
 {
-       u8                      *free_space;
-       acpi_object             *external_object;
-       u32                     length = 0;
-       u32                     this_index;
-       u32                     object_space = 0;
-       acpi_operand_object     *this_internal_obj;
-       acpi_object             *this_external_obj;
+       u8                              *free_space;
+       union acpi_object               *external_object;
+       u32                             length = 0;
+       u32                             this_index;
+       u32                             object_space = 0;
+       union acpi_operand_object       *this_internal_obj;
+       union acpi_object               *this_external_obj;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_epackage_to_ipackage");
@@ -507,23 +507,23 @@ acpi_ut_copy_epackage_to_ipackage (
        /*
         * First package at head of the buffer
         */
-       external_object = (acpi_object *)buffer;
+       external_object = (union acpi_object *)buffer;
 
        /*
         * Free space begins right after the first package
         */
-       free_space = buffer + sizeof(acpi_object);
+       free_space = buffer + sizeof(union acpi_object);
 
 
        external_object->type              = ACPI_GET_OBJECT_TYPE (internal_object);
        external_object->package.count     = internal_object->package.count;
-       external_object->package.elements  = (acpi_object *)free_space;
+       external_object->package.elements  = (union acpi_object *)free_space;
 
        /*
         * Build an array of ACPI_OBJECTS in the buffer
         * and move the free space past it
         */
-       free_space += external_object->package.count * sizeof(acpi_object);
+       free_space += external_object->package.count * sizeof(union acpi_object);
 
 
        /* Call walk_package */
@@ -548,10 +548,10 @@ acpi_ut_copy_epackage_to_ipackage (
 
 acpi_status
 acpi_ut_copy_eobject_to_iobject (
-       acpi_object             *external_object,
-       acpi_operand_object     **internal_object)
+       union acpi_object               *external_object,
+       union acpi_operand_object       **internal_object)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_eobject_to_iobject");
@@ -594,11 +594,11 @@ acpi_ut_copy_eobject_to_iobject (
 
 acpi_status
 acpi_ut_copy_simple_object (
-       acpi_operand_object     *source_desc,
-       acpi_operand_object     *dest_desc)
+       union acpi_operand_object       *source_desc,
+       union acpi_operand_object       *dest_desc)
 {
-       u16                     reference_count;
-       acpi_operand_object     *next_object;
+       u16                             reference_count;
+       union acpi_operand_object       *next_object;
 
 
        /* Save fields from destination that we don't want to overwrite */
@@ -609,7 +609,7 @@ acpi_ut_copy_simple_object (
        /* Copy the entire source object over the destination object*/
 
        ACPI_MEMCPY ((char *) dest_desc, (char *) source_desc,
-                         sizeof (acpi_operand_object));
+                         sizeof (union acpi_operand_object));
 
        /* Restore the saved fields */
 
@@ -685,22 +685,22 @@ acpi_ut_copy_simple_object (
 
 acpi_status
 acpi_ut_copy_ielement_to_ielement (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context)
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context)
 {
-       acpi_status             status = AE_OK;
-       u32                     this_index;
-       acpi_operand_object     **this_target_ptr;
-       acpi_operand_object     *target_object;
+       acpi_status                     status = AE_OK;
+       u32                             this_index;
+       union acpi_operand_object       **this_target_ptr;
+       union acpi_operand_object       *target_object;
 
 
        ACPI_FUNCTION_ENTRY ();
 
 
        this_index    = state->pkg.index;
-       this_target_ptr = (acpi_operand_object **)
+       this_target_ptr = (union acpi_operand_object **)
                           &state->pkg.dest_object->package.elements[this_index];
 
        switch (object_type) {
@@ -794,11 +794,11 @@ acpi_ut_copy_ielement_to_ielement (
 
 acpi_status
 acpi_ut_copy_ipackage_to_ipackage (
-       acpi_operand_object     *source_obj,
-       acpi_operand_object     *dest_obj,
-       acpi_walk_state         *walk_state)
+       union acpi_operand_object       *source_obj,
+       union acpi_operand_object       *dest_obj,
+       struct acpi_walk_state          *walk_state)
 {
-       acpi_status             status = AE_OK;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_ipackage_to_ipackage");
@@ -852,11 +852,11 @@ acpi_ut_copy_ipackage_to_ipackage (
 
 acpi_status
 acpi_ut_copy_iobject_to_iobject (
-       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_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("ut_copy_iobject_to_iobject");
index 8beff26..b601127 100644 (file)
@@ -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,7 +52,7 @@ void
 acpi_ut_init_stack_ptr_trace (
        void)
 {
-       u32                 current_sp;
+       u32                         current_sp;
 
 
        acpi_gbl_entry_stack_pointer = ACPI_PTR_DIFF (&current_sp, NULL);
@@ -75,7 +75,7 @@ void
 acpi_ut_track_stack_ptr (
        void)
 {
-       acpi_size           current_sp;
+       acpi_size                   current_sp;
 
 
        current_sp = ACPI_PTR_DIFF (&current_sp, NULL);
@@ -112,13 +112,13 @@ acpi_ut_track_stack_ptr (
 
 void  ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print (
-       u32                     requested_debug_level,
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       char                    *format,
+       u32                             requested_debug_level,
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       char                            *format,
        ...)
 {
-       u32                     thread_id;
+       u32                             thread_id;
        va_list                 args;
 
 
@@ -183,10 +183,10 @@ acpi_ut_debug_print (
 
 void  ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print_raw (
-       u32                     requested_debug_level,
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       char                    *format,
+       u32                             requested_debug_level,
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       char                            *format,
        ...)
 {
        va_list                 args;
@@ -221,8 +221,8 @@ acpi_ut_debug_print_raw (
 
 void
 acpi_ut_trace (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info)
 {
 
        acpi_gbl_nesting_level++;
@@ -253,9 +253,9 @@ acpi_ut_trace (
 
 void
 acpi_ut_trace_ptr (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       void                    *pointer)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       void                            *pointer)
 {
        acpi_gbl_nesting_level++;
        acpi_ut_track_stack_ptr ();
@@ -285,9 +285,9 @@ acpi_ut_trace_ptr (
 
 void
 acpi_ut_trace_str (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       char                    *string)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       char                            *string)
 {
 
        acpi_gbl_nesting_level++;
@@ -318,9 +318,9 @@ acpi_ut_trace_str (
 
 void
 acpi_ut_trace_u32 (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       u32                     integer)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       u32                             integer)
 {
 
        acpi_gbl_nesting_level++;
@@ -350,8 +350,8 @@ acpi_ut_trace_u32 (
 
 void
 acpi_ut_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info)
 {
 
        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
@@ -381,9 +381,9 @@ acpi_ut_exit (
 
 void
 acpi_ut_status_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       acpi_status             status)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       acpi_status                     status)
 {
 
        if (ACPI_SUCCESS (status)) {
@@ -421,9 +421,9 @@ acpi_ut_status_exit (
 
 void
 acpi_ut_value_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       acpi_integer            value)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       acpi_integer                    value)
 {
 
        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
@@ -454,9 +454,9 @@ acpi_ut_value_exit (
 
 void
 acpi_ut_ptr_exit (
-       u32                     line_number,
-       acpi_debug_print_info   *dbg_info,
-       u8                      *ptr)
+       u32                             line_number,
+       struct acpi_debug_print_info    *dbg_info,
+       u8                              *ptr)
 {
 
        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
@@ -485,15 +485,15 @@ acpi_ut_ptr_exit (
 
 void
 acpi_ut_dump_buffer (
-       u8                      *buffer,
-       u32                     count,
-       u32                     display,
-       u32                     component_id)
+       u8                              *buffer,
+       u32                             count,
+       u32                             display,
+       u32                             component_id)
 {
-       acpi_native_uint        i = 0;
-       acpi_native_uint        j;
-       u32                     temp32;
-       u8                      buf_char;
+       acpi_native_uint                i = 0;
+       acpi_native_uint                j;
+       u32                             temp32;
+       u8                              buf_char;
 
 
        /* Only dump the buffer if tracing is enabled */
index 22a5aa7..66916f2 100644 (file)
@@ -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
 
 void
 acpi_ut_delete_internal_obj (
-       acpi_operand_object     *object)
+       union acpi_operand_object       *object)
 {
-       void                    *obj_pointer = NULL;
-       acpi_operand_object     *handler_desc;
-       acpi_operand_object     *second_desc;
+       void                            *obj_pointer = NULL;
+       union acpi_operand_object       *handler_desc;
+       union acpi_operand_object       *second_desc;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_delete_internal_obj", object);
@@ -217,9 +217,9 @@ acpi_ut_delete_internal_obj (
 
 void
 acpi_ut_delete_internal_object_list (
-       acpi_operand_object     **obj_list)
+       union acpi_operand_object       **obj_list)
 {
-       acpi_operand_object     **internal_obj;
+       union acpi_operand_object       **internal_obj;
 
 
        ACPI_FUNCTION_TRACE ("ut_delete_internal_object_list");
@@ -253,11 +253,11 @@ acpi_ut_delete_internal_object_list (
 
 static void
 acpi_ut_update_ref_count (
-       acpi_operand_object     *object,
-       u32                     action)
+       union acpi_operand_object       *object,
+       u32                             action)
 {
-       u16                     count;
-       u16                     new_count;
+       u16                             count;
+       u16                             new_count;
 
 
        ACPI_FUNCTION_NAME ("ut_update_ref_count");
@@ -369,15 +369,15 @@ acpi_ut_update_ref_count (
 
 acpi_status
 acpi_ut_update_object_reference (
-       acpi_operand_object     *object,
-       u16                     action)
+       union acpi_operand_object       *object,
+       u16                             action)
 {
-       acpi_status             status;
-       u32                     i;
-       acpi_operand_object     *next;
-       acpi_operand_object     *new;
-       acpi_generic_state       *state_list = NULL;
-       acpi_generic_state       *state;
+       acpi_status                     status;
+       u32                             i;
+       union acpi_operand_object       *next;
+       union acpi_operand_object       *new;
+       union acpi_generic_state         *state_list = NULL;
+       union acpi_generic_state         *state;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_update_object_reference", object);
@@ -556,7 +556,7 @@ error_exit:
 
 void
 acpi_ut_add_reference (
-       acpi_operand_object     *object)
+       union acpi_operand_object       *object)
 {
 
        ACPI_FUNCTION_TRACE_PTR ("ut_add_reference", object);
@@ -591,7 +591,7 @@ acpi_ut_add_reference (
 
 void
 acpi_ut_remove_reference (
-       acpi_operand_object     *object)
+       union acpi_operand_object       *object)
 {
 
        ACPI_FUNCTION_TRACE_PTR ("ut_remove_reference", object);
index 11716dc..ce1e74c 100644 (file)
@@ -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
 
 acpi_status
 acpi_ut_evaluate_object (
-       acpi_namespace_node     *prefix_node,
-       char                    *path,
-       u32                     expected_return_btypes,
-       acpi_operand_object     **return_desc)
+       struct acpi_namespace_node      *prefix_node,
+       char                            *path,
+       u32                             expected_return_btypes,
+       union acpi_operand_object       **return_desc)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
-       u32                     return_btype;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
+       u32                             return_btype;
 
 
        ACPI_FUNCTION_TRACE ("ut_evaluate_object");
@@ -161,12 +161,12 @@ acpi_ut_evaluate_object (
 
 acpi_status
 acpi_ut_evaluate_numeric_object (
-       char                    *object_name,
-       acpi_namespace_node     *device_node,
-       acpi_integer            *address)
+       char                            *object_name,
+       struct acpi_namespace_node      *device_node,
+       acpi_integer                    *address)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_evaluate_numeric_object");
@@ -207,11 +207,11 @@ acpi_ut_evaluate_numeric_object (
 
 acpi_status
 acpi_ut_execute_HID (
-       acpi_namespace_node     *device_node,
-       acpi_device_id          *hid)
+       struct acpi_namespace_node      *device_node,
+       struct acpi_device_id           *hid)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_execute_HID");
@@ -259,11 +259,11 @@ acpi_ut_execute_HID (
 
 acpi_status
 acpi_ut_execute_CID (
-       acpi_namespace_node     *device_node,
-       acpi_device_id          *cid)
+       struct acpi_namespace_node      *device_node,
+       struct acpi_device_id           *cid)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_execute_CID");
@@ -333,11 +333,11 @@ acpi_ut_execute_CID (
 
 acpi_status
 acpi_ut_execute_UID (
-       acpi_namespace_node     *device_node,
-       acpi_device_id          *uid)
+       struct acpi_namespace_node      *device_node,
+       struct acpi_device_id           *uid)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_execute_UID");
@@ -385,11 +385,11 @@ acpi_ut_execute_UID (
 
 acpi_status
 acpi_ut_execute_STA (
-       acpi_namespace_node     *device_node,
-       u32                     *flags)
+       struct acpi_namespace_node      *device_node,
+       u32                             *flags)
 {
-       acpi_operand_object     *obj_desc;
-       acpi_status             status;
+       union acpi_operand_object       *obj_desc;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_execute_STA");
index fe69417..019d7e0 100644 (file)
@@ -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
 
 const char *
 acpi_format_exception (
-       acpi_status             status)
+       acpi_status                     status)
 {
-       const char              *exception = "UNKNOWN_STATUS_CODE";
-       acpi_status             sub_status;
+       const char                      *exception = "UNKNOWN_STATUS_CODE";
+       acpi_status                     sub_status;
 
 
        ACPI_FUNCTION_NAME ("format_exception");
@@ -125,34 +125,34 @@ unknown:
 /* Debug switch - level and trace mask */
 
 #ifdef ACPI_DEBUG_OUTPUT
-u32                         acpi_dbg_level = ACPI_DEBUG_DEFAULT;
+u32                                 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
 #else
-u32                         acpi_dbg_level = ACPI_NORMAL_DEFAULT;
+u32                                 acpi_dbg_level = ACPI_NORMAL_DEFAULT;
 #endif
 
 /* Debug switch - layer (component) mask */
 
-u32                         acpi_dbg_layer = ACPI_COMPONENT_DEFAULT;
-u32                         acpi_gbl_nesting_level = 0;
+u32                                 acpi_dbg_layer = ACPI_COMPONENT_DEFAULT;
+u32                                 acpi_gbl_nesting_level = 0;
 
 
 /* Debugger globals */
 
-u8                          acpi_gbl_db_terminate_threads = FALSE;
-u8                          acpi_gbl_abort_method = FALSE;
-u8                          acpi_gbl_method_executing = FALSE;
+u8                                  acpi_gbl_db_terminate_threads = FALSE;
+u8                                  acpi_gbl_abort_method = FALSE;
+u8                                  acpi_gbl_method_executing = FALSE;
 
 /* System flags */
 
-u32                         acpi_gbl_startup_flags = 0;
+u32                                 acpi_gbl_startup_flags = 0;
 
 /* System starts uninitialized */
 
-u8                          acpi_gbl_shutdown = TRUE;
+u8                                  acpi_gbl_shutdown = TRUE;
 
-const u8                    acpi_gbl_decode_to8bit [8] = {1,2,4,8,16,32,64,128};
+const u8                            acpi_gbl_decode_to8bit [8] = {1,2,4,8,16,32,64,128};
 
-const char                  *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT] = {
+const char                          *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT] = {
                          "\\_S0_",
                          "\\_S1_",
                          "\\_S2_",
@@ -179,7 +179,7 @@ const char                  *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT] = {
  *    during the initialization sequence.
  */
 
-const acpi_predefined_names     acpi_gbl_pre_defined_names[] =
+const struct acpi_predefined_names      acpi_gbl_pre_defined_names[] =
 { {"_GPE",    ACPI_TYPE_LOCAL_SCOPE,      NULL},
        {"_PR_",    ACPI_TYPE_LOCAL_SCOPE,      NULL},
        {"_SB_",    ACPI_TYPE_DEVICE,           NULL},
@@ -201,7 +201,7 @@ const acpi_predefined_names     acpi_gbl_pre_defined_names[] =
  * The table is indexed by values of acpi_object_type
  */
 
-const u8                        acpi_gbl_ns_properties[] =
+const u8                                acpi_gbl_ns_properties[] =
 {
        ACPI_NS_NORMAL,                     /* 00 Any              */
        ACPI_NS_NORMAL,                     /* 01 Number           */
@@ -238,7 +238,7 @@ const u8                        acpi_gbl_ns_properties[] =
 
 /* Hex to ASCII conversion table */
 
-static const char           acpi_gbl_hex_to_ascii[] =
+static const char                   acpi_gbl_hex_to_ascii[] =
                          {'0','1','2','3','4','5','6','7',
                                         '8','9','A','B','C','D','E','F'};
 
@@ -258,8 +258,8 @@ static const char           acpi_gbl_hex_to_ascii[] =
 
 char
 acpi_ut_hex_to_ascii_char (
-       acpi_integer            integer,
-       u32                     position)
+       acpi_integer                    integer,
+       u32                             position)
 {
 
        return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
@@ -280,10 +280,10 @@ acpi_ut_hex_to_ascii_char (
  ******************************************************************************/
 
 
-acpi_table_desc             acpi_gbl_acpi_tables[NUM_ACPI_TABLES];
+struct acpi_table_desc              acpi_gbl_acpi_tables[NUM_ACPI_TABLES];
 
 
-ACPI_TABLE_SUPPORT          acpi_gbl_acpi_table_data[NUM_ACPI_TABLES] =
+struct acpi_table_support           acpi_gbl_acpi_table_data[NUM_ACPI_TABLES] =
 {
        /***********    Name,   Signature, Global typed pointer     Signature size,      Type                  How many allowed?,    Contains valid AML? */
 
@@ -303,7 +303,7 @@ ACPI_TABLE_SUPPORT          acpi_gbl_acpi_table_data[NUM_ACPI_TABLES] =
  *
  ******************************************************************************/
 
-acpi_bit_register_info      acpi_gbl_bit_register_info[ACPI_NUM_BITREG] =
+struct acpi_bit_register_info       acpi_gbl_bit_register_info[ACPI_NUM_BITREG] =
 {
        /* Name                                     Parent Register             Register Bit Position                   Register Bit Mask       */
 
@@ -333,7 +333,7 @@ acpi_bit_register_info      acpi_gbl_bit_register_info[ACPI_NUM_BITREG] =
 };
 
 
-acpi_fixed_event_info       acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
+struct acpi_fixed_event_info        acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 {
        /* ACPI_EVENT_PMTIMER       */  {ACPI_BITREG_TIMER_STATUS,          ACPI_BITREG_TIMER_ENABLE,        ACPI_BITMASK_TIMER_STATUS,          ACPI_BITMASK_TIMER_ENABLE},
        /* ACPI_EVENT_GLOBAL        */  {ACPI_BITREG_GLOBAL_LOCK_STATUS,    ACPI_BITREG_GLOBAL_LOCK_ENABLE,  ACPI_BITMASK_GLOBAL_LOCK_STATUS,    ACPI_BITMASK_GLOBAL_LOCK_ENABLE},
@@ -356,7 +356,7 @@ acpi_fixed_event_info       acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 
 /* Region type decoding */
 
-const char        *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] =
+const char                *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] =
 {
        "system_memory",
        "system_iO",
@@ -371,7 +371,7 @@ const char        *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] =
 
 char *
 acpi_ut_get_region_name (
-       u8                      space_id)
+       u8                              space_id)
 {
 
        if (space_id >= ACPI_USER_REGION_BEGIN)
@@ -402,7 +402,7 @@ acpi_ut_get_region_name (
 
 /* Event type decoding */
 
-static const char        *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] =
+static const char                *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] =
 {
        "PM_Timer",
        "global_lock",
@@ -414,7 +414,7 @@ static const char        *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] =
 
 char *
 acpi_ut_get_event_name (
-       u32                     event_id)
+       u32                             event_id)
 {
 
        if (event_id > ACPI_EVENT_MAX)
@@ -447,10 +447,10 @@ acpi_ut_get_event_name (
  * indicatewhat type is actually going to be stored for this entry.
  */
 
-static const char           acpi_gbl_bad_type[] = "UNDEFINED";
+static const char                   acpi_gbl_bad_type[] = "UNDEFINED";
 #define TYPE_NAME_LENGTH    12                           /* Maximum length of each string */
 
-static const char           *acpi_gbl_ns_type_names[] = /* printable names of ACPI types */
+static const char                   *acpi_gbl_ns_type_names[] = /* printable names of ACPI types */
 {
        /* 00 */ "Untyped",
        /* 01 */ "Integer",
@@ -487,7 +487,7 @@ static const char           *acpi_gbl_ns_type_names[] = /* printable names of AC
 
 char *
 acpi_ut_get_type_name (
-       acpi_object_type        type)
+       acpi_object_type                type)
 {
 
        if (type > ACPI_TYPE_INVALID)
@@ -501,7 +501,7 @@ acpi_ut_get_type_name (
 
 char *
 acpi_ut_get_object_type_name (
-       acpi_operand_object     *obj_desc)
+       union acpi_operand_object       *obj_desc)
 {
 
        if (!obj_desc)
@@ -534,7 +534,7 @@ acpi_ut_get_object_type_name (
 
 char *
 acpi_ut_get_mutex_name (
-       u32                     mutex_id)
+       u32                             mutex_id)
 {
 
        if (mutex_id > MAX_MTX)
@@ -563,7 +563,7 @@ acpi_ut_get_mutex_name (
 
 u8
 acpi_ut_valid_object_type (
-       acpi_object_type        type)
+       acpi_object_type                type)
 {
 
        if (type > ACPI_TYPE_LOCAL_MAX)
@@ -589,9 +589,9 @@ acpi_ut_valid_object_type (
 
 acpi_owner_id
 acpi_ut_allocate_owner_id (
-       u32                     id_type)
+       u32                             id_type)
 {
-       acpi_owner_id           owner_id = 0xFFFF;
+       acpi_owner_id                   owner_id = 0xFFFF;
 
 
        ACPI_FUNCTION_TRACE ("ut_allocate_owner_id");
@@ -651,27 +651,27 @@ void
 acpi_ut_init_globals (
        void)
 {
-       u32                     i;
+       u32                             i;
 
 
        ACPI_FUNCTION_TRACE ("ut_init_globals");
 
        /* Memory allocation and cache lists */
 
-       ACPI_MEMSET (acpi_gbl_memory_lists, 0, sizeof (acpi_memory_list) * ACPI_NUM_MEM_LISTS);
+       ACPI_MEMSET (acpi_gbl_memory_lists, 0, sizeof (struct acpi_memory_list) * ACPI_NUM_MEM_LISTS);
 
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_STATE].link_offset      = (u16) ACPI_PTR_DIFF (&(((acpi_generic_state *) NULL)->common.next), NULL);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE].link_offset     = (u16) ACPI_PTR_DIFF (&(((acpi_parse_object *) NULL)->common.next), NULL);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE_EXT].link_offset = (u16) ACPI_PTR_DIFF (&(((acpi_parse_object *) NULL)->common.next), NULL);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_OPERAND].link_offset    = (u16) ACPI_PTR_DIFF (&(((acpi_operand_object *) NULL)->cache.next), NULL);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_WALK].link_offset       = (u16) ACPI_PTR_DIFF (&(((acpi_walk_state *) NULL)->next), NULL);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_STATE].link_offset      = (u16) ACPI_PTR_DIFF (&(((union acpi_generic_state *) NULL)->common.next), NULL);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE].link_offset     = (u16) ACPI_PTR_DIFF (&(((union acpi_parse_object *) NULL)->common.next), NULL);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE_EXT].link_offset = (u16) ACPI_PTR_DIFF (&(((union acpi_parse_object *) NULL)->common.next), NULL);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_OPERAND].link_offset    = (u16) ACPI_PTR_DIFF (&(((union acpi_operand_object *) NULL)->cache.next), NULL);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_WALK].link_offset       = (u16) ACPI_PTR_DIFF (&(((struct acpi_walk_state *) NULL)->next), NULL);
 
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].object_size     = sizeof (acpi_namespace_node);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_STATE].object_size      = sizeof (acpi_generic_state);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE].object_size     = sizeof (acpi_parse_obj_common);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE_EXT].object_size = sizeof (acpi_parse_obj_named);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_OPERAND].object_size    = sizeof (acpi_operand_object);
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_WALK].object_size       = sizeof (acpi_walk_state);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].object_size     = sizeof (struct acpi_namespace_node);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_STATE].object_size      = sizeof (union acpi_generic_state);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE].object_size     = sizeof (struct acpi_parse_obj_common);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE_EXT].object_size = sizeof (struct acpi_parse_obj_named);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_OPERAND].object_size    = sizeof (union acpi_operand_object);
+       acpi_gbl_memory_lists[ACPI_MEM_LIST_WALK].object_size       = sizeof (struct acpi_walk_state);
 
        acpi_gbl_memory_lists[ACPI_MEM_LIST_STATE].max_cache_depth  = ACPI_MAX_STATE_CACHE_DEPTH;
        acpi_gbl_memory_lists[ACPI_MEM_LIST_PSNODE].max_cache_depth = ACPI_MAX_PARSE_CACHE_DEPTH;
index def2980..a5f6e2d 100644 (file)
@@ -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,9 +48,9 @@
 
 static void
 acpi_ut_fadt_register_error (
-       char                    *register_name,
-       u32                     value,
-       acpi_size               offset)
+       char                            *register_name,
+       u32                             value,
+       acpi_size                       offset)
 {
 
        ACPI_REPORT_WARNING (
index aff2c6b..35fd17d 100644 (file)
@@ -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
 
 acpi_status
 acpi_ut_short_divide (
-       acpi_integer            *in_dividend,
-       u32                     divisor,
-       acpi_integer            *out_quotient,
-       u32                     *out_remainder)
+       acpi_integer                    *in_dividend,
+       u32                             divisor,
+       acpi_integer                    *out_quotient,
+       u32                             *out_remainder)
 {
-       uint64_overlay          dividend;
-       uint64_overlay          quotient;
-       u32                     remainder32;
+       union uint64_overlay            dividend;
+       union uint64_overlay            quotient;
+       u32                             remainder32;
 
 
        ACPI_FUNCTION_TRACE ("ut_short_divide");
@@ -115,20 +115,20 @@ acpi_ut_short_divide (
 
 acpi_status
 acpi_ut_divide (
-       acpi_integer            *in_dividend,
-       acpi_integer            *in_divisor,
-       acpi_integer            *out_quotient,
-       acpi_integer            *out_remainder)
+       acpi_integer                    *in_dividend,
+       acpi_integer                    *in_divisor,
+       acpi_integer                    *out_quotient,
+       acpi_integer                    *out_remainder)
 {
-       uint64_overlay          dividend;
-       uint64_overlay          divisor;
-       uint64_overlay          quotient;
-       uint64_overlay          remainder;
-       uint64_overlay          normalized_dividend;
-       uint64_overlay          normalized_divisor;
-       u32                     partial1;
-       uint64_overlay          partial2;
-       uint64_overlay          partial3;
+       union uint64_overlay            dividend;
+       union uint64_overlay            divisor;
+       union uint64_overlay            quotient;
+       union uint64_overlay            remainder;
+       union uint64_overlay            normalized_dividend;
+       union uint64_overlay            normalized_divisor;
+       u32                             partial1;
+       union uint64_overlay            partial2;
+       union uint64_overlay            partial3;
 
 
        ACPI_FUNCTION_TRACE ("ut_divide");
@@ -250,10 +250,10 @@ acpi_ut_divide (
 
 acpi_status
 acpi_ut_short_divide (
-       acpi_integer            *in_dividend,
-       u32                     divisor,
-       acpi_integer            *out_quotient,
-       u32                     *out_remainder)
+       acpi_integer                    *in_dividend,
+       u32                             divisor,
+       acpi_integer                    *out_quotient,
+       u32                             *out_remainder)
 {
 
        ACPI_FUNCTION_TRACE ("ut_short_divide");
@@ -280,10 +280,10 @@ acpi_ut_short_divide (
 
 acpi_status
 acpi_ut_divide (
-       acpi_integer            *in_dividend,
-       acpi_integer            *in_divisor,
-       acpi_integer            *out_quotient,
-       acpi_integer            *out_remainder)
+       acpi_integer                    *in_dividend,
+       acpi_integer                    *in_divisor,
+       acpi_integer                    *out_quotient,
+       acpi_integer                    *out_remainder)
 {
        ACPI_FUNCTION_TRACE ("ut_divide");
 
index 003aa4b..70a1efc 100644 (file)
@@ -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
 
 void
 acpi_ut_print_string (
-       char                    *string,
-       u8                      max_length)
+       char                            *string,
+       u8                              max_length)
 {
-       u32                     i;
+       u32                             i;
 
 
        if (!string) {
@@ -135,16 +135,16 @@ acpi_ut_print_string (
 
 u32
 acpi_ut_dword_byte_swap (
-       u32                     value)
+       u32                             value)
 {
        union {
-               u32                 value;
-               u8                  bytes[4];
+               u32                         value;
+               u8                          bytes[4];
        } out;
 
        union {
-               u32                 value;
-               u8                  bytes[4];
+               u32                         value;
+               u8                          bytes[4];
        } in;
 
 
@@ -179,7 +179,7 @@ acpi_ut_dword_byte_swap (
 
 void
 acpi_ut_set_integer_width (
-       u8                      revision)
+       u8                              revision)
 {
 
        if (revision <= 1) {
@@ -210,12 +210,12 @@ acpi_ut_set_integer_width (
 
 void
 acpi_ut_display_init_pathname (
-       u8                      type,
-       acpi_namespace_node     *obj_handle,
-       char                    *path)
+       u8                              type,
+       struct acpi_namespace_node      *obj_handle,
+       char                            *path)
 {
-       acpi_status             status;
-       acpi_buffer             buffer;
+       acpi_status                     status;
+       struct acpi_buffer              buffer;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -280,10 +280,10 @@ acpi_ut_display_init_pathname (
 
 u8
 acpi_ut_valid_acpi_name (
-       u32                     name)
+       u32                             name)
 {
-       char                    *name_ptr = (char *) &name;
-       u32                     i;
+       char                            *name_ptr = (char *) &name;
+       u32                             i;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -315,7 +315,7 @@ acpi_ut_valid_acpi_name (
 
 u8
 acpi_ut_valid_acpi_character (
-       char                    character)
+       char                            character)
 {
 
        ACPI_FUNCTION_ENTRY ();
@@ -344,15 +344,15 @@ acpi_ut_valid_acpi_character (
 
 acpi_status
 acpi_ut_strtoul64 (
-       char                    *string,
-       u32                     base,
-       acpi_integer            *ret_integer)
+       char                            *string,
+       u32                             base,
+       acpi_integer                    *ret_integer)
 {
-       u32                     index;
-       acpi_integer            return_value = 0;
-       acpi_status             status = AE_OK;
-       acpi_integer            dividend;
-       acpi_integer            quotient;
+       u32                             index;
+       acpi_integer                    return_value = 0;
+       acpi_status                     status = AE_OK;
+       acpi_integer                    dividend;
+       acpi_integer                    quotient;
 
 
        *ret_integer = 0;
@@ -486,9 +486,9 @@ error_exit:
 
 char *
 acpi_ut_strupr (
-       char                    *src_string)
+       char                            *src_string)
 {
-       char                    *string;
+       char                            *string;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -520,8 +520,8 @@ acpi_status
 acpi_ut_mutex_initialize (
        void)
 {
-       u32                     i;
-       acpi_status             status;
+       u32                             i;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ut_mutex_initialize");
@@ -557,7 +557,7 @@ void
 acpi_ut_mutex_terminate (
        void)
 {
-       u32                     i;
+       u32                             i;
 
 
        ACPI_FUNCTION_TRACE ("ut_mutex_terminate");
@@ -588,9 +588,9 @@ acpi_ut_mutex_terminate (
 
 acpi_status
 acpi_ut_create_mutex (
-       acpi_mutex_handle       mutex_id)
+       acpi_mutex_handle               mutex_id)
 {
-       acpi_status             status = AE_OK;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE_U32 ("ut_create_mutex", mutex_id);
@@ -625,9 +625,9 @@ acpi_ut_create_mutex (
 
 acpi_status
 acpi_ut_delete_mutex (
-       acpi_mutex_handle       mutex_id)
+       acpi_mutex_handle               mutex_id)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE_U32 ("ut_delete_mutex", mutex_id);
@@ -660,11 +660,11 @@ acpi_ut_delete_mutex (
 
 acpi_status
 acpi_ut_acquire_mutex (
-       acpi_mutex_handle       mutex_id)
+       acpi_mutex_handle               mutex_id)
 {
-       acpi_status             status;
-       u32                     i;
-       u32                     this_thread_id;
+       acpi_status                     status;
+       u32                             i;
+       u32                             this_thread_id;
 
 
        ACPI_FUNCTION_NAME ("ut_acquire_mutex");
@@ -738,11 +738,11 @@ acpi_ut_acquire_mutex (
 
 acpi_status
 acpi_ut_release_mutex (
-       acpi_mutex_handle       mutex_id)
+       acpi_mutex_handle               mutex_id)
 {
-       acpi_status             status;
-       u32                     i;
-       u32                     this_thread_id;
+       acpi_status                     status;
+       u32                             i;
+       u32                             this_thread_id;
 
 
        ACPI_FUNCTION_NAME ("ut_release_mutex");
@@ -824,11 +824,11 @@ acpi_ut_release_mutex (
 
 acpi_status
 acpi_ut_create_update_state_and_push (
-       acpi_operand_object     *object,
-       u16                     action,
-       acpi_generic_state      **state_list)
+       union acpi_operand_object       *object,
+       u16                             action,
+       union acpi_generic_state        **state_list)
 {
-       acpi_generic_state       *state;
+       union acpi_generic_state         *state;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -866,12 +866,12 @@ acpi_ut_create_update_state_and_push (
 
 acpi_status
 acpi_ut_create_pkg_state_and_push (
-       void                    *internal_object,
-       void                    *external_object,
-       u16                     index,
-       acpi_generic_state      **state_list)
+       void                            *internal_object,
+       void                            *external_object,
+       u16                             index,
+       union acpi_generic_state        **state_list)
 {
-       acpi_generic_state       *state;
+       union acpi_generic_state         *state;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -902,8 +902,8 @@ acpi_ut_create_pkg_state_and_push (
 
 void
 acpi_ut_push_generic_state (
-       acpi_generic_state      **list_head,
-       acpi_generic_state      *state)
+       union acpi_generic_state        **list_head,
+       union acpi_generic_state        *state)
 {
        ACPI_FUNCTION_TRACE ("ut_push_generic_state");
 
@@ -929,11 +929,11 @@ acpi_ut_push_generic_state (
  *
  ******************************************************************************/
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_pop_generic_state (
-       acpi_generic_state      **list_head)
+       union acpi_generic_state        **list_head)
 {
-       acpi_generic_state      *state;
+       union acpi_generic_state        *state;
 
 
        ACPI_FUNCTION_TRACE ("ut_pop_generic_state");
@@ -965,10 +965,10 @@ acpi_ut_pop_generic_state (
  *
  ******************************************************************************/
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_generic_state (void)
 {
-       acpi_generic_state      *state;
+       union acpi_generic_state        *state;
 
 
        ACPI_FUNCTION_ENTRY ();
@@ -999,11 +999,11 @@ acpi_ut_create_generic_state (void)
  *
  ******************************************************************************/
 
-acpi_thread_state *
+struct acpi_thread_state *
 acpi_ut_create_thread_state (
        void)
 {
-       acpi_generic_state      *state;
+       union acpi_generic_state        *state;
 
 
        ACPI_FUNCTION_TRACE ("ut_create_thread_state");
@@ -1021,7 +1021,7 @@ acpi_ut_create_thread_state (
        state->common.data_type = ACPI_DESC_TYPE_STATE_THREAD;
        state->thread.thread_id = acpi_os_get_thread_id ();
 
-       return_PTR ((acpi_thread_state *) state);
+       return_PTR ((struct acpi_thread_state *) state);
 }
 
 
@@ -1041,12 +1041,12 @@ acpi_ut_create_thread_state (
  *
  ******************************************************************************/
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_update_state (
-       acpi_operand_object     *object,
-       u16                     action)
+       union acpi_operand_object       *object,
+       u16                             action)
 {
-       acpi_generic_state      *state;
+       union acpi_generic_state        *state;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_create_update_state", object);
@@ -1083,13 +1083,13 @@ acpi_ut_create_update_state (
  *
  ******************************************************************************/
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_pkg_state (
-       void                    *internal_object,
-       void                    *external_object,
-       u16                     index)
+       void                            *internal_object,
+       void                            *external_object,
+       u16                             index)
 {
-       acpi_generic_state      *state;
+       union acpi_generic_state        *state;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_create_pkg_state", internal_object);
@@ -1105,7 +1105,7 @@ acpi_ut_create_pkg_state (
        /* Init fields specific to the update struct */
 
        state->common.data_type = ACPI_DESC_TYPE_STATE_PACKAGE;
-       state->pkg.source_object = (acpi_operand_object *) internal_object;
+       state->pkg.source_object = (union acpi_operand_object *) internal_object;
        state->pkg.dest_object  = external_object;
        state->pkg.index        = index;
        state->pkg.num_packages = 1;
@@ -1127,11 +1127,11 @@ acpi_ut_create_pkg_state (
  *
  ******************************************************************************/
 
-acpi_generic_state *
+union acpi_generic_state *
 acpi_ut_create_control_state (
        void)
 {
-       acpi_generic_state      *state;
+       union acpi_generic_state        *state;
 
 
        ACPI_FUNCTION_TRACE ("ut_create_control_state");
@@ -1168,7 +1168,7 @@ acpi_ut_create_control_state (
 
 void
 acpi_ut_delete_generic_state (
-       acpi_generic_state      *state)
+       union acpi_generic_state        *state)
 {
        ACPI_FUNCTION_TRACE ("ut_delete_generic_state");
 
@@ -1217,16 +1217,16 @@ acpi_ut_delete_generic_state_cache (
 
 acpi_status
 acpi_ut_walk_package_tree (
-       acpi_operand_object     *source_object,
-       void                    *target_object,
-       acpi_pkg_callback       walk_callback,
-       void                    *context)
+       union acpi_operand_object       *source_object,
+       void                            *target_object,
+       acpi_pkg_callback               walk_callback,
+       void                            *context)
 {
-       acpi_status             status = AE_OK;
-       acpi_generic_state      *state_list = NULL;
-       acpi_generic_state      *state;
-       u32                     this_index;
-       acpi_operand_object     *this_source_obj;
+       acpi_status                     status = AE_OK;
+       union acpi_generic_state        *state_list = NULL;
+       union acpi_generic_state        *state;
+       u32                             this_index;
+       union acpi_operand_object       *this_source_obj;
 
 
        ACPI_FUNCTION_TRACE ("ut_walk_package_tree");
@@ -1241,7 +1241,7 @@ acpi_ut_walk_package_tree (
                /* Get one element of the package */
 
                this_index    = state->pkg.index;
-               this_source_obj = (acpi_operand_object *)
+               this_source_obj = (union acpi_operand_object *)
                                  state->pkg.source_object->package.elements[this_index];
 
                /*
@@ -1334,11 +1334,11 @@ acpi_ut_walk_package_tree (
 
 u8
 acpi_ut_generate_checksum (
-       u8                      *buffer,
-       u32                     length)
+       u8                              *buffer,
+       u32                             length)
 {
-       u32                     i;
-       signed char             sum = 0;
+       u32                             i;
+       signed char                     sum = 0;
 
 
        for (i = 0; i < length; i++) {
@@ -1364,11 +1364,11 @@ acpi_ut_generate_checksum (
 
 u8 *
 acpi_ut_get_resource_end_tag (
-       acpi_operand_object     *obj_desc)
+       union acpi_operand_object       *obj_desc)
 {
-       u8                      buffer_byte;
-       u8                      *buffer;
-       u8                      *end_buffer;
+       u8                              buffer_byte;
+       u8                              *buffer;
+       u8                              *end_buffer;
 
 
        buffer    = obj_desc->buffer.pointer;
@@ -1419,9 +1419,9 @@ acpi_ut_get_resource_end_tag (
 
 void
 acpi_ut_report_error (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id)
 {
 
 
@@ -1446,9 +1446,9 @@ acpi_ut_report_error (
 
 void
 acpi_ut_report_warning (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id)
 {
 
        acpi_os_printf ("%8s-%04d: *** Warning: ", module_name, line_number);
@@ -1472,9 +1472,9 @@ acpi_ut_report_warning (
 
 void
 acpi_ut_report_info (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id)
 {
 
        acpi_os_printf ("%8s-%04d: *** Info: ", module_name, line_number);
index dab3f6a..52f767e 100644 (file)
@@ -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
  *
  ******************************************************************************/
 
-acpi_operand_object  *
+union acpi_operand_object    *
 acpi_ut_create_internal_object_dbg (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id,
-       acpi_object_type        type)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id,
+       acpi_object_type                type)
 {
-       acpi_operand_object     *object;
-       acpi_operand_object     *second_object;
+       union acpi_operand_object       *object;
+       union acpi_operand_object       *second_object;
 
 
        ACPI_FUNCTION_TRACE_STR ("ut_create_internal_object_dbg", acpi_ut_get_type_name (type));
@@ -125,12 +125,12 @@ acpi_ut_create_internal_object_dbg (
  *
  ******************************************************************************/
 
-acpi_operand_object *
+union acpi_operand_object *
 acpi_ut_create_buffer_object (
-       acpi_size               buffer_size)
+       acpi_size                       buffer_size)
 {
-       acpi_operand_object     *buffer_desc;
-       u8                      *buffer;
+       union acpi_operand_object       *buffer_desc;
+       u8                              *buffer;
 
 
        ACPI_FUNCTION_TRACE_U32 ("ut_create_buffer_object", buffer_size);
@@ -172,13 +172,13 @@ acpi_ut_create_buffer_object (
  *
  * PARAMETERS:  Object              - Object to be validated
  *
- * RETURN:      Validate a pointer to be an acpi_operand_object
+ * RETURN:      Validate a pointer to be an union acpi_operand_object
  *
  ******************************************************************************/
 
 u8
 acpi_ut_valid_internal_object (
-       void                    *object)
+       void                            *object)
 {
 
        ACPI_FUNCTION_NAME ("ut_valid_internal_object");
@@ -196,7 +196,7 @@ acpi_ut_valid_internal_object (
        switch (ACPI_GET_DESCRIPTOR_TYPE (object)) {
        case ACPI_DESC_TYPE_OPERAND:
 
-               /* The object appears to be a valid acpi_operand_object  */
+               /* The object appears to be a valid union acpi_operand_object    */
 
                return (TRUE);
 
@@ -247,11 +247,11 @@ acpi_ut_valid_internal_object (
 
 void *
 acpi_ut_allocate_object_desc_dbg (
-       char                    *module_name,
-       u32                     line_number,
-       u32                     component_id)
+       char                            *module_name,
+       u32                             line_number,
+       u32                             component_id)
 {
-       acpi_operand_object     *object;
+       union acpi_operand_object       *object;
 
 
        ACPI_FUNCTION_TRACE ("ut_allocate_object_desc_dbg");
@@ -270,7 +270,7 @@ acpi_ut_allocate_object_desc_dbg (
        ACPI_SET_DESCRIPTOR_TYPE (object, ACPI_DESC_TYPE_OPERAND);
 
        ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "%p Size %X\n",
-                       object, (u32) sizeof (acpi_operand_object)));
+                       object, (u32) sizeof (union acpi_operand_object)));
 
        return_PTR (object);
 }
@@ -290,12 +290,12 @@ acpi_ut_allocate_object_desc_dbg (
 
 void
 acpi_ut_delete_object_desc (
-       acpi_operand_object     *object)
+       union acpi_operand_object       *object)
 {
        ACPI_FUNCTION_TRACE_PTR ("ut_delete_object_desc", object);
 
 
-       /* Object must be an acpi_operand_object  */
+       /* Object must be an union acpi_operand_object    */
 
        if (ACPI_GET_DESCRIPTOR_TYPE (object) != ACPI_DESC_TYPE_OPERAND) {
                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -353,11 +353,11 @@ acpi_ut_delete_object_cache (
 
 acpi_status
 acpi_ut_get_simple_object_size (
-       acpi_operand_object     *internal_object,
-       acpi_size               *obj_length)
+       union acpi_operand_object       *internal_object,
+       acpi_size                       *obj_length)
 {
-       acpi_size               length;
-       acpi_status             status = AE_OK;
+       acpi_size                       length;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_get_simple_object_size", internal_object);
@@ -372,7 +372,7 @@ acpi_ut_get_simple_object_size (
 
        /* Start with the length of the Acpi object */
 
-       length = sizeof (acpi_object);
+       length = sizeof (union acpi_object);
 
        if (ACPI_GET_DESCRIPTOR_TYPE (internal_object) == ACPI_DESC_TYPE_NAMED) {
                /* Object is a named object (reference), just return the length */
@@ -471,14 +471,14 @@ acpi_ut_get_simple_object_size (
 
 acpi_status
 acpi_ut_get_element_length (
-       u8                      object_type,
-       acpi_operand_object     *source_object,
-       acpi_generic_state      *state,
-       void                    *context)
+       u8                              object_type,
+       union acpi_operand_object       *source_object,
+       union acpi_generic_state        *state,
+       void                            *context)
 {
-       acpi_status             status = AE_OK;
-       acpi_pkg_info           *info = (acpi_pkg_info *) context;
-       acpi_size               object_space;
+       acpi_status                     status = AE_OK;
+       struct acpi_pkg_info            *info = (struct acpi_pkg_info *) context;
+       acpi_size                       object_space;
 
 
        switch (object_type) {
@@ -536,11 +536,11 @@ acpi_ut_get_element_length (
 
 acpi_status
 acpi_ut_get_package_object_size (
-       acpi_operand_object     *internal_object,
-       acpi_size               *obj_length)
+       union acpi_operand_object       *internal_object,
+       acpi_size                       *obj_length)
 {
-       acpi_status             status;
-       acpi_pkg_info           info;
+       acpi_status                     status;
+       struct acpi_pkg_info            info;
 
 
        ACPI_FUNCTION_TRACE_PTR ("ut_get_package_object_size", internal_object);
@@ -561,7 +561,7 @@ acpi_ut_get_package_object_size (
         * just add the length of the package objects themselves.
         * Round up to the next machine word.
         */
-       info.length += ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object)) *
+       info.length += ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object)) *
                          (acpi_size) info.num_packages;
 
        /* Return the total package length */
@@ -587,10 +587,10 @@ acpi_ut_get_package_object_size (
 
 acpi_status
 acpi_ut_get_object_size(
-       acpi_operand_object     *internal_object,
-       acpi_size               *obj_length)
+       union acpi_operand_object       *internal_object,
+       acpi_size                       *obj_length)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_ENTRY ();
index 04d20ca..07096a3 100644 (file)
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 - 2002, R. Byron Moore
+ *  Copyright (C) 2000 - 2003, R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ acpi_status
 acpi_initialize_subsystem (
        void)
 {
-       acpi_status             status;
+       acpi_status                     status;
 
        ACPI_FUNCTION_TRACE ("acpi_initialize_subsystem");
 
@@ -117,9 +117,9 @@ acpi_initialize_subsystem (
 
 acpi_status
 acpi_enable_subsystem (
-       u32                     flags)
+       u32                             flags)
 {
-       acpi_status             status = AE_OK;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("acpi_enable_subsystem");
@@ -211,9 +211,9 @@ acpi_enable_subsystem (
 
 acpi_status
 acpi_initialize_objects (
-       u32                     flags)
+       u32                             flags)
 {
-       acpi_status             status = AE_OK;
+       acpi_status                     status = AE_OK;
 
 
        ACPI_FUNCTION_TRACE ("acpi_initialize_objects");
@@ -272,7 +272,7 @@ acpi_initialize_objects (
 acpi_status
 acpi_terminate (void)
 {
-       acpi_status         status;
+       acpi_status                 status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_terminate");
@@ -353,11 +353,11 @@ acpi_subsystem_status (void)
 
 acpi_status
 acpi_get_system_info (
-       acpi_buffer             *out_buffer)
+       struct acpi_buffer              *out_buffer)
 {
-       acpi_system_info        *info_ptr;
-       u32                     i;
-       acpi_status             status;
+       struct acpi_system_info         *info_ptr;
+       u32                             i;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("acpi_get_system_info");
@@ -372,7 +372,7 @@ acpi_get_system_info (
 
        /* Validate/Allocate/Clear caller buffer */
 
-       status = acpi_ut_initialize_buffer (out_buffer, sizeof (acpi_system_info));
+       status = acpi_ut_initialize_buffer (out_buffer, sizeof (struct acpi_system_info));
        if (ACPI_FAILURE (status)) {
                return_ACPI_STATUS (status);
        }
@@ -380,7 +380,7 @@ acpi_get_system_info (
        /*
         * Populate the return buffer
         */
-       info_ptr = (acpi_system_info *) out_buffer->pointer;
+       info_ptr = (struct acpi_system_info *) out_buffer->pointer;
 
        info_ptr->acpi_ca_version   = ACPI_CA_VERSION;
 
@@ -437,8 +437,8 @@ acpi_get_system_info (
 
 acpi_status
 acpi_install_initialization_handler (
-       acpi_init_handler       handler,
-       u32                     function)
+       acpi_init_handler               handler,
+       u32                             function)
 {
 
        if (!handler) {
index 29e1f2b..9966a6f 100644 (file)
@@ -42,7 +42,7 @@ ACPI_MODULE_NAME              ("acpi_utils")
 #ifdef ACPI_DEBUG_OUTPUT
 #define acpi_util_eval_error(h,p,s) {\
        char prefix[80] = {'\0'};\
-       acpi_buffer buffer = {sizeof(prefix), prefix};\
+       struct acpi_buffer buffer = {sizeof(prefix), prefix};\
        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);\
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",\
                (char *) prefix, p, acpi_format_exception(s))); }
@@ -53,9 +53,9 @@ ACPI_MODULE_NAME              ("acpi_utils")
 
 acpi_status
 acpi_extract_package (
-       acpi_object             *package,
-       acpi_buffer             *format,
-       acpi_buffer             *buffer)
+       union acpi_object       *package,
+       struct acpi_buffer      *format,
+       struct acpi_buffer      *buffer)
 {
        u32                     size_required = 0;
        u32                     tail_offset = 0;
@@ -95,7 +95,7 @@ acpi_extract_package (
         */
        for (i=0; i<format_count; i++) {
 
-               acpi_object *element = &(package->package.elements[i]);
+               union acpi_object *element = &(package->package.elements[i]);
 
                if (!element) {
                        return_ACPI_STATUS(AE_BAD_DATA);
@@ -167,7 +167,7 @@ acpi_extract_package (
        for (i=0; i<format_count; i++) {
 
                u8 **pointer = NULL;
-               acpi_object *element = &(package->package.elements[i]);
+               union acpi_object *element = &(package->package.elements[i]);
 
                if (!element) {
                        return_ACPI_STATUS(AE_BAD_DATA);
@@ -239,12 +239,12 @@ acpi_status
 acpi_evaluate_integer (
        acpi_handle             handle,
        acpi_string             pathname,
-       acpi_object_list        *arguments,
+       struct acpi_object_list *arguments,
        unsigned long           *data)
 {
        acpi_status             status = AE_OK;
-       acpi_object             element;
-       acpi_buffer             buffer = {sizeof(acpi_object), &element};
+       union acpi_object       element;
+       struct acpi_buffer      buffer = {sizeof(union acpi_object), &element};
 
        ACPI_FUNCTION_TRACE("acpi_evaluate_integer");
 
@@ -324,13 +324,13 @@ acpi_status
 acpi_evaluate_reference (
        acpi_handle             handle,
        acpi_string             pathname,
-       acpi_object_list        *arguments,
+       struct acpi_object_list *arguments,
        struct acpi_handle_list *list)
 {
        acpi_status             status = AE_OK;
-       acpi_object             *package = NULL;
-       acpi_object             *element = NULL;
-       acpi_buffer             buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+       union acpi_object       *package = NULL;
+       union acpi_object       *element = NULL;
+       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
        u32                     i = 0;
 
        ACPI_FUNCTION_TRACE("acpi_evaluate_reference");
@@ -345,7 +345,7 @@ acpi_evaluate_reference (
        if (ACPI_FAILURE(status))
                goto end;
 
-       package = (acpi_object *) buffer.pointer;
+       package = (union acpi_object *) buffer.pointer;
 
        if ((buffer.length == 0) || !package) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
index a42c31d..6c16481 100644 (file)
@@ -230,11 +230,11 @@ static int detect_ejectable_slots (acpi_handle *bridge_handle)
  * TBD: _TRA, etc.
  */
 static void
-decode_acpi_resource (acpi_resource *resource, struct acpiphp_bridge *bridge)
+decode_acpi_resource (struct acpi_resource *resource, struct acpiphp_bridge *bridge)
 {
-       acpi_resource_address16 *address16_data;
-       acpi_resource_address32 *address32_data;
-       acpi_resource_address64 *address64_data;
+       struct acpi_resource_address16 *address16_data;
+       struct acpi_resource_address32 *address32_data;
+       struct acpi_resource_address64 *address64_data;
        struct pci_resource *res;
 
        u32 resource_type, producer_consumer, address_length;
@@ -252,7 +252,7 @@ decode_acpi_resource (acpi_resource *resource, struct acpiphp_bridge *bridge)
 
                switch (resource->id) {
                case ACPI_RSTYPE_ADDRESS16:
-                       address16_data = (acpi_resource_address16 *)&resource->data;
+                       address16_data = (struct acpi_resource_address16 *)&resource->data;
                        resource_type = address16_data->resource_type;
                        producer_consumer = address16_data->producer_consumer;
                        min_address_range = address16_data->min_address_range;
@@ -264,7 +264,7 @@ decode_acpi_resource (acpi_resource *resource, struct acpiphp_bridge *bridge)
                        break;
 
                case ACPI_RSTYPE_ADDRESS32:
-                       address32_data = (acpi_resource_address32 *)&resource->data;
+                       address32_data = (struct acpi_resource_address32 *)&resource->data;
                        resource_type = address32_data->resource_type;
                        producer_consumer = address32_data->producer_consumer;
                        min_address_range = address32_data->min_address_range;
@@ -276,7 +276,7 @@ decode_acpi_resource (acpi_resource *resource, struct acpiphp_bridge *bridge)
                        break;
 
                case ACPI_RSTYPE_ADDRESS64:
-                       address64_data = (acpi_resource_address64 *)&resource->data;
+                       address64_data = (struct acpi_resource_address64 *)&resource->data;
                        resource_type = address64_data->resource_type;
                        producer_consumer = address64_data->producer_consumer;
                        min_address_range = address64_data->min_address_range;
@@ -296,7 +296,7 @@ decode_acpi_resource (acpi_resource *resource, struct acpiphp_bridge *bridge)
                        break;
                }
 
-               resource = (acpi_resource *)((char*)resource + resource->length);
+               resource = (struct acpi_resource *)((char*)resource + resource->length);
 
                if (found && producer_consumer == ACPI_PRODUCER && address_length > 0) {
                        switch (resource_type) {
@@ -389,9 +389,9 @@ static struct pci_bus *find_pci_bus(const struct list_head *list, int bus)
 static void decode_hpp(struct acpiphp_bridge *bridge)
 {
        acpi_status status;
-       acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER,
-                              .pointer = NULL};
-       acpi_object *package;
+       struct acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER,
+                                     .pointer = NULL};
+       union acpi_object *package;
        int i;
 
        /* default numbers */
@@ -407,7 +407,7 @@ static void decode_hpp(struct acpiphp_bridge *bridge)
                return;
        }
 
-       package = (acpi_object *) buffer.pointer;
+       package = (union acpi_object *) buffer.pointer;
 
        if (!package || package->type != ACPI_TYPE_PACKAGE ||
            package->package.count != 4 || !package->package.elements) {
@@ -476,8 +476,8 @@ static void init_bridge_misc (struct acpiphp_bridge *bridge)
 static void add_host_bridge (acpi_handle *handle, int seg, int bus)
 {
        acpi_status status;
-       acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER,
-                              .pointer = NULL};
+       struct acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER,
+                                     .pointer = NULL};
 
        struct acpiphp_bridge *bridge;
 
@@ -772,10 +772,10 @@ static acpi_status
 find_host_bridge (acpi_handle handle, u32 lvl, void *context, void **rv)
 {
        acpi_status status;
-       acpi_device_info info;
+       struct acpi_device_info info;
        char objname[5];
-       acpi_buffer buffer = { .length = sizeof(objname),
-                              .pointer = objname };
+       struct acpi_buffer buffer = { .length = sizeof(objname),
+                                     .pointer = objname };
 
        status = acpi_get_object_info(handle, &info);
        if (ACPI_FAILURE(status)) {
@@ -837,8 +837,8 @@ static int power_off_slot (struct acpiphp_slot *slot)
        acpi_status status;
        struct acpiphp_func *func;
        struct list_head *l;
-       acpi_object_list arg_list;
-       acpi_object arg;
+       struct acpi_object_list arg_list;
+       union acpi_object arg;
 
        int retval = 0;
 
@@ -1069,8 +1069,8 @@ static void handle_hotplug_event_bridge (acpi_handle handle, u32 type, void *con
 {
        struct acpiphp_bridge *bridge;
        char objname[64];
-       acpi_buffer buffer = { .length = sizeof(objname),
-                              .pointer = objname };
+       struct acpi_buffer buffer = { .length = sizeof(objname),
+                                     .pointer = objname };
 
        bridge = (struct acpiphp_bridge *)context;
 
@@ -1120,8 +1120,8 @@ static void handle_hotplug_event_func (acpi_handle handle, u32 type, void *conte
 {
        struct acpiphp_func *func;
        char objname[64];
-       acpi_buffer buffer = { .length = sizeof(objname),
-                              .pointer = objname };
+       struct acpi_buffer buffer = { .length = sizeof(objname),
+                                     .pointer = objname };
 
        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
index 5d5eaeb..4cd86e8 100644 (file)
@@ -73,20 +73,6 @@ struct acpi20_table_rsdp {
        u8                      reserved[3];
 } __attribute__ ((packed));
 
-/* Common table header */
-
-struct acpi_table_header {
-       char                    signature[4];
-       u32                     length;
-       u8                      revision;
-       u8                      checksum;
-       char                    oem_id[6];
-       char                    oem_table_id[8];
-       u32                     oem_revision;
-       char                    asl_compiler_id[4];
-       u32                     asl_compiler_revision;
-} __attribute__ ((packed));
-
 typedef struct {
        u8                      type;
        u8                      length;
@@ -325,12 +311,12 @@ struct acpi_table_sbst {
 /* Embedded Controller Boot Resources Table (ECDT) */
 
 struct acpi_table_ecdt {
-       struct acpi_table_header header;
-       acpi_generic_address    ec_control;
-       acpi_generic_address    ec_data;
-       u32                     uid;
-       u8                      gpe_bit;
-       char                    ec_id[0];
+       struct acpi_table_header        header;
+       struct acpi_generic_address     ec_control;
+       struct acpi_generic_address     ec_data;
+       u32                             uid;
+       u8                              gpe_bit;
+       char                            ec_id[0];
 } __attribute__ ((packed));
 
 /* Table Handlers */
@@ -396,7 +382,7 @@ extern int acpi_mp_config;
 
 struct acpi_prt_entry {
        struct list_head        node;
-       acpi_pci_id             id;
+       struct acpi_pci_id      id;
        u8                      pin;
        struct {
                acpi_handle             handle;