diff --git a/source/compiler/asltypes.h b/source/compiler/asltypes.h index c2e0d6ba0..a4031489d 100644 --- a/source/compiler/asltypes.h +++ b/source/compiler/asltypes.h @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: asltypes.h - compiler data types and struct definitions - * $Revision: 1.56 $ + * $Revision: 1.57 $ * *****************************************************************************/ @@ -155,8 +155,8 @@ typedef struct asl_method_info { UINT8 NumArguments; - UINT8 LocalInitialized[MTH_NUM_LOCALS]; - UINT8 ArgInitialized[MTH_NUM_ARGS]; + UINT8 LocalInitialized[ACPI_METHOD_NUM_LOCALS]; + UINT8 ArgInitialized[ACPI_METHOD_NUM_ARGS]; UINT32 NumReturnNoValue; UINT32 NumReturnWithValue; ACPI_PARSE_OBJECT *Op; diff --git a/source/components/debugger/dbcmds.c b/source/components/debugger/dbcmds.c index 21046e356..0343b3e02 100644 --- a/source/components/debugger/dbcmds.c +++ b/source/components/debugger/dbcmds.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 1.89 $ + * $Revision: 1.91 $ * ******************************************************************************/ @@ -412,7 +412,6 @@ AcpiDbSetMethodCallBreakpoint ( return; } - AcpiGbl_StepToNextCall = TRUE; } @@ -702,7 +701,7 @@ AcpiDbSetMethodData ( /* Set a method argument */ - if (Index > MTH_MAX_ARG) + if (Index > ACPI_METHOD_MAX_ARG) { AcpiOsPrintf ("Arg%d - Invalid argument name\n", Index); return; @@ -724,7 +723,7 @@ AcpiDbSetMethodData ( /* Set a method local */ - if (Index > MTH_MAX_LOCAL) + if (Index > ACPI_METHOD_MAX_LOCAL) { AcpiOsPrintf ("Local%d - Invalid local variable name\n", Index); return; @@ -1053,7 +1052,7 @@ ErrorExit: * * RETURN: None * - * DESCRIPTION: + * DESCRIPTION: Display the resource objects associated with a device. * ******************************************************************************/ diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index 6c2dd1d60..074e9127c 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 1.80 $ + * $Revision: 1.83 $ * ******************************************************************************/ @@ -413,7 +413,7 @@ AcpiDbDecodeInternalObject ( if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) != ACPI_DESC_TYPE_OPERAND) { - AcpiOsPrintf ("%p", ObjDesc); + AcpiOsPrintf (" %p", ObjDesc); return; } @@ -456,7 +456,7 @@ AcpiDbDecodeInternalObject ( default: - AcpiOsPrintf ("%p", ObjDesc); + AcpiOsPrintf (" %p", ObjDesc); break; } } @@ -480,8 +480,8 @@ AcpiDbDecodeNode ( { - AcpiOsPrintf (" Name %4.4s Type-%s", - Node->Name.Ascii, AcpiUtGetTypeName (Node->Type)); + AcpiOsPrintf (" Name %4.4s", + Node->Name.Ascii); if (Node->Flags & ANOBJ_METHOD_ARG) { @@ -795,7 +795,7 @@ AcpiDbDisplayLocals (void) Node = WalkState->MethodNode; AcpiOsPrintf ("Local Variables for method [%4.4s]:\n", Node->Name.Ascii); - for (i = 0; i < MTH_NUM_LOCALS; i++) + for (i = 0; i < ACPI_METHOD_NUM_LOCALS; i++) { ObjDesc = WalkState->LocalVariables[i].Object; AcpiOsPrintf ("Local%d: ", i); @@ -843,7 +843,7 @@ AcpiDbDisplayArguments (void) AcpiOsPrintf ("Method [%4.4s] has %X arguments, max concurrency = %X\n", Node->Name.Ascii, NumArgs, Concurrency); - for (i = 0; i < NumArgs; i++) + for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++) { ObjDesc = WalkState->Arguments[i].Object; AcpiOsPrintf ("Arg%d: ", i); diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c index c625b21d4..e38ec0fef 100644 --- a/source/components/debugger/dbexec.c +++ b/source/components/debugger/dbexec.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbexec - debugger control method execution - * $Revision: 1.52 $ + * $Revision: 1.47 $ * ******************************************************************************/ @@ -117,7 +117,6 @@ #include "acpi.h" #include "acdebug.h" -#include "acnamesp.h" #ifdef ACPI_DEBUGGER @@ -192,7 +191,6 @@ AcpiDbExecuteMethod ( /* Do the actual method execution */ - AcpiGbl_MethodExecuting = TRUE; Status = AcpiEvaluateObject (NULL, Info->Pathname, &ParamObjects, ReturnObj); AcpiGbl_CmSingleStep = FALSE; @@ -285,58 +283,6 @@ AcpiDbGetOutstandingAllocations ( } -/******************************************************************************* - * - * FUNCTION: AcpiDbExecutionWalk - * - * PARAMETERS: WALK_CALLBACK - * - * RETURN: Status - * - * DESCRIPTION: Execute a control method. Name is relative to the current - * scope. - * - ******************************************************************************/ - -ACPI_STATUS -AcpiDbExecutionWalk ( - ACPI_HANDLE ObjHandle, - UINT32 NestingLevel, - void *Context, - void **ReturnValue) -{ - ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) ObjHandle; - ACPI_BUFFER ReturnObj; - ACPI_STATUS Status; - - - ObjDesc = AcpiNsGetAttachedObject (Node); - if (ObjDesc->Method.ParamCount) - { - return (AE_OK); - } - - ReturnObj.Pointer = NULL; - ReturnObj.Length = ACPI_ALLOCATE_BUFFER; - - AcpiNsPrintNodePathname (Node, "Execute"); - - /* Do the actual method execution */ - - AcpiOsPrintf ("\n"); - AcpiGbl_MethodExecuting = TRUE; - - Status = AcpiEvaluateObject (Node, NULL, NULL, &ReturnObj); - - AcpiOsPrintf ("[%4.4s] returned %s\n", Node->Name.Ascii, - AcpiFormatException (Status)); - AcpiGbl_MethodExecuting = FALSE; - - return (AE_OK); -} - - /******************************************************************************* * * FUNCTION: AcpiDbExecute @@ -354,8 +300,8 @@ AcpiDbExecutionWalk ( void AcpiDbExecute ( - char *Name, - char **Args, + NATIVE_CHAR *Name, + NATIVE_CHAR **Args, UINT32 Flags) { ACPI_STATUS Status; @@ -372,24 +318,15 @@ AcpiDbExecute ( PreviousAllocations = AcpiDbGetOutstandingAllocations (); #endif - if (*Name == '*') - { - (void) AcpiWalkNamespace (ACPI_TYPE_METHOD, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, - AcpiDbExecutionWalk, NULL, NULL); - return; - } - else - { - AcpiGbl_DbMethodInfo.Name = Name; - AcpiGbl_DbMethodInfo.Args = Args; - AcpiGbl_DbMethodInfo.Flags = Flags; + AcpiGbl_DbMethodInfo.Name = Name; + AcpiGbl_DbMethodInfo.Args = Args; + AcpiGbl_DbMethodInfo.Flags = Flags; - ReturnObj.Pointer = NULL; - ReturnObj.Length = ACPI_ALLOCATE_BUFFER; + ReturnObj.Pointer = NULL; + ReturnObj.Length = ACPI_ALLOCATE_BUFFER; - AcpiDbExecuteSetup (&AcpiGbl_DbMethodInfo); - Status = AcpiDbExecuteMethod (&AcpiGbl_DbMethodInfo, &ReturnObj); - } + AcpiDbExecuteSetup (&AcpiGbl_DbMethodInfo); + Status = AcpiDbExecuteMethod (&AcpiGbl_DbMethodInfo, &ReturnObj); /* * Allow any handlers in separate threads to complete. @@ -426,7 +363,7 @@ AcpiDbExecute ( if (ReturnObj.Length) { AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n", - AcpiGbl_DbMethodInfo.Pathname, ReturnObj.Pointer, + AcpiGbl_DbMethodInfo.Pathname, ReturnObj.Pointer, (UINT32) ReturnObj.Length); AcpiDbDumpObject (ReturnObj.Pointer, 1); } @@ -504,9 +441,9 @@ AcpiDbMethodThread ( void AcpiDbCreateExecutionThreads ( - char *NumThreadsArg, - char *NumLoopsArg, - char *MethodNameArg) + NATIVE_CHAR *NumThreadsArg, + NATIVE_CHAR *NumLoopsArg, + NATIVE_CHAR *MethodNameArg) { ACPI_STATUS Status; UINT32 NumThreads;