patch-2.4.22 linux-2.4.22/drivers/acpi/utilities/utcopy.c
Next file: linux-2.4.22/drivers/acpi/utilities/utdebug.c
Previous file: linux-2.4.22/drivers/acpi/utilities/utalloc.c
Back to the patch index
Back to the overall index
- Lines: 1074
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/utilities/utcopy.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/utilities/utcopy.c linux-2.4.22/drivers/acpi/utilities/utcopy.c
@@ -1,46 +1,62 @@
/******************************************************************************
*
* Module Name: utcopy - Internal to external object translation utilities
- * $Revision: 83 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000, 2001 R. Byron Moore
+ * Copyright (C) 2000 - 2003, R. Byron Moore
+ * All rights reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "amlcode.h"
+#include <acpi/acpi.h>
+#include <acpi/amlcode.h>
#define _COMPONENT ACPI_UTILITIES
- MODULE_NAME ("utcopy")
+ ACPI_MODULE_NAME ("utcopy")
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_isimple_to_esimple
+ * FUNCTION: acpi_ut_copy_isimple_to_esimple
*
- * PARAMETERS: *Internal_object - Pointer to the object we are examining
+ * PARAMETERS: *internal_object - Pointer to the object we are examining
* *Buffer - Where the object is returned
- * *Space_used - Where the data length is returned
+ * *space_used - Where the data length is returned
*
* RETURN: Status
*
@@ -53,106 +69,77 @@
static acpi_status
acpi_ut_copy_isimple_to_esimple (
- acpi_operand_object *internal_object,
- acpi_object *external_object,
- u8 *data_space,
- u32 *buffer_space_used)
+ union acpi_operand_object *internal_object,
+ union acpi_object *external_object,
+ u8 *data_space,
+ acpi_size *buffer_space_used)
{
- u32 length = 0;
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ut_copy_isimple_to_esimple");
+ ACPI_FUNCTION_TRACE ("ut_copy_isimple_to_esimple");
+ *buffer_space_used = 0;
+
/*
* Check for NULL object case (could be an uninitialized
- * package element
+ * package element)
*/
if (!internal_object) {
- *buffer_space_used = 0;
return_ACPI_STATUS (AE_OK);
}
/* Always clear the external object */
- 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
* the internal object
*/
- external_object->type = internal_object->common.type;
+ external_object->type = ACPI_GET_OBJECT_TYPE (internal_object);
/* However, only a limited number of external types are supported */
- switch (internal_object->common.type) {
-
+ switch (ACPI_GET_OBJECT_TYPE (internal_object)) {
case ACPI_TYPE_STRING:
- length = internal_object->string.length + 1;
+ external_object->string.pointer = (char *) data_space;
external_object->string.length = internal_object->string.length;
- external_object->string.pointer = (NATIVE_CHAR *) data_space;
- MEMCPY ((void *) data_space, (void *) internal_object->string.pointer, length);
+ *buffer_space_used = ACPI_ROUND_UP_TO_NATIVE_WORD ((acpi_size) internal_object->string.length + 1);
+
+ ACPI_MEMCPY ((void *) data_space, (void *) internal_object->string.pointer,
+ (acpi_size) internal_object->string.length + 1);
break;
case ACPI_TYPE_BUFFER:
- length = internal_object->buffer.length;
- external_object->buffer.length = internal_object->buffer.length;
external_object->buffer.pointer = data_space;
- MEMCPY ((void *) data_space, (void *) internal_object->buffer.pointer, length);
+ external_object->buffer.length = internal_object->buffer.length;
+ *buffer_space_used = ACPI_ROUND_UP_TO_NATIVE_WORD (internal_object->string.length);
+
+ ACPI_MEMCPY ((void *) data_space, (void *) internal_object->buffer.pointer,
+ internal_object->buffer.length);
break;
case ACPI_TYPE_INTEGER:
- external_object->integer.value= internal_object->integer.value;
+ external_object->integer.value = internal_object->integer.value;
break;
- case INTERNAL_TYPE_REFERENCE:
+ case ACPI_TYPE_LOCAL_REFERENCE:
/*
* This is an object reference. Attempt to dereference it.
*/
switch (internal_object->reference.opcode) {
- case AML_ZERO_OP:
- external_object->type = ACPI_TYPE_INTEGER;
- external_object->integer.value = 0;
- break;
-
- case AML_ONE_OP:
- external_object->type = ACPI_TYPE_INTEGER;
- external_object->integer.value = 1;
- break;
-
- case AML_ONES_OP:
- external_object->type = ACPI_TYPE_INTEGER;
- external_object->integer.value = ACPI_INTEGER_MAX;
- break;
-
- case AML_REVISION_OP:
- external_object->type = ACPI_TYPE_INTEGER;
- external_object->integer.value = ACPI_CA_SUPPORT_LEVEL;
- break;
-
case AML_INT_NAMEPATH_OP:
- /*
- * This is a named reference, get the string. We already know that
- * we have room for it, use max length
- */
- length = MAX_STRING_LENGTH;
- external_object->type = ACPI_TYPE_STRING;
- external_object->string.pointer = (NATIVE_CHAR *) data_space;
- status = acpi_ns_handle_to_pathname ((acpi_handle *) internal_object->reference.node,
- &length, (char *) data_space);
-
- /* Converted (external) string length is returned from above */
- external_object->string.length = length;
- break;
+ /* For namepath, return the object handle ("reference") */
default:
/*
@@ -168,7 +155,7 @@
case ACPI_TYPE_PROCESSOR:
- external_object->processor.proc_id = internal_object->processor.proc_id;
+ external_object->processor.proc_id = internal_object->processor.proc_id;
external_object->processor.pblk_address = internal_object->processor.address;
external_object->processor.pblk_length = internal_object->processor.length;
break;
@@ -189,21 +176,17 @@
* There is no corresponding external object type
*/
return_ACPI_STATUS (AE_SUPPORT);
- break;
}
-
- *buffer_space_used = (u32) ROUND_UP_TO_NATIVE_WORD (length);
-
return_ACPI_STATUS (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_ielement_to_eelement
+ * FUNCTION: acpi_ut_copy_ielement_to_eelement
*
- * PARAMETERS: ACPI_PKG_CALLBACK
+ * PARAMETERS: acpi_pkg_callback
*
* RETURN: Status
*
@@ -213,39 +196,39 @@
acpi_status
acpi_ut_copy_ielement_to_eelement (
- u8 object_type,
- acpi_operand_object *source_object,
- acpi_generic_state *state,
- void *context)
-{
- acpi_status status = AE_OK;
- acpi_pkg_info *info = (acpi_pkg_info *) context;
- u32 object_space;
- u32 this_index;
- acpi_object *target_object;
+ u8 object_type,
+ union acpi_operand_object *source_object,
+ union acpi_generic_state *state,
+ void *context)
+{
+ 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;
- FUNCTION_ENTRY ();
+ 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:
/*
- * This is a simple or null object -- get the size
+ * This is a simple or null object
*/
status = acpi_ut_copy_isimple_to_esimple (source_object,
target_object, info->free_space, &object_space);
if (ACPI_FAILURE (status)) {
return (status);
}
-
break;
+
case ACPI_COPY_TYPE_PACKAGE:
/*
@@ -253,7 +236,7 @@
*/
target_object->type = ACPI_TYPE_PACKAGE;
target_object->package.count = source_object->package.count;
- target_object->package.elements = (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
@@ -264,29 +247,28 @@
* Save space for the array of objects (Package elements)
* update the buffer length counter
*/
- object_space = (u32) ROUND_UP_TO_NATIVE_WORD (
- target_object->package.count * sizeof (acpi_object));
+ object_space = ACPI_ROUND_UP_TO_NATIVE_WORD (
+ (acpi_size) target_object->package.count * sizeof (union acpi_object));
break;
+
default:
return (AE_BAD_PARAMETER);
}
-
info->free_space += object_space;
info->length += object_space;
-
return (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_ipackage_to_epackage
+ * FUNCTION: acpi_ut_copy_ipackage_to_epackage
*
- * PARAMETERS: *Internal_object - Pointer to the object we are returning
+ * PARAMETERS: *internal_object - Pointer to the object we are returning
* *Buffer - Where the object is returned
- * *Space_used - Where the object length is returned
+ * *space_used - Where the object length is returned
*
* RETURN: Status
*
@@ -295,66 +277,64 @@
*
* The buffer is assumed to have sufficient space for the object.
* The caller must have verified the buffer length needed using the
- * Acpi_ut_get_object_size function before calling this function.
+ * acpi_ut_get_object_size function before calling this function.
*
******************************************************************************/
static acpi_status
acpi_ut_copy_ipackage_to_epackage (
- acpi_operand_object *internal_object,
- u8 *buffer,
- u32 *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;
- FUNCTION_TRACE ("Ut_copy_ipackage_to_epackage");
+ ACPI_FUNCTION_TRACE ("ut_copy_ipackage_to_epackage");
/*
* First package at head of the buffer
*/
- external_object = (acpi_object *) buffer;
+ external_object = ACPI_CAST_PTR (union acpi_object, buffer);
/*
* Free space begins right after the first package
*/
- info.length = 0;
+ 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;
- info.free_space = buffer + ROUND_UP_TO_NATIVE_WORD (sizeof (acpi_object));
-
-
- external_object->type = internal_object->common.type;
- external_object->package.count = internal_object->package.count;
- external_object->package.elements = (acpi_object *) info.free_space;
+ external_object->type = ACPI_GET_OBJECT_TYPE (internal_object);
+ external_object->package.count = internal_object->package.count;
+ external_object->package.elements = ACPI_CAST_PTR (union acpi_object, info.free_space);
/*
- * Build an array of ACPI_OBJECTS in the buffer
+ * 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 (union acpi_object));
info.free_space += external_object->package.count *
- 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);
*space_used = info.length;
-
return_ACPI_STATUS (status);
-
}
+
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_iobject_to_eobject
+ * FUNCTION: acpi_ut_copy_iobject_to_eobject
*
- * PARAMETERS: *Internal_object - The internal object to be converted
- * *Buffer_ptr - Where the object is returned
+ * PARAMETERS: *internal_object - The internal object to be converted
+ * *buffer_ptr - Where the object is returned
*
* RETURN: Status
*
@@ -365,16 +345,16 @@
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;
- FUNCTION_TRACE ("Ut_copy_iobject_to_eobject");
+ ACPI_FUNCTION_TRACE ("ut_copy_iobject_to_eobject");
- if (IS_THIS_OBJECT_TYPE (internal_object, ACPI_TYPE_PACKAGE)) {
+ if (ACPI_GET_OBJECT_TYPE (internal_object) == ACPI_TYPE_PACKAGE) {
/*
* Package object: Copy all subobjects (including
* nested packages)
@@ -382,21 +362,20 @@
status = acpi_ut_copy_ipackage_to_epackage (internal_object,
ret_buffer->pointer, &ret_buffer->length);
}
-
else {
/*
* 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 +
- 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);
@@ -405,10 +384,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_esimple_to_isimple
+ * FUNCTION: acpi_ut_copy_esimple_to_isimple
*
- * PARAMETERS: *External_object - The external object to be converted
- * *Internal_object - Where the internal object is returned
+ * PARAMETERS: *external_object - The external object to be converted
+ * *internal_object - Where the internal object is returned
*
* RETURN: Status
*
@@ -421,13 +400,13 @@
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;
- FUNCTION_TRACE ("Ut_copy_esimple_to_isimple");
+ ACPI_FUNCTION_TRACE ("ut_copy_esimple_to_isimple");
/*
@@ -449,7 +428,6 @@
* Whatever other type -- it is not supported
*/
return_ACPI_STATUS (AE_SUPPORT);
- break;
}
@@ -459,14 +437,15 @@
case ACPI_TYPE_STRING:
- internal_object->string.pointer = ACPI_MEM_CALLOCATE (external_object->string.length + 1);
+ internal_object->string.pointer =
+ ACPI_MEM_CALLOCATE ((acpi_size) external_object->string.length + 1);
if (!internal_object->string.pointer) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
- MEMCPY (internal_object->string.pointer,
- external_object->string.pointer,
- external_object->string.length);
+ ACPI_MEMCPY (internal_object->string.pointer,
+ external_object->string.pointer,
+ external_object->string.length);
internal_object->string.length = external_object->string.length;
break;
@@ -474,14 +453,15 @@
case ACPI_TYPE_BUFFER:
- internal_object->buffer.pointer = ACPI_MEM_CALLOCATE (external_object->buffer.length);
+ internal_object->buffer.pointer =
+ ACPI_MEM_CALLOCATE (external_object->buffer.length);
if (!internal_object->buffer.pointer) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
- MEMCPY (internal_object->buffer.pointer,
- external_object->buffer.pointer,
- external_object->buffer.length);
+ ACPI_MEMCPY (internal_object->buffer.pointer,
+ external_object->buffer.pointer,
+ external_object->buffer.length);
internal_object->buffer.length = external_object->buffer.length;
break;
@@ -491,8 +471,11 @@
internal_object->integer.value = external_object->integer.value;
break;
- }
+ default:
+ /* Other types can't get here */
+ break;
+ }
*ret_internal_object = internal_object;
return_ACPI_STATUS (AE_OK);
@@ -505,65 +488,64 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_epackage_to_ipackage
+ * FUNCTION: acpi_ut_copy_epackage_to_ipackage
*
- * PARAMETERS: *Internal_object - Pointer to the object we are returning
- * *Buffer - Where the object is returned
- * *Space_used - Where the length of the object is returned
+ * PARAMETERS: *internal_object - Pointer to the object we are returning
+ * *Buffer - Where the object is returned
+ * *space_used - Where the length of the object is returned
*
- * RETURN: Status - the status of the call
+ * RETURN: Status
*
* DESCRIPTION: This function is called to place a package object in a user
* buffer. A package object by definition contains other objects.
*
* The buffer is assumed to have sufficient space for the object.
* The caller must have verified the buffer length needed using the
- * Acpi_ut_get_object_size function before calling this function.
+ * acpi_ut_get_object_size function before calling this function.
*
******************************************************************************/
static acpi_status
acpi_ut_copy_epackage_to_ipackage (
- 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;
+ union acpi_operand_object *internal_object,
+ u8 *buffer,
+ u32 *space_used)
+{
+ 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;
- FUNCTION_TRACE ("Ut_copy_epackage_to_ipackage");
+ ACPI_FUNCTION_TRACE ("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 = internal_object->common.type;
+ 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 */
+ /* Call walk_package */
}
@@ -572,10 +554,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_eobject_to_iobject
+ * FUNCTION: acpi_ut_copy_eobject_to_iobject
*
- * PARAMETERS: *Internal_object - The external object to be converted
- * *Buffer_ptr - Where the internal object is returned
+ * PARAMETERS: *internal_object - The external object to be converted
+ * *buffer_ptr - Where the internal object is returned
*
* RETURN: Status - the status of the call
*
@@ -585,29 +567,19 @@
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;
- FUNCTION_TRACE ("Ut_copy_eobject_to_iobject");
+ ACPI_FUNCTION_TRACE ("ut_copy_eobject_to_iobject");
if (external_object->type == ACPI_TYPE_PACKAGE) {
/*
- * Package objects contain other objects (which can be objects)
- * buildpackage does it all
- *
- * TBD: Package conversion must be completed and tested
- * NOTE: this code converts packages as input parameters to
- * control methods only. This is a very, very rare case.
+ * Packages as external input to control methods are not supported,
*/
-/*
- Status = Acpi_ut_copy_epackage_to_ipackage(Internal_object,
- Ret_buffer->Pointer,
- &Ret_buffer->Length);
-*/
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Packages as parameters not implemented!\n"));
@@ -627,11 +599,112 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_ielement_to_ielement
+ * FUNCTION: acpi_ut_copy_simple_object
*
- * PARAMETERS: ACPI_PKG_CALLBACK
+ * PARAMETERS: source_desc - The internal object to be copied
+ * dest_desc - New target object
*
- * RETURN: Status - the status of the call
+ * RETURN: Status
+ *
+ * DESCRIPTION: Simple copy of one internal object to another. Reference count
+ * of the destination object is preserved.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_copy_simple_object (
+ union acpi_operand_object *source_desc,
+ union acpi_operand_object *dest_desc)
+{
+ u16 reference_count;
+ union acpi_operand_object *next_object;
+
+
+ /* Save fields from destination that we don't want to overwrite */
+
+ reference_count = dest_desc->common.reference_count;
+ next_object = dest_desc->common.next_object;
+
+ /* Copy the entire source object over the destination object*/
+
+ ACPI_MEMCPY ((char *) dest_desc, (char *) source_desc,
+ sizeof (union acpi_operand_object));
+
+ /* Restore the saved fields */
+
+ dest_desc->common.reference_count = reference_count;
+ dest_desc->common.next_object = next_object;
+
+ /* Handle the objects with extra data */
+
+ switch (ACPI_GET_OBJECT_TYPE (dest_desc)) {
+ case ACPI_TYPE_BUFFER:
+
+ dest_desc->buffer.node = NULL;
+ dest_desc->common.flags = source_desc->common.flags;
+
+ /*
+ * Allocate and copy the actual buffer if and only if:
+ * 1) There is a valid buffer pointer
+ * 2) The buffer is not static (not in an ACPI table) (in this case,
+ * the actual pointer was already copied above)
+ */
+ if ((source_desc->buffer.pointer) &&
+ (!(source_desc->common.flags & AOPOBJ_STATIC_POINTER))) {
+ dest_desc->buffer.pointer = NULL;
+
+ /* Create an actual buffer only if length > 0 */
+
+ if (source_desc->buffer.length) {
+ dest_desc->buffer.pointer = ACPI_MEM_ALLOCATE (source_desc->buffer.length);
+ if (!dest_desc->buffer.pointer) {
+ return (AE_NO_MEMORY);
+ }
+
+ /* Copy the actual buffer data */
+
+ ACPI_MEMCPY (dest_desc->buffer.pointer, source_desc->buffer.pointer,
+ source_desc->buffer.length);
+ }
+ }
+ break;
+
+ case ACPI_TYPE_STRING:
+
+ /*
+ * Allocate and copy the actual string if and only if:
+ * 1) There is a valid string pointer
+ * 2) The string is not static (not in an ACPI table) (in this case,
+ * the actual pointer was already copied above)
+ */
+ if ((source_desc->string.pointer) &&
+ (!(source_desc->common.flags & AOPOBJ_STATIC_POINTER))) {
+ dest_desc->string.pointer = ACPI_MEM_ALLOCATE ((acpi_size) source_desc->string.length + 1);
+ if (!dest_desc->string.pointer) {
+ return (AE_NO_MEMORY);
+ }
+
+ ACPI_MEMCPY (dest_desc->string.pointer, source_desc->string.pointer,
+ (acpi_size) source_desc->string.length + 1);
+ }
+ break;
+
+ default:
+ /* Nothing to do for other simple objects */
+ break;
+ }
+
+ return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_ut_copy_ielement_to_ielement
+ *
+ * PARAMETERS: acpi_pkg_callback
+ *
+ * RETURN: Status
*
* DESCRIPTION: Copy one package element to another package element
*
@@ -639,58 +712,78 @@
acpi_status
acpi_ut_copy_ielement_to_ielement (
- u8 object_type,
- acpi_operand_object *source_object,
- 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;
+ u8 object_type,
+ union acpi_operand_object *source_object,
+ union acpi_generic_state *state,
+ void *context)
+{
+ acpi_status status = AE_OK;
+ u32 this_index;
+ union acpi_operand_object **this_target_ptr;
+ union acpi_operand_object *target_object;
- FUNCTION_ENTRY ();
+ 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) {
- case 0:
+ case ACPI_COPY_TYPE_SIMPLE:
- /*
- * This is a simple object, just copy it
- */
- target_object = acpi_ut_create_internal_object (source_object->common.type);
- if (!target_object) {
- return (AE_NO_MEMORY);
- }
+ /* A null source object indicates a (legal) null package element */
- status = acpi_ex_store_object_to_object (source_object, target_object,
- (acpi_walk_state *) context);
- if (ACPI_FAILURE (status)) {
- return (status);
+ if (source_object) {
+ /*
+ * This is a simple object, just copy it
+ */
+ target_object = acpi_ut_create_internal_object (
+ ACPI_GET_OBJECT_TYPE (source_object));
+ if (!target_object) {
+ return (AE_NO_MEMORY);
+ }
+
+ status = acpi_ut_copy_simple_object (source_object, target_object);
+ if (ACPI_FAILURE (status)) {
+ return (status);
+ }
+
+ *this_target_ptr = target_object;
}
+ else {
+ /* Pass through a null element */
- *this_target_ptr = target_object;
+ *this_target_ptr = NULL;
+ }
break;
- case 1:
+ case ACPI_COPY_TYPE_PACKAGE:
+
/*
* This object is a package - go down another nesting level
* Create and build the package object
*/
target_object = acpi_ut_create_internal_object (ACPI_TYPE_PACKAGE);
if (!target_object) {
- /* TBD: must delete package created up to this point */
-
return (AE_NO_MEMORY);
}
target_object->package.count = source_object->package.count;
+ target_object->common.flags = source_object->common.flags;
+
+ /*
+ * Create the object array
+ */
+ target_object->package.elements =
+ ACPI_MEM_CALLOCATE (((acpi_size) source_object->package.count + 1) *
+ sizeof (void *));
+ if (!target_object->package.elements) {
+ ACPI_MEM_FREE (target_object);
+ return (AE_NO_MEMORY);
+ }
/*
* Pass the new package object back to the package walk routine
@@ -703,21 +796,21 @@
*this_target_ptr = target_object;
break;
+
default:
return (AE_BAD_PARAMETER);
}
-
return (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ut_copy_ipackage_to_ipackage
+ * FUNCTION: acpi_ut_copy_ipackage_to_ipackage
*
- * PARAMETERS: *Source_obj - Pointer to the source package object
- * *Dest_obj - Where the internal object is returned
+ * PARAMETERS: *source_obj - Pointer to the source package object
+ * *dest_obj - Where the internal object is returned
*
* RETURN: Status - the status of the call
*
@@ -728,37 +821,92 @@
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;
- FUNCTION_TRACE ("Ut_copy_ipackage_to_ipackage");
+ ACPI_FUNCTION_TRACE ("ut_copy_ipackage_to_ipackage");
- dest_obj->common.type = source_obj->common.type;
+ dest_obj->common.type = ACPI_GET_OBJECT_TYPE (source_obj);
+ dest_obj->common.flags = source_obj->common.flags;
dest_obj->package.count = source_obj->package.count;
-
/*
* Create the object array and walk the source package tree
*/
- dest_obj->package.elements = ACPI_MEM_CALLOCATE ((source_obj->package.count + 1) *
- sizeof (void *));
- dest_obj->package.next_element = dest_obj->package.elements;
-
+ dest_obj->package.elements = ACPI_MEM_CALLOCATE (
+ ((acpi_size) source_obj->package.count + 1) *
+ sizeof (void *));
if (!dest_obj->package.elements) {
- REPORT_ERROR (
- ("Aml_build_copy_internal_package_object: Package allocation failure\n"));
+ ACPI_REPORT_ERROR (
+ ("aml_build_copy_internal_package_object: Package allocation failure\n"));
return_ACPI_STATUS (AE_NO_MEMORY);
}
-
+ /*
+ * Copy the package element-by-element by walking the package "tree".
+ * This handles nested packages of arbitrary depth.
+ */
status = acpi_ut_walk_package_tree (source_obj, dest_obj,
acpi_ut_copy_ielement_to_ielement, walk_state);
+ if (ACPI_FAILURE (status)) {
+ /* On failure, delete the destination package object */
+
+ acpi_ut_remove_reference (dest_obj);
+ }
+
+ return_ACPI_STATUS (status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_ut_copy_iobject_to_iobject
+ *
+ * PARAMETERS: walk_state - Current walk state
+ * source_desc - The internal object to be copied
+ * dest_desc - Where the copied object is returned
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Copy an internal object to a new internal object
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_copy_iobject_to_iobject (
+ union acpi_operand_object *source_desc,
+ union acpi_operand_object **dest_desc,
+ struct acpi_walk_state *walk_state)
+{
+ acpi_status status = AE_OK;
+
+
+ ACPI_FUNCTION_TRACE ("ut_copy_iobject_to_iobject");
+
+
+ /* Create the top level object */
+
+ *dest_desc = acpi_ut_create_internal_object (ACPI_GET_OBJECT_TYPE (source_desc));
+ if (!*dest_desc) {
+ return_ACPI_STATUS (AE_NO_MEMORY);
+ }
+
+ /* Copy the object and possible subobjects */
+
+ if (ACPI_GET_OBJECT_TYPE (source_desc) == ACPI_TYPE_PACKAGE) {
+ status = acpi_ut_copy_ipackage_to_ipackage (source_desc, *dest_desc,
+ walk_state);
+ }
+ else {
+ status = acpi_ut_copy_simple_object (source_desc, *dest_desc);
+ }
return_ACPI_STATUS (status);
}
+
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)