diff options
| author | jkim <jkim@FreeBSD.org> | 2013-04-04 21:18:57 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-04-04 21:18:57 +0000 |
| commit | 4b5fbe0ac6228523722afb80af9d5c8ed2ba5ee8 (patch) | |
| tree | 2d060ed4fedfc9aace2e673176570faa8ae1d376 /source/components/debugger | |
| parent | bd5edd68a8fda8df18c688919e100f7f1df5ad6b (diff) | |
| download | FreeBSD-src-4b5fbe0ac6228523722afb80af9d5c8ed2ba5ee8.zip FreeBSD-src-4b5fbe0ac6228523722afb80af9d5c8ed2ba5ee8.tar.gz | |
Import ACPICA 20130328.
Diffstat (limited to 'source/components/debugger')
| -rw-r--r-- | source/components/debugger/dbmethod.c | 2 | ||||
| -rw-r--r-- | source/components/debugger/dbnames.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/components/debugger/dbmethod.c b/source/components/debugger/dbmethod.c index f8f831f..90c0aad 100644 --- a/source/components/debugger/dbmethod.c +++ b/source/components/debugger/dbmethod.c @@ -445,7 +445,7 @@ AcpiDbWalkForExecute ( const ACPI_PREDEFINED_INFO *Predefined; - Predefined = AcpiNsCheckForPredefinedName (Node); + Predefined = AcpiUtMatchPredefinedMethod (Node->Name.Ascii); if (!Predefined) { return (AE_OK); diff --git a/source/components/debugger/dbnames.c b/source/components/debugger/dbnames.c index 2d2a088..68a92d5 100644 --- a/source/components/debugger/dbnames.c +++ b/source/components/debugger/dbnames.c @@ -46,6 +46,7 @@ #include "accommon.h" #include "acnamesp.h" #include "acdebug.h" +#include "acpredef.h" #ifdef ACPI_DEBUGGER @@ -436,7 +437,7 @@ AcpiDbWalkForPredefinedNames ( char *Pathname; - Predefined = AcpiNsCheckForPredefinedName (Node); + Predefined = AcpiUtMatchPredefinedMethod (Node->Name.Ascii); if (!Predefined) { return (AE_OK); @@ -450,13 +451,14 @@ AcpiDbWalkForPredefinedNames ( /* If method returns a package, the info is in the next table entry */ - if (Predefined->Info.ExpectedBtypes & ACPI_BTYPE_PACKAGE) + if (Predefined->Info.ExpectedBtypes & ACPI_RTYPE_PACKAGE) { Package = Predefined + 1; } AcpiOsPrintf ("%-32s arg %X ret %2.2X", Pathname, - Predefined->Info.ParamCount, Predefined->Info.ExpectedBtypes); + (Predefined->Info.ArgumentList & METHOD_ARG_MASK), + Predefined->Info.ExpectedBtypes); if (Package) { |
