summaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/dsopcode.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/dsopcode.c')
-rw-r--r--sys/contrib/dev/acpica/dsopcode.c53
1 files changed, 26 insertions, 27 deletions
diff --git a/sys/contrib/dev/acpica/dsopcode.c b/sys/contrib/dev/acpica/dsopcode.c
index a8e916cddd025..83b9036377e94 100644
--- a/sys/contrib/dev/acpica/dsopcode.c
+++ b/sys/contrib/dev/acpica/dsopcode.c
@@ -2,7 +2,7 @@
*
* Module Name: dsopcode - Dispatcher Op Region support and handling of
* "control" opcodes
- * $Revision: 47 $
+ * $Revision: 49 $
*
*****************************************************************************/
@@ -170,7 +170,7 @@ AcpiDsGetBufferFieldArguments (
Node = ObjDesc->BufferField.Node;
DEBUG_EXEC(AcpiUtDisplayInitPathname (Node, " [Field]"));
- DEBUG_PRINTP (TRACE_EXEC, ("[%4.4s] BufferField JIT Init\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] BufferField JIT Init\n",
&Node->Name));
@@ -291,7 +291,7 @@ AcpiDsGetRegionArguments (
DEBUG_EXEC(AcpiUtDisplayInitPathname (Node, " [Operation Region]"));
- DEBUG_PRINTP (TRACE_EXEC, ("[%4.4s] OpRegion Init at AML %p[%x]\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] OpRegion Init at AML %p[%x]\n",
&Node->Name, ExtraDesc->Extra.Pcode,
*(UINT32*) ExtraDesc->Extra.Pcode));
@@ -299,7 +299,6 @@ AcpiDsGetRegionArguments (
* Allocate a new parser op to be the root of the parsed
* OpRegion tree
*/
-
Op = AcpiPsAllocOp (AML_SCOPE_OP);
if (!Op)
{
@@ -341,7 +340,7 @@ AcpiDsGetRegionArguments (
RegionOp->Node = Node;
AcpiPsDeleteParseTree (Op);
- /* AcpiEvaluate the address and length arguments for the OpRegion */
+ /* Evaluate the address and length arguments for the OpRegion */
Op = AcpiPsAllocOp (AML_SCOPE_OP);
if (!Op)
@@ -497,7 +496,7 @@ AcpiDsEvalBufferFieldOperands (
{
/* Invalid parameters on object stack */
- DEBUG_PRINTP (ACPI_ERROR, ("(%s) bad operand(s) (%X)\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "(%s) bad operand(s) (%X)\n",
AcpiPsGetOpcodeName (Op->Opcode), Status));
goto Cleanup;
@@ -514,7 +513,7 @@ AcpiDsEvalBufferFieldOperands (
if (!VALID_DESCRIPTOR_TYPE (ResDesc, ACPI_DESC_TYPE_NAMED))
{
- DEBUG_PRINTP (ACPI_ERROR, ("(%s) destination must be a Node\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "(%s) destination must be a Node\n",
AcpiPsGetOpcodeName (Op->Opcode)));
Status = AE_AML_OPERAND_TYPE;
@@ -603,8 +602,8 @@ AcpiDsEvalBufferFieldOperands (
default:
- DEBUG_PRINTP (ACPI_ERROR,
- ("Internal error - unknown field creation opcode %02x\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Internal error - unknown field creation opcode %02x\n",
Op->Opcode));
Status = AE_AML_BAD_OPCODE;
goto Cleanup;
@@ -625,8 +624,8 @@ AcpiDsEvalBufferFieldOperands (
if ((BitOffset + BitCount) >
(8 * (UINT32) SrcDesc->Buffer.Length))
{
- DEBUG_PRINTP (ACPI_ERROR,
- ("Field size %d exceeds Buffer size %d (bits)\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Field size %d exceeds Buffer size %d (bits)\n",
BitOffset + BitCount, 8 * (UINT32) SrcDesc->Buffer.Length));
Status = AE_AML_BUFFER_LIMIT;
goto Cleanup;
@@ -660,15 +659,15 @@ AcpiDsEvalBufferFieldOperands (
if ((SrcDesc->Common.Type > (UINT8) INTERNAL_TYPE_REFERENCE) || !AcpiUtValidObjectType (SrcDesc->Common.Type)) /* TBD: This line MUST be a single line until AcpiSrc can handle it (block deletion) */
{
- DEBUG_PRINTP (ACPI_ERROR,
- ("Tried to create field in invalid object type %X\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Tried to create field in invalid object type %X\n",
SrcDesc->Common.Type));
}
else
{
- DEBUG_PRINTP (ACPI_ERROR,
- ("Tried to create field in improper object type - %s\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Tried to create field in improper object type - %s\n",
AcpiUtGetTypeName (SrcDesc->Common.Type)));
}
@@ -802,7 +801,7 @@ AcpiDsEvalRegionOperands (
AcpiUtRemoveReference (OperandDesc);
- DEBUG_PRINTP (TRACE_EXEC, ("RgnObj %p Addr %8.8lX%8.8lX Len %X\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "RgnObj %p Addr %8.8lX%8.8lX Len %X\n",
ObjDesc, HIDWORD(ObjDesc->Region.Address), LODWORD(ObjDesc->Region.Address),
ObjDesc->Region.Length));
@@ -840,7 +839,7 @@ AcpiDsExecBeginControlOp (
PROC_NAME ("DsExecBeginControlOp");
- DEBUG_PRINTP (TRACE_DISPATCH, ("Op=%p Opcode=%2.2X State=%p\n", Op,
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p Opcode=%2.2X State=%p\n", Op,
Op->Opcode, WalkState));
switch (Op->Opcode)
@@ -931,7 +930,7 @@ AcpiDsExecEndControlOp (
{
case AML_IF_OP:
- DEBUG_PRINTP (TRACE_DISPATCH, ("[IF_OP] Op=%p\n", Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "[IF_OP] Op=%p\n", Op));
/*
* Save the result of the predicate in case there is an
@@ -956,7 +955,7 @@ AcpiDsExecEndControlOp (
case AML_WHILE_OP:
- DEBUG_PRINTP (TRACE_DISPATCH, ("[WHILE_OP] Op=%p\n", Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "[WHILE_OP] Op=%p\n", Op));
if (WalkState->ControlState->Common.Value)
{
@@ -965,7 +964,7 @@ AcpiDsExecEndControlOp (
Status = AE_CTRL_PENDING;
}
- DEBUG_PRINTP (TRACE_DISPATCH, ("[WHILE_OP] termination! Op=%p\n", Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "[WHILE_OP] termination! Op=%p\n", Op));
/* Pop this control state and free it */
@@ -978,8 +977,8 @@ AcpiDsExecEndControlOp (
case AML_RETURN_OP:
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("[RETURN_OP] Op=%p Arg=%p\n",Op, Op->Value.Arg));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "[RETURN_OP] Op=%p Arg=%p\n",Op, Op->Value.Arg));
/*
@@ -1058,8 +1057,8 @@ AcpiDsExecEndControlOp (
}
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("Completed RETURN_OP State=%p, RetVal=%p\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "Completed RETURN_OP State=%p, RetVal=%p\n",
WalkState, WalkState->ReturnDesc));
/* End the control method execution right now */
@@ -1087,8 +1086,8 @@ AcpiDsExecEndControlOp (
case AML_BREAK_OP:
- DEBUG_PRINTP (ACPI_INFO,
- ("Break to end of current package, Op=%p\n", Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ "Break to end of current package, Op=%p\n", Op));
/* TBD: update behavior for ACPI 2.0 */
@@ -1115,7 +1114,7 @@ AcpiDsExecEndControlOp (
default:
- DEBUG_PRINTP (ACPI_ERROR, ("Unknown control opcode=%X Op=%p\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown control opcode=%X Op=%p\n",
Op->Opcode, Op));
Status = AE_AML_BAD_OPCODE;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 11:25:36 +0000