4c4
< * $Revision: 55 $
---
> * $Revision: 59 $
119d118
< #include "acparser.h"
121,124d119
< #include "acnamesp.h"
< #include "acparser.h"
< #include "acevents.h"
< #include "acinterp.h"
165c160,161
< if (WalkState->MethodBreakpoint && (WalkState->MethodBreakpoint <= Op->AmlOffset))
---
> if (WalkState->MethodBreakpoint &&
> (WalkState->MethodBreakpoint <= Op->Common.AmlOffset))
170c166
< AcpiOsPrintf ("***Break*** at AML offset %X\n", Op->AmlOffset);
---
> AcpiOsPrintf ("***Break*** at AML offset %X\n", Op->Common.AmlOffset);
178c174,175
< else if (WalkState->UserBreakpoint && (WalkState->UserBreakpoint == Op->AmlOffset))
---
> else if (WalkState->UserBreakpoint &&
> (WalkState->UserBreakpoint == Op->Common.AmlOffset))
180c177
< AcpiOsPrintf ("***UserBreakpoint*** at AML offset %X\n", Op->AmlOffset);
---
> AcpiOsPrintf ("***UserBreakpoint*** at AML offset %X\n", Op->Common.AmlOffset);
191c188
< if (Op->Opcode == AML_INT_NAMEDFIELD_OP)
---
> if (Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
200a198,201
>
> default:
> /* All other opcodes -- continue */
> break;
223,224c224,225
< Next = Op->Next;
< Op->Next = NULL;
---
> Next = Op->Common.Next;
> Op->Common.Next = NULL;
228c229
< ParentOp = Op->Parent;
---
> ParentOp = Op->Common.Parent;
241,242c242,243
< if ((ParentOp->Opcode == AML_IF_OP) ||
< (ParentOp->Opcode == AML_WHILE_OP))
---
> if ((ParentOp->Common.AmlOpcode == AML_IF_OP) ||
> (ParentOp->Common.AmlOpcode == AML_WHILE_OP))
247c248
< ParentOp = ParentOp->Parent;
---
> ParentOp = ParentOp->Common.Parent;
254,258c255,259
< if ((ParentOp->Opcode == AML_IF_OP) ||
< (ParentOp->Opcode == AML_ELSE_OP) ||
< (ParentOp->Opcode == AML_SCOPE_OP) ||
< (ParentOp->Opcode == AML_METHOD_OP) ||
< (ParentOp->Opcode == AML_WHILE_OP))
---
> if ((ParentOp->Common.AmlOpcode == AML_IF_OP) ||
> (ParentOp->Common.AmlOpcode == AML_ELSE_OP) ||
> (ParentOp->Common.AmlOpcode == AML_SCOPE_OP) ||
> (ParentOp->Common.AmlOpcode == AML_METHOD_OP) ||
> (ParentOp->Common.AmlOpcode == AML_WHILE_OP))
263c264
< ParentOp = ParentOp->Parent;
---
> ParentOp = ParentOp->Common.Parent;
272,273c273,274
< if ((Op->Opcode == AML_IF_OP) ||
< (Op->Opcode == AML_WHILE_OP))
---
> if ((Op->Common.AmlOpcode == AML_IF_OP) ||
> (Op->Common.AmlOpcode == AML_WHILE_OP))
285c286
< else if (Op->Opcode == AML_ELSE_OP)
---
> else if (Op->Common.AmlOpcode == AML_ELSE_OP)
292c293
< Op->Next = Next;
---
> Op->Common.Next = Next;
310c311
< if (Op->Opcode != AML_INT_METHODCALL_OP)
---
> if (Op->Common.AmlOpcode != AML_INT_METHODCALL_OP)
326c327
< if (Op->Opcode == AML_INT_METHODCALL_OP)
---
> if (Op->Common.AmlOpcode == AML_INT_METHODCALL_OP)
383c384
< AcpiOsGetLine (AcpiGbl_DbLineBuf);
---
> (void) AcpiOsGetLine (AcpiGbl_DbLineBuf);
409c410
< int
---
> ACPI_STATUS
411a413
> ACPI_STATUS Status;
412a415
>
432c435
< return 0;
---
> return (AE_NO_MEMORY);
451,452c454,465
< AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_COMPLETE);
< AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_READY);
---
> Status = AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_COMPLETE);
> if (ACPI_FAILURE (Status))
> {
> AcpiOsPrintf ("Could not get debugger mutex\n");
> return (Status);
> }
> Status = AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_READY);
> if (ACPI_FAILURE (Status))
> {
> AcpiOsPrintf ("Could not get debugger mutex\n");
> return (Status);
> }
456c469,474
< AcpiOsQueueForExecution (0, AcpiDbExecuteThread, NULL);
---
> Status = AcpiOsQueueForExecution (0, AcpiDbExecuteThread, NULL);
> if (ACPI_FAILURE (Status))
> {
> AcpiOsPrintf ("Could not start debugger thread\n");
> return (Status);
> }
466c484
< return (0);
---
> return (AE_OK);