diff options
Diffstat (limited to 'sys/contrib/dev/acpica/exdump.c')
| -rw-r--r-- | sys/contrib/dev/acpica/exdump.c | 76 |
1 files changed, 25 insertions, 51 deletions
diff --git a/sys/contrib/dev/acpica/exdump.c b/sys/contrib/dev/acpica/exdump.c index 1a20823..9e2be80 100644 --- a/sys/contrib/dev/acpica/exdump.c +++ b/sys/contrib/dev/acpica/exdump.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: exdump - Interpreter debug output routines - * $Revision: 160 $ + * $Revision: 163 $ * *****************************************************************************/ @@ -150,7 +150,6 @@ AcpiExDumpOperand ( { UINT8 *Buf = NULL; UINT32 Length; - UINT32 i; ACPI_OPERAND_OBJECT **Element; UINT16 ElementIndex; @@ -194,7 +193,7 @@ AcpiExDumpOperand ( switch (ACPI_GET_OBJECT_TYPE (ObjDesc)) { - case INTERNAL_TYPE_REFERENCE: + case ACPI_TYPE_LOCAL_REFERENCE: switch (ObjDesc->Reference.Opcode) { @@ -320,22 +319,6 @@ AcpiExDumpOperand ( break; - case INTERNAL_TYPE_IF: - - AcpiOsPrintf ("If [Integer] %8.8X%8.8X\n", - ACPI_HIDWORD (ObjDesc->Integer.Value), - ACPI_LODWORD (ObjDesc->Integer.Value)); - break; - - - case INTERNAL_TYPE_WHILE: - - AcpiOsPrintf ("While [Integer] %8.8X%8.8X\n", - ACPI_HIDWORD (ObjDesc->Integer.Value), - ACPI_LODWORD (ObjDesc->Integer.Value)); - break; - - case ACPI_TYPE_PACKAGE: AcpiOsPrintf ("Package count %X @ %p\n", @@ -386,25 +369,20 @@ AcpiExDumpOperand ( case ACPI_TYPE_STRING: - AcpiOsPrintf ("String length %X @ %p \"", + AcpiOsPrintf ("String length %X @ %p ", ObjDesc->String.Length, ObjDesc->String.Pointer); - - for (i = 0; i < ObjDesc->String.Length; i++) - { - AcpiOsPrintf ("%c", - ObjDesc->String.Pointer[i]); - } - AcpiOsPrintf ("\"\n"); + AcpiUtPrintString (ObjDesc->String.Pointer, ACPI_UINT8_MAX); + AcpiOsPrintf ("\n"); break; - case INTERNAL_TYPE_BANK_FIELD: + case ACPI_TYPE_LOCAL_BANK_FIELD: AcpiOsPrintf ("BankField\n"); break; - case INTERNAL_TYPE_REGION_FIELD: + case ACPI_TYPE_LOCAL_REGION_FIELD: AcpiOsPrintf ( "RegionField: Bits=%X AccWidth=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n", @@ -416,7 +394,7 @@ AcpiExDumpOperand ( break; - case INTERNAL_TYPE_INDEX_FIELD: + case ACPI_TYPE_LOCAL_INDEX_FIELD: AcpiOsPrintf ("IndexField\n"); break; @@ -722,7 +700,10 @@ AcpiExDumpObjectDescriptor ( case ACPI_TYPE_STRING: AcpiExOutInteger ("Length", ObjDesc->String.Length); - AcpiExOutPointer ("Pointer", ObjDesc->String.Pointer); + + AcpiOsPrintf ("%20s : %p ", "Pointer", ObjDesc->String.Pointer); + AcpiUtPrintString (ObjDesc->String.Pointer, ACPI_UINT8_MAX); + AcpiOsPrintf ("\n"); break; @@ -730,6 +711,7 @@ AcpiExDumpObjectDescriptor ( AcpiExOutInteger ("Length", ObjDesc->Buffer.Length); AcpiExOutPointer ("Pointer", ObjDesc->Buffer.Pointer); + ACPI_DUMP_BUFFER (ObjDesc->Buffer.Pointer, ObjDesc->Buffer.Length); break; @@ -831,9 +813,9 @@ AcpiExDumpObjectDescriptor ( case ACPI_TYPE_BUFFER_FIELD: - case INTERNAL_TYPE_REGION_FIELD: - case INTERNAL_TYPE_BANK_FIELD: - case INTERNAL_TYPE_INDEX_FIELD: + case ACPI_TYPE_LOCAL_REGION_FIELD: + case ACPI_TYPE_LOCAL_BANK_FIELD: + case ACPI_TYPE_LOCAL_INDEX_FIELD: AcpiExOutInteger ("FieldFlags", ObjDesc->CommonField.FieldFlags); AcpiExOutInteger ("AccessByteWidth", ObjDesc->CommonField.AccessByteWidth); @@ -851,17 +833,17 @@ AcpiExDumpObjectDescriptor ( AcpiExOutPointer ("BufferObj", ObjDesc->BufferField.BufferObj); break; - case INTERNAL_TYPE_REGION_FIELD: + case ACPI_TYPE_LOCAL_REGION_FIELD: AcpiExOutPointer ("RegionObj", ObjDesc->Field.RegionObj); break; - case INTERNAL_TYPE_BANK_FIELD: + case ACPI_TYPE_LOCAL_BANK_FIELD: AcpiExOutInteger ("Value", ObjDesc->BankField.Value); AcpiExOutPointer ("RegionObj", ObjDesc->BankField.RegionObj); AcpiExOutPointer ("BankObj", ObjDesc->BankField.BankObj); break; - case INTERNAL_TYPE_INDEX_FIELD: + case ACPI_TYPE_LOCAL_INDEX_FIELD: AcpiExOutInteger ("Value", ObjDesc->IndexField.Value); AcpiExOutPointer ("Index", ObjDesc->IndexField.IndexObj); AcpiExOutPointer ("Data", ObjDesc->IndexField.DataObj); @@ -874,7 +856,7 @@ AcpiExDumpObjectDescriptor ( break; - case INTERNAL_TYPE_REFERENCE: + case ACPI_TYPE_LOCAL_REFERENCE: AcpiExOutInteger ("TargetType", ObjDesc->Reference.TargetType); AcpiExOutString ("Opcode", (AcpiPsGetOpcodeInfo (ObjDesc->Reference.Opcode))->Name); @@ -885,7 +867,7 @@ AcpiExDumpObjectDescriptor ( break; - case INTERNAL_TYPE_ADDRESS_HANDLER: + case ACPI_TYPE_LOCAL_ADDRESS_HANDLER: AcpiExOutInteger ("SpaceId", ObjDesc->AddrHandler.SpaceId); AcpiExOutPointer ("Next", ObjDesc->AddrHandler.Next); @@ -895,24 +877,16 @@ AcpiExDumpObjectDescriptor ( break; - case INTERNAL_TYPE_NOTIFY: + case ACPI_TYPE_LOCAL_NOTIFY: AcpiExOutPointer ("Node", ObjDesc->NotifyHandler.Node); AcpiExOutPointer ("Context", ObjDesc->NotifyHandler.Context); break; - case INTERNAL_TYPE_ALIAS: - case INTERNAL_TYPE_FIELD_DEFN: - case INTERNAL_TYPE_BANK_FIELD_DEFN: - case INTERNAL_TYPE_INDEX_FIELD_DEFN: - case INTERNAL_TYPE_IF: - case INTERNAL_TYPE_ELSE: - case INTERNAL_TYPE_WHILE: - case INTERNAL_TYPE_SCOPE: - case INTERNAL_TYPE_DEF_ANY: - case INTERNAL_TYPE_EXTRA: - case INTERNAL_TYPE_DATA: + case ACPI_TYPE_LOCAL_ALIAS: + case ACPI_TYPE_LOCAL_EXTRA: + case ACPI_TYPE_LOCAL_DATA: default: AcpiOsPrintf ("ExDumpObjectDescriptor: Display not implemented for object type %s\n", |
