Automated code cleanup

date	2003.02.28.17.06.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:17:29 +00:00
parent 528efa3f9b
commit 42a8505694
2 changed files with 62 additions and 15 deletions

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbcmds - debug commands and output routines
* $Revision: 1.96 $
* $Revision: 1.97 $
*
******************************************************************************/
@ -1288,7 +1288,7 @@ AcpiDbGenerateGpe (
UINT32 GpeNumber;
ACPI_GPE_EVENT_INFO *GpeEventInfo;
GpeNumber = ACPI_STRTOUL (GpeArg, NULL, 10);
BlockNumber = ACPI_STRTOUL (BlockArg, NULL, 10);

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbdisply - debug display commands
* $Revision: 1.79 $
* $Revision: 1.89 $
*
******************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* All rights reserved.
*
* 2. License
@ -220,14 +220,14 @@ AcpiDbDumpParserDescriptor (
void
AcpiDbDecodeAndDisplayObject (
NATIVE_CHAR *Target,
NATIVE_CHAR *OutputType)
char *Target,
char *OutputType)
{
void *ObjPtr;
ACPI_NAMESPACE_NODE *Node;
ACPI_OPERAND_OBJECT *ObjDesc;
UINT32 Display = DB_BYTE_DISPLAY;
NATIVE_CHAR Buffer[80];
char Buffer[80];
ACPI_BUFFER RetBuf;
ACPI_STATUS Status;
UINT32 Size;
@ -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 ("<Node> Name %4.4s Type-%s",
Node->Name.Ascii, AcpiUtGetTypeName (Node->Type));
AcpiOsPrintf ("<Node> Name %4.4s",
Node->Name.Ascii);
if (Node->Flags & ANOBJ_METHOD_ARG)
{
@ -544,7 +544,7 @@ AcpiDbDisplayInternalObject (
case ACPI_DESC_TYPE_OPERAND:
Type = ACPI_GET_OBJECT_TYPE (ObjDesc);
if (Type > INTERNAL_TYPE_MAX)
if (Type > ACPI_TYPE_LOCAL_MAX)
{
AcpiOsPrintf (" Type %X [Invalid Type]", (UINT32) Type);
return;
@ -554,7 +554,7 @@ AcpiDbDisplayInternalObject (
switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
{
case INTERNAL_TYPE_REFERENCE:
case ACPI_TYPE_LOCAL_REFERENCE:
switch (ObjDesc->Reference.Opcode)
{
@ -793,9 +793,15 @@ AcpiDbDisplayLocals (void)
ObjDesc = WalkState->MethodDesc;
Node = WalkState->MethodNode;
if (!Node)
{
AcpiOsPrintf ("No method node (Executing subtree for buffer or opregion)\n");
return;
}
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);
@ -836,6 +842,11 @@ AcpiDbDisplayArguments (void)
ObjDesc = WalkState->MethodDesc;
Node = WalkState->MethodNode;
if (!Node)
{
AcpiOsPrintf ("No method node (Executing subtree for buffer or opregion)\n");
return;
}
NumArgs = ObjDesc->Method.ParamCount;
Concurrency = ObjDesc->Method.Concurrency;
@ -843,7 +854,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);
@ -1005,5 +1016,41 @@ AcpiDbDisplayArgumentObject (
AcpiDbDisplayInternalObject (ObjDesc, WalkState);
}
/*******************************************************************************
*
* FUNCTION: AcpiDbDisplayGpes
*
* PARAMETERS:
*
* RETURN: None
*
* DESCRIPTION: Display the GPE structures
*
******************************************************************************/
void
AcpiDbDisplayGpes (void)
{
ACPI_GPE_BLOCK_INFO *GpeBlock;
UINT32 i = 0;
GpeBlock = AcpiGbl_GpeBlockListHead;
while (GpeBlock)
{
AcpiOsPrintf ("Block %d - %p\n", i, GpeBlock);
AcpiOsPrintf (" Registers: %d\n", GpeBlock->RegisterCount);
AcpiOsPrintf (" GPE range: %d to %d\n", GpeBlock->BlockBaseNumber,
GpeBlock->BlockBaseNumber + (GpeBlock->RegisterCount * 8) -1);
AcpiOsPrintf (" RegisterInfo: %p\n", GpeBlock->RegisterInfo);
AcpiOsPrintf (" EventInfo: %p\n", GpeBlock->EventInfo);
i++;
GpeBlock = GpeBlock->Next;
}
}
#endif /* ACPI_DEBUGGER */