diff options
author | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
commit | ca7944e4059769f0f5788417db3d8f3b2a8e7996 (patch) | |
tree | 3858a454e4df3ea62639923664ce32f0d9706e26 /sys/contrib/dev/acpica/components/utilities/utobject.c | |
parent | 4cdc15c1f748d4763888b9351c2316a878059a87 (diff) | |
parent | af69f95bba3597db53a980597cfd371c9f6ee7cf (diff) | |
download | FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.zip FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.tar.gz |
Merge ACPICA 20130517.
Diffstat (limited to 'sys/contrib/dev/acpica/components/utilities/utobject.c')
-rw-r--r-- | sys/contrib/dev/acpica/components/utilities/utobject.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/components/utilities/utobject.c b/sys/contrib/dev/acpica/components/utilities/utobject.c index daa8e40..46c3514 100644 --- a/sys/contrib/dev/acpica/components/utilities/utobject.c +++ b/sys/contrib/dev/acpica/components/utilities/utobject.c @@ -140,6 +140,7 @@ AcpiUtCreateInternalObjectDbg ( break; default: + /* All others have no secondary object */ break; } @@ -397,6 +398,7 @@ AcpiUtValidInternalObject ( return (TRUE); default: + ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p is not not an ACPI operand obj [%s]\n", Object, AcpiUtGetDescriptorName (Object))); @@ -556,13 +558,11 @@ AcpiUtGetSimpleObjectSize ( Length += (ACPI_SIZE) InternalObject->String.Length + 1; break; - case ACPI_TYPE_BUFFER: Length += (ACPI_SIZE) InternalObject->Buffer.Length; break; - case ACPI_TYPE_INTEGER: case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_POWER: @@ -571,13 +571,11 @@ AcpiUtGetSimpleObjectSize ( break; - case ACPI_TYPE_LOCAL_REFERENCE: switch (InternalObject->Reference.Class) { case ACPI_REFCLASS_NAME: - /* * Get the actual length of the full pathname to this object. * The reference will be converted to the pathname to the object @@ -592,7 +590,6 @@ AcpiUtGetSimpleObjectSize ( break; default: - /* * No other reference opcodes are supported. * Notably, Locals and Args are not supported, but this may be @@ -607,7 +604,6 @@ AcpiUtGetSimpleObjectSize ( } break; - default: ACPI_ERROR ((AE_INFO, "Cannot convert to external object - " @@ -656,7 +652,6 @@ AcpiUtGetElementLength ( switch (ObjectType) { case ACPI_COPY_TYPE_SIMPLE: - /* * Simple object - just get the size (Null object/entry is handled * here also) and sum it into the running package length @@ -670,7 +665,6 @@ AcpiUtGetElementLength ( Info->Length += ObjectSpace; break; - case ACPI_COPY_TYPE_PACKAGE: /* Package object - nothing much to do here, let the walk handle it */ @@ -679,7 +673,6 @@ AcpiUtGetElementLength ( State->Pkg.ThisTargetObj = NULL; break; - default: /* No other types allowed */ |