[ACPI] ACPICA 20050930

Completed a major overhaul of the Resource Manager code -
specifically, optimizations in the area of the AML/internal
resource conversion code. The code has been optimized to
simplify and eliminate duplicated code, CPU stack use has
been decreased by optimizing function parameters and local
variables, and naming conventions across the manager have
been standardized for clarity and ease of maintenance (this
includes function, parameter, variable, and struct/typedef
names.)

All Resource Manager dispatch and information tables have
been moved to a single location for clarity and ease of
maintenance. One new file was created, named "rsinfo.c".

The ACPI return macros (return_ACPI_STATUS, etc.) have
been modified to guarantee that the argument is
not evaluated twice, making them less prone to macro
side-effects. However, since there exists the possibility
of additional stack use if a particular compiler cannot
optimize them (such as in the debug generation case),
the original macros are optionally available.  Note that
some invocations of the return_VALUE macro may now cause
size mismatch warnings; the return_UINT8 and return_UINT32
macros are provided to eliminate these. (From Randy Dunlap)

Implemented a new mechanism to enable debug tracing for
individual control methods. A new external interface,
acpi_debug_trace(), is provided to enable this mechanism. The
intent is to allow the host OS to easily enable and disable
tracing for problematic control methods. This interface
can be easily exposed to a user or debugger interface if
desired. See the file psxface.c for details.

acpi_ut_callocate() will now return a valid pointer if a
length of zero is specified - a length of one is used
and a warning is issued. This matches the behavior of
acpi_ut_allocate().

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

2 files changed, 15 insertions, 15 deletions

diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index a146016d7ad7..4a5574ff007b 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -33,33 +33,33 @@ acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
         struct acpi_vendor_info *info = (struct acpi_vendor_info *)context;
         struct acpi_resource_vendor *vendor;
         struct acpi_vendor_descriptor *descriptor;
-        u32 length;
+        u32 byte_length;
 
-        if (resource->type != ACPI_RSTYPE_VENDOR)
+        if (resource->type != ACPI_RESOURCE_TYPE_VENDOR)
                 return AE_OK;
 
         vendor = (struct acpi_resource_vendor *)&resource->data;
-        descriptor = (struct acpi_vendor_descriptor *)vendor->reserved;
-        if (vendor->length <= sizeof(*info->descriptor) ||
+        descriptor = (struct acpi_vendor_descriptor *)vendor->byte_data;
+        if (vendor->byte_length <= sizeof(*info->descriptor) ||
             descriptor->guid_id != info->descriptor->guid_id ||
             efi_guidcmp(descriptor->guid, info->descriptor->guid))
                 return AE_OK;
 
-        length = vendor->length - sizeof(struct acpi_vendor_descriptor);
-        info->data = acpi_os_allocate(length);
+        byte_length = vendor->byte_length - sizeof(struct acpi_vendor_descriptor);
+        info->data = acpi_os_allocate(byte_length);
         if (!info->data)
                 return AE_NO_MEMORY;
 
         memcpy(info->data,
-               vendor->reserved + sizeof(struct acpi_vendor_descriptor),
-               length);
-        info->length = length;
+               vendor->byte_data + sizeof(struct acpi_vendor_descriptor),
+               byte_length);
+        info->length = byte_length;
         return AE_CTRL_TERMINATE;
 }
 
 acpi_status
 acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor * id,
-                          u8 ** data, u32 * length)
+                          u8 ** data, u32 * byte_length)
 {
         struct acpi_vendor_info info;
 
@@ -72,7 +72,7 @@ acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor * id,
                 return AE_NOT_FOUND;
 
         *data = info.data;
-        *length = info.length;
+        *byte_length = info.length;
         return AE_OK;
 }
 
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 20d76fae24e8..25f923d050e3 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -193,12 +193,12 @@ add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr)
                 goto free_resource;
         }
 
-        min = addr->min_address_range;
+        min = addr->minimum;
         max = min + addr->address_length - 1;
         if (addr->attribute.io.translation_attribute == ACPI_SPARSE_TRANSLATION)
                 sparse = 1;
 
-        space_nr = new_space(addr->address_translation_offset, sparse);
+        space_nr = new_space(addr->translation_offset, sparse);
         if (space_nr == ~0)
                 goto free_name;
 
@@ -285,7 +285,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         if (addr.resource_type == ACPI_MEMORY_RANGE) {
                 flags = IORESOURCE_MEM;
                 root = &iomem_resource;
-                offset = addr.address_translation_offset;
+                offset = addr.translation_offset;
         } else if (addr.resource_type == ACPI_IO_RANGE) {
                 flags = IORESOURCE_IO;
                 root = &ioport_resource;
@@ -298,7 +298,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         window = &info->controller->window[info->controller->windows++];
         window->resource.name = info->name;
         window->resource.flags = flags;
-        window->resource.start = addr.min_address_range + offset;
+        window->resource.start = addr.minimum + offset;
         window->resource.end = window->resource.start + addr.address_length - 1;
         window->resource.child = NULL;
         window->offset = offset;