diff options
Diffstat (limited to 'sys/contrib/dev/acpica/utcopy.c')
| -rw-r--r-- | sys/contrib/dev/acpica/utcopy.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/contrib/dev/acpica/utcopy.c b/sys/contrib/dev/acpica/utcopy.c index a3ee276..8f67775 100644 --- a/sys/contrib/dev/acpica/utcopy.c +++ b/sys/contrib/dev/acpica/utcopy.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utcopy - Internal to external object translation utilities - * $Revision: 77 $ + * $Revision: 79 $ * *****************************************************************************/ @@ -161,7 +161,6 @@ AcpiUtCopyIsimpleToEsimple ( * Check for NULL object case (could be an uninitialized * package element */ - if (!InternalObject) { *BufferSpaceUsed = 0; @@ -176,7 +175,6 @@ AcpiUtCopyIsimpleToEsimple ( * In general, the external object will be the same type as * the internal object */ - ExternalObject->Type = InternalObject->Common.Type; /* However, only a limited number of external types are supported */ @@ -213,7 +211,6 @@ AcpiUtCopyIsimpleToEsimple ( /* * This is an object reference. Attempt to dereference it. */ - switch (InternalObject->Reference.Opcode) { case AML_ZERO_OP: @@ -318,6 +315,9 @@ AcpiUtCopyIelementToEelement ( ACPI_OBJECT *TargetObject; + FUNCTION_ENTRY (); + + ThisIndex = State->Pkg.Index; TargetObject = (ACPI_OBJECT *) &((ACPI_OBJECT *)(State->Pkg.DestObject))->Package.Elements[ThisIndex]; @@ -428,7 +428,6 @@ AcpiUtCopyIpackageToEpackage ( * Build an array of ACPI_OBJECTS in the buffer * and move the free space past it */ - Info.FreeSpace += ExternalObject->Package.Count * ROUND_UP_TO_NATIVE_WORD (sizeof (ACPI_OBJECT)); @@ -624,7 +623,6 @@ AcpiUtCopyEpackageToIpackage ( * Build an array of ACPI_OBJECTS in the buffer * and move the free space past it */ - FreeSpace += ExternalObject->Package.Count * sizeof(ACPI_OBJECT); @@ -674,7 +672,7 @@ AcpiUtCopyEobjectToIobject ( RetBuffer->Pointer, &RetBuffer->Length); */ - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Packages as parameters not implemented!\n")); return_ACPI_STATUS (AE_NOT_IMPLEMENTED); @@ -721,6 +719,9 @@ AcpiUtCopyIelementToIelement ( ACPI_OPERAND_OBJECT *TargetObject; + FUNCTION_ENTRY (); + + ThisIndex = State->Pkg.Index; ThisTargetPtr = (ACPI_OPERAND_OBJECT **) &State->Pkg.DestObject->Package.Elements[ThisIndex]; @@ -806,6 +807,7 @@ AcpiUtCopyIpackageToIpackage ( { ACPI_STATUS Status = AE_OK; + FUNCTION_TRACE ("UtCopyIpackageToIpackage"); @@ -816,7 +818,6 @@ AcpiUtCopyIpackageToIpackage ( /* * Create the object array and walk the source package tree */ - DestObj->Package.Elements = ACPI_MEM_CALLOCATE ((SourceObj->Package.Count + 1) * sizeof (void *)); DestObj->Package.NextElement = DestObj->Package.Elements; |
