diff options
Diffstat (limited to 'sys/contrib/dev/acpica/nseval.c')
| -rw-r--r-- | sys/contrib/dev/acpica/nseval.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/nseval.c b/sys/contrib/dev/acpica/nseval.c index 263ef971e52a..2cf9149845d0 100644 --- a/sys/contrib/dev/acpica/nseval.c +++ b/sys/contrib/dev/acpica/nseval.c @@ -2,7 +2,7 @@ * * Module Name: nseval - Object evaluation interfaces -- includes control * method lookup and execution. - * $Revision: 99 $ + * $Revision: 102 $ * ******************************************************************************/ @@ -188,7 +188,7 @@ AcpiNsEvaluateRelative ( AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); - PrefixNode = AcpiNsConvertHandleToEntry (Handle); + PrefixNode = AcpiNsMapHandleToNode (Handle); if (!PrefixNode) { AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); @@ -374,7 +374,7 @@ AcpiNsEvaluateByHandle ( AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); - Node = AcpiNsConvertHandleToEntry (Handle); + Node = AcpiNsMapHandleToNode (Handle); if (!Node) { AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); @@ -492,13 +492,13 @@ AcpiNsExecuteControlMethod ( } - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Control method at Offset %x Length %lx]\n", + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Control method at Offset %p Length %x]\n", ObjDesc->Method.AmlStart + 1, ObjDesc->Method.AmlLength - 1)); DUMP_PATHNAME (MethodNode, "NsExecuteControlMethod: Executing", ACPI_LV_NAMES, _COMPONENT); - ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "At offset %8XH\n", + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "At offset %p\n", ObjDesc->Method.AmlStart + 1)); @@ -549,7 +549,7 @@ AcpiNsGetObjectValue ( { ACPI_STATUS Status = AE_OK; ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_OPERAND_OBJECT *ValDesc; + ACPI_OPERAND_OBJECT *SourceDesc; FUNCTION_TRACE ("NsGetObjectValue"); @@ -574,8 +574,8 @@ AcpiNsGetObjectValue ( /* * Get the attached object */ - ValDesc = AcpiNsGetAttachedObject (Node); - if (!ValDesc) + SourceDesc = AcpiNsGetAttachedObject (Node); + if (!SourceDesc) { Status = AE_NULL_OBJECT; goto UnlockAndExit; @@ -587,7 +587,7 @@ AcpiNsGetObjectValue ( * TBD: [Future] - need a low-level object copy that handles * the reference count automatically. (Don't want to copy it) */ - MEMCPY (ObjDesc, ValDesc, sizeof (ACPI_OPERAND_OBJECT)); + MEMCPY (ObjDesc, SourceDesc, sizeof (ACPI_OPERAND_OBJECT)); ObjDesc->Common.ReferenceCount = 1; AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); } |