diff options
| author | msmith <msmith@FreeBSD.org> | 2001-07-21 03:55:17 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2001-07-21 03:55:17 +0000 |
| commit | 91b87ce244ba7faf775a62956dc8b93fefc09941 (patch) | |
| tree | ace3ff94f32745a26e8a131379a4320fd8795556 /sys/contrib/dev/acpica/dsobject.c | |
| parent | 4a8fbafe900e74a64bb295402c983efdae3b51ee (diff) | |
| download | FreeBSD-src-91b87ce244ba7faf775a62956dc8b93fefc09941.zip FreeBSD-src-91b87ce244ba7faf775a62956dc8b93fefc09941.tar.gz | |
Vendor import of the Intel ACPI CA 20010717 snapshot.
Diffstat (limited to 'sys/contrib/dev/acpica/dsobject.c')
| -rw-r--r-- | sys/contrib/dev/acpica/dsobject.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/contrib/dev/acpica/dsobject.c b/sys/contrib/dev/acpica/dsobject.c index 78d3e23..daf7205 100644 --- a/sys/contrib/dev/acpica/dsobject.c +++ b/sys/contrib/dev/acpica/dsobject.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: dsobject - Dispatcher object management routines - * $Revision: 65 $ + * $Revision: 67 $ * *****************************************************************************/ @@ -225,7 +225,7 @@ AcpiDsInitOneObject ( { DEBUG_PRINTP (ACPI_ERROR, ("Method %p [%4.4s] parse failed! %s\n", ObjHandle, &((ACPI_NAMESPACE_NODE *)ObjHandle)->Name, - AcpiUtFormatException (Status))); + AcpiFormatException (Status))); break; } @@ -395,8 +395,8 @@ AcpiDsInitObjectFromOp ( else { - (*ObjDesc)->Buffer.Pointer = - AcpiUtCallocate ((*ObjDesc)->Buffer.Length); + (*ObjDesc)->Buffer.Pointer = ACPI_MEM_CALLOCATE ( + (*ObjDesc)->Buffer.Length); if (!(*ObjDesc)->Buffer.Pointer) { @@ -565,13 +565,15 @@ AcpiDsBuildInternalSimpleObj ( { REPORT_WARNING (("Reference %s at AML %X not found\n", Name, Op->AmlOffset)); - AcpiUtFree (Name); + ACPI_MEM_FREE (Name); } + else { REPORT_WARNING (("Reference %s at AML %X not found\n", Op->Value.String, Op->AmlOffset)); } + *ObjDescPtr = NULL; } @@ -662,8 +664,8 @@ AcpiDsBuildInternalPackageObj ( * that the list is always null terminated. */ - ObjDesc->Package.Elements = - AcpiUtCallocate ((ObjDesc->Package.Count + 1) * sizeof (void *)); + ObjDesc->Package.Elements = ACPI_MEM_CALLOCATE ( + (ObjDesc->Package.Count + 1) * sizeof (void *)); if (!ObjDesc->Package.Elements) { |
