4c4
< * $Revision: 1.122 $
---
> * $Revision: 1.130 $
12c12
< * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
---
> * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
202c202
< ACPI_FUNCTION_TRACE ("UtCopyIsimpleToEsimple");
---
> ACPI_FUNCTION_TRACE (UtCopyIsimpleToEsimple);
428c428
< ACPI_FUNCTION_TRACE ("UtCopyIpackageToEpackage");
---
> ACPI_FUNCTION_TRACE (UtCopyIpackageToEpackage);
489c489
< ACPI_FUNCTION_TRACE ("UtCopyIobjectToEobject");
---
> ACPI_FUNCTION_TRACE (UtCopyIobjectToEobject);
507,509c507,509
< (ACPI_OBJECT *) RetBuffer->Pointer,
< ((UINT8 *) RetBuffer->Pointer +
< ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (ACPI_OBJECT))),
---
> ACPI_CAST_PTR (ACPI_OBJECT, RetBuffer->Pointer),
> ACPI_ADD_PTR (UINT8, RetBuffer->Pointer,
> ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (ACPI_OBJECT))),
546c546
< ACPI_FUNCTION_TRACE ("UtCopyEsimpleToIsimple");
---
> ACPI_FUNCTION_TRACE (UtCopyEsimpleToIsimple);
580c580
< ACPI_MEM_CALLOCATE ((ACPI_SIZE) ExternalObject->String.Length + 1);
---
> ACPI_ALLOCATE_ZEROED ((ACPI_SIZE) ExternalObject->String.Length + 1);
597c597
< ACPI_MEM_CALLOCATE (ExternalObject->Buffer.Length);
---
> ACPI_ALLOCATE_ZEROED (ExternalObject->Buffer.Length);
668c668
< ACPI_FUNCTION_TRACE ("UtCopyEpackageToIpackage");
---
> ACPI_FUNCTION_TRACE (UtCopyEpackageToIpackage);
721c721
< ACPI_FUNCTION_TRACE ("UtCopyEobjectToIobject");
---
> ACPI_FUNCTION_TRACE (UtCopyEobjectToIobject);
729,730c729,730
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "Packages as parameters not implemented!\n"));
---
> ACPI_ERROR ((AE_INFO,
> "Packages as parameters not implemented!"));
803c803
< ACPI_MEM_ALLOCATE (SourceDesc->Buffer.Length);
---
> ACPI_ALLOCATE (SourceDesc->Buffer.Length);
826c826
< ACPI_MEM_ALLOCATE ((ACPI_SIZE) SourceDesc->String.Length + 1);
---
> ACPI_ALLOCATE ((ACPI_SIZE) SourceDesc->String.Length + 1);
846a847,856
> case ACPI_TYPE_REGION:
> /*
> * We copied the Region Handler, so we now must add a reference
> */
> if (DestDesc->Region.Handler)
> {
> AcpiUtAddReference (DestDesc->Region.Handler);
> }
> break;
>
941,943c951,952
< TargetObject->Package.Elements =
< ACPI_MEM_CALLOCATE (((ACPI_SIZE) SourceObject->Package.Count + 1) *
< sizeof (void *));
---
> TargetObject->Package.Elements = ACPI_ALLOCATE_ZEROED (
> ((ACPI_SIZE) SourceObject->Package.Count + 1) * sizeof (void *));
997c1006
< ACPI_FUNCTION_TRACE ("UtCopyIpackageToIpackage");
---
> ACPI_FUNCTION_TRACE (UtCopyIpackageToIpackage);
1007c1016
< DestObj->Package.Elements = ACPI_MEM_CALLOCATE (
---
> DestObj->Package.Elements = ACPI_ALLOCATE_ZEROED (
1012,1013c1021
< ACPI_REPORT_ERROR (
< ("AmlBuildCopyInternalPackageObject: Package allocation failure\n"));
---
> ACPI_ERROR ((AE_INFO, "Package allocation failure"));
1022c1030
< AcpiUtCopyIelementToIelement, WalkState);
---
> AcpiUtCopyIelementToIelement, WalkState);
1057c1065
< ACPI_FUNCTION_TRACE ("UtCopyIobjectToIobject");
---
> ACPI_FUNCTION_TRACE (UtCopyIobjectToIobject);