aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/exstore.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/exstore.c')
-rw-r--r--sys/contrib/dev/acpica/exstore.c53
1 files changed, 27 insertions, 26 deletions
diff --git a/sys/contrib/dev/acpica/exstore.c b/sys/contrib/dev/acpica/exstore.c
index 85284575f766..bc1b536b2615 100644
--- a/sys/contrib/dev/acpica/exstore.c
+++ b/sys/contrib/dev/acpica/exstore.c
@@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exstore - AML Interpreter object store support
- * $Revision: 140 $
+ * $Revision: 142 $
*
*****************************************************************************/
@@ -166,7 +166,7 @@ AcpiExStore (
if (!ValDesc || !DestDesc)
{
- DEBUG_PRINTP (ACPI_ERROR, ("Internal - null pointer\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - null pointer\n"));
return_ACPI_STATUS (AE_AML_NO_OPERAND);
}
@@ -193,8 +193,8 @@ AcpiExStore (
{
/* Destination is not an Reference */
- DEBUG_PRINTP (ACPI_ERROR,
- ("Destination is not a ReferenceObj [%p]\n", DestDesc));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Destination is not a ReferenceObj [%p]\n", DestDesc));
DUMP_STACK_ENTRY (ValDesc);
DUMP_STACK_ENTRY (DestDesc);
@@ -251,43 +251,43 @@ AcpiExStore (
* Storing to the Debug object causes the value stored to be
* displayed and otherwise has no effect -- see ACPI Specification
*/
- DEBUG_PRINT (ACPI_INFO, ("**** Write to Debug Object: ****: \n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "**** Write to Debug Object: ****: \n"));
- DEBUG_PRINT_RAW (ACPI_DEBUG_OBJECT, ("[ACPI Debug] %s: ",
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OBJECTS, "[ACPI Debug] %s: ",
AcpiUtGetTypeName (ValDesc->Common.Type)));
switch (ValDesc->Common.Type)
{
case ACPI_TYPE_INTEGER:
- DEBUG_PRINT_RAW (ACPI_DEBUG_OBJECT, ("0x%X (%d)\n",
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OBJECTS, "0x%X (%d)\n",
(UINT32) ValDesc->Integer.Value, (UINT32) ValDesc->Integer.Value));
break;
case ACPI_TYPE_BUFFER:
- DEBUG_PRINT_RAW (ACPI_DEBUG_OBJECT, ("Length 0x%X\n",
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OBJECTS, "Length 0x%X\n",
(UINT32) ValDesc->Buffer.Length));
break;
case ACPI_TYPE_STRING:
- DEBUG_PRINT_RAW (ACPI_DEBUG_OBJECT, ("%s\n", ValDesc->String.Pointer));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OBJECTS, "%s\n", ValDesc->String.Pointer));
break;
case ACPI_TYPE_PACKAGE:
- DEBUG_PRINT_RAW (ACPI_DEBUG_OBJECT, ("Elements - 0x%X\n",
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OBJECTS, "Elements - 0x%X\n",
(UINT32) ValDesc->Package.Elements));
break;
default:
- DEBUG_PRINT_RAW (ACPI_DEBUG_OBJECT, ("@0x%p\n", ValDesc));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OBJECTS, "@0x%p\n", ValDesc));
break;
}
@@ -297,6 +297,7 @@ AcpiExStore (
case AML_ZERO_OP:
case AML_ONE_OP:
case AML_ONES_OP:
+ case AML_REVISION_OP:
/*
* Storing to a constant is a no-op -- see ACPI Specification
@@ -307,7 +308,7 @@ AcpiExStore (
default:
- DEBUG_PRINTP (ACPI_ERROR, ("Internal - Unknown Reference subtype %02x\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - Unknown Reference subtype %02x\n",
RefDesc->Reference.Opcode));
/* TBD: [Restructure] use object dump routine !! */
@@ -456,8 +457,8 @@ AcpiExStoreObjectToIndex (
* An error occurrered when copying the internal object
* so delete the reference.
*/
- DEBUG_PRINTP (ACPI_ERROR,
- ("Unable to copy the internal object\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Unable to copy the internal object\n"));
return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
}
}
@@ -516,7 +517,7 @@ AcpiExStoreObjectToIndex (
Length = ValDesc->Buffer.Length;
for (i = 0; i < Length; i++)
{
- Value = *(ValDesc->Buffer.Pointer + i);
+ Value = ValDesc->Buffer.Pointer[i];
ObjDesc->Buffer.Pointer[DestDesc->Reference.Offset] = Value;
}
break;
@@ -530,7 +531,7 @@ AcpiExStoreObjectToIndex (
Length = ValDesc->String.Length;
for (i = 0; i < Length; i++)
{
- Value = *(ValDesc->String.Pointer + i);
+ Value = ValDesc->String.Pointer[i];
ObjDesc->Buffer.Pointer[DestDesc->Reference.Offset] = Value;
}
break;
@@ -540,8 +541,8 @@ AcpiExStoreObjectToIndex (
/* Other types are invalid */
- DEBUG_PRINTP (ACPI_ERROR,
- ("Source must be Number/Buffer/String type, not %X\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Source must be Number/Buffer/String type, not %X\n",
ValDesc->Common.Type));
Status = AE_AML_OPERAND_TYPE;
break;
@@ -550,7 +551,7 @@ AcpiExStoreObjectToIndex (
default:
- DEBUG_PRINTP (ACPI_ERROR, ("Target is not a Package or BufferField\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Target is not a Package or BufferField\n"));
Status = AE_AML_OPERAND_TYPE;
break;
}
@@ -611,7 +612,7 @@ AcpiExStoreObjectToNode (
TargetType = AcpiNsGetType (Node);
TargetDesc = AcpiNsGetAttachedObject (Node);
- DEBUG_PRINTP (ACPI_INFO, ("Storing %p(%s) into node %p(%s)\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Storing %p(%s) into node %p(%s)\n",
Node, AcpiUtGetTypeName (SourceDesc->Common.Type),
SourceDesc, AcpiUtGetTypeName (TargetType)));
@@ -666,8 +667,8 @@ AcpiExStoreObjectToNode (
* SourceDesc reference count is incremented by AttachObject.
*/
Status = AcpiNsAttachObject (Node, TargetDesc, TargetType);
- DEBUG_PRINTP (ACPI_INFO,
- ("Store %s into %s via Convert/Attach\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ "Store %s into %s via Convert/Attach\n",
AcpiUtGetTypeName (TargetDesc->Common.Type),
AcpiUtGetTypeName (TargetType)));
break;
@@ -679,8 +680,8 @@ AcpiExStoreObjectToNode (
Status = AcpiNsAttachObject (Node, SourceDesc, SourceDesc->Common.Type);
- DEBUG_PRINTP (ACPI_INFO,
- ("Store %s into %s via Attach only\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ "Store %s into %s via Attach only\n",
AcpiUtGetTypeName (SourceDesc->Common.Type),
AcpiUtGetTypeName (SourceDesc->Common.Type)));
break;
@@ -734,7 +735,7 @@ AcpiExStoreObjectToObject (
* Assuming the parameters are valid!
*/
- DEBUG_PRINTP (ACPI_INFO, ("Storing %p(%s) to %p(%s)\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Storing %p(%s) to %p(%s)\n",
SourceDesc, AcpiUtGetTypeName (SourceDesc->Common.Type),
DestDesc, AcpiUtGetTypeName (DestDesc->Common.Type)));
@@ -750,7 +751,7 @@ AcpiExStoreObjectToObject (
break;
default:
- DEBUG_PRINTP (ACPI_WARN, ("Store into %s not implemented\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "Store into %s not implemented\n",
AcpiUtGetTypeName (DestDesc->Common.Type)));
return_ACPI_STATUS (AE_NOT_IMPLEMENTED);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-16 08:22:59 +0000