diff options
Diffstat (limited to 'sys/contrib/dev/acpica/nsobject.c')
| -rw-r--r-- | sys/contrib/dev/acpica/nsobject.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/contrib/dev/acpica/nsobject.c b/sys/contrib/dev/acpica/nsobject.c index 567c8f0..ca27e8b 100644 --- a/sys/contrib/dev/acpica/nsobject.c +++ b/sys/contrib/dev/acpica/nsobject.c @@ -2,7 +2,7 @@ * * Module Name: nsobject - Utilities for objects attached to namespace * table entries - * $Revision: 60 $ + * $Revision: 63 $ * ******************************************************************************/ @@ -254,7 +254,6 @@ AcpiNsAttachObject ( { ObjDesc = (ACPI_OPERAND_OBJECT *) Object; - /* If a valid type (non-ANY) was given, just use it */ if (ACPI_TYPE_ANY != Type) @@ -262,13 +261,9 @@ AcpiNsAttachObject ( ObjType = Type; } - /* * Type is TYPE_Any, we must try to determinte the - * actual type of the object - */ - - /* + * actual type of the object. * Check if value points into the AML code */ else if (AcpiTbSystemTablePointer (Object)) @@ -303,11 +298,11 @@ AcpiNsAttachObject ( /* Otherwise, fall through and set the type to Integer */ - case AML_ZERO_OP: - case AML_ONES_OP: + case AML_ZERO_OP: + case AML_ONES_OP: case AML_ONE_OP: - case AML_BYTE_OP: - case AML_WORD_OP: + case AML_BYTE_OP: + case AML_WORD_OP: case AML_DWORD_OP: case AML_QWORD_OP: @@ -356,7 +351,7 @@ AcpiNsAttachObject ( * Cannot figure out the type -- set to DefAny which * will print as an error in the name table dump */ - if (GetDebugLevel () > 0) + if (AcpiDbgLevel > 0) { DUMP_PATHNAME (Node, "NsAttachObject confused: setting bogus type for ", @@ -447,6 +442,7 @@ AcpiNsDetachObject ( FUNCTION_TRACE ("NsDetachObject"); + ObjDesc = Node->Object; if (!ObjDesc) { |
