diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-10-04 20:07:58 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-10-04 20:07:58 +0000 |
| commit | 3b2a4f1cbea5e9139e6d4710e31efedef37247ac (patch) | |
| tree | 95e2e8a70dc361cf34d6a4c080313e68541ea4aa /sys/contrib/dev/acpica/dsobject.c | |
| parent | 1824f192010fc0c0826e9889892e534075b58793 (diff) | |
| download | FreeBSD-src-3b2a4f1cbea5e9139e6d4710e31efedef37247ac.zip FreeBSD-src-3b2a4f1cbea5e9139e6d4710e31efedef37247ac.tar.gz | |
Vendor import of the Intel ACPI CA 20021002 drop.
Diffstat (limited to 'sys/contrib/dev/acpica/dsobject.c')
| -rw-r--r-- | sys/contrib/dev/acpica/dsobject.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/sys/contrib/dev/acpica/dsobject.c b/sys/contrib/dev/acpica/dsobject.c index 7f54e84..569023c 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: 106 $ + * $Revision: 108 $ * *****************************************************************************/ @@ -339,12 +339,12 @@ AcpiDsBuildInternalObject ( { ACPI_OPERAND_OBJECT *ObjDesc; ACPI_STATUS Status; - char *Name; ACPI_FUNCTION_TRACE ("DsBuildInternalObject"); + *ObjDescPtr = NULL; if (Op->Common.AmlOpcode == AML_INT_NAMEPATH_OP) { /* @@ -361,28 +361,8 @@ AcpiDsBuildInternalObject ( if (ACPI_FAILURE (Status)) { - if (Status == AE_NOT_FOUND) - { - Name = NULL; - Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, Op->Common.Value.String, NULL, &Name); - if (ACPI_SUCCESS (Status)) - { - ACPI_REPORT_WARNING (("Reference %s at AML %X not found\n", - Name, Op->Common.AmlOffset)); - ACPI_MEM_FREE (Name); - } - else - { - ACPI_REPORT_WARNING (("Reference %s at AML %X not found\n", - Op->Common.Value.String, Op->Common.AmlOffset)); - } - - *ObjDescPtr = NULL; - } - else - { - return_ACPI_STATUS (Status); - } + ACPI_REPORT_NSERROR (Op->Common.Value.String, Status); + return_ACPI_STATUS (Status); } } } @@ -881,9 +861,10 @@ AcpiDsInitObjectFromOp ( ObjDesc->Reference.Opcode = AML_LOCAL_OP; ObjDesc->Reference.Offset = Opcode - AML_LOCAL_OP; + #ifndef ACPI_NO_METHOD_EXECUTION - AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset, - WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object); + Status = AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset, + WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object); #endif break; |
