aboutsummaryrefslogtreecommitdiff
path: root/source/components/debugger
diff options
context:
space:
mode:
Diffstat (limited to 'source/components/debugger')
-rw-r--r--source/components/debugger/dbmethod.c2
-rw-r--r--source/components/debugger/dbnames.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/source/components/debugger/dbmethod.c b/source/components/debugger/dbmethod.c
index f8f831f73e2a..90c0aad3ea6b 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 2d2a088c9a1f..68a92d5929b1 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)
{