diff options
author | Mike Smith <msmith@FreeBSD.org> | 2001-10-31 02:32:29 +0000 |
---|---|---|
committer | Mike Smith <msmith@FreeBSD.org> | 2001-10-31 02:32:29 +0000 |
commit | 0c794f32134774ae8f3645df68425c5f234a990e (patch) | |
tree | b9cb5f0ef2b19b51331c445a1773fd55ce0b739e /sys/contrib/dev/acpica/dbdisply.c | |
parent | 831a948d299c639898d67606cfff849ca99110a6 (diff) | |
download | src-0c794f32134774ae8f3645df68425c5f234a990e.tar.gz src-0c794f32134774ae8f3645df68425c5f234a990e.zip |
Import the Intel ACPI CA 20011018 snapshot
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=85756
Diffstat (limited to 'sys/contrib/dev/acpica/dbdisply.c')
-rw-r--r-- | sys/contrib/dev/acpica/dbdisply.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/sys/contrib/dev/acpica/dbdisply.c b/sys/contrib/dev/acpica/dbdisply.c index 1d6d3bab71a0..01489d83b92b 100644 --- a/sys/contrib/dev/acpica/dbdisply.c +++ b/sys/contrib/dev/acpica/dbdisply.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 52 $ + * $Revision: 57 $ * ******************************************************************************/ @@ -356,7 +356,7 @@ DumpNte: else { - AcpiOsPrintf ("Object Pathname: %s\n", RetBuf.Pointer); + AcpiOsPrintf ("Object (%p) Pathname: %s\n", Node, RetBuf.Pointer); } if (!AcpiOsReadable (Node, sizeof (ACPI_NAMESPACE_NODE))) @@ -377,7 +377,7 @@ DumpNte: return; } - AcpiUtDumpBuffer (Node->Object, sizeof (ACPI_OPERAND_OBJECT), Display, ACPI_UINT32_MAX); + AcpiUtDumpBuffer ((void *) Node->Object, sizeof (ACPI_OPERAND_OBJECT), Display, ACPI_UINT32_MAX); AcpiExDumpObjectDescriptor (Node->Object, 1); } } @@ -527,7 +527,7 @@ AcpiDbDisplayInternalObject ( break; case AML_REVISION_OP: - AcpiOsPrintf ("[Const] Revision (%X)", ACPI_CA_VERSION); + AcpiOsPrintf ("[Const] Revision (%X)", ACPI_CA_SUPPORT_LEVEL); break; case AML_LOCAL_OP: @@ -653,24 +653,12 @@ AcpiDbDisplayMethodInfo ( NumRemainingOps++; } - OpInfo = AcpiPsGetOpcodeInfo (Op->Opcode); - if (ACPI_GET_OP_TYPE (OpInfo) != ACPI_OP_TYPE_OPCODE) - { - /* Bad opcode or ASCII character */ - - continue; - } - - /* Decode the opcode */ - switch (ACPI_GET_OP_CLASS (OpInfo)) + OpInfo = AcpiPsGetOpcodeInfo (Op->Opcode); + switch (OpInfo->Class) { - case OPTYPE_CONSTANT: /* argument type only */ - case OPTYPE_LITERAL: /* argument type only */ - case OPTYPE_DATA_TERM: /* argument type only */ - case OPTYPE_LOCAL_VARIABLE: /* argument type only */ - case OPTYPE_METHOD_ARGUMENT: /* argument type only */ + case AML_CLASS_ARGUMENT: if (CountRemaining) { NumRemainingOperands++; @@ -679,6 +667,11 @@ AcpiDbDisplayMethodInfo ( NumOperands++; break; + case AML_CLASS_UNKNOWN: + /* Bad opcode or ASCII character */ + + continue; + default: if (CountRemaining) { |