aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-04-10 11:06:40 -0400
committerLen Brown <len.brown@intel.com>2008-04-22 14:29:27 -0400
commitf2d69559b31c368cfe3a51607d9cd5e8c0168875 (patch)
tree672f0eff1255e67406d440b217242ba8223b671c
parentb7f9f04228eae2cf5adc2ffeb494d4970a8dd8a5 (diff)
ACPICA: Cleanup of debug output
Improved output of object dump routine. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/executer/exdump.c39
1 files changed, 30 insertions, 9 deletions
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index e48d91634295..251d84ba79b3 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -514,8 +514,14 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
514 514
515 case AML_REF_OF_OP: 515 case AML_REF_OF_OP:
516 516
517 acpi_os_printf("Reference: (RefOf) %p\n", 517 acpi_os_printf("Reference: (RefOf) %p [%s]\n",
518 obj_desc->reference.object); 518 obj_desc->reference.object,
519 acpi_ut_get_type_name(((union
520 acpi_operand_object
521 *)obj_desc->
522 reference.
523 object)->common.
524 type));
519 break; 525 break;
520 526
521 case AML_ARG_OP: 527 case AML_ARG_OP:
@@ -556,8 +562,9 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
556 562
557 case AML_INT_NAMEPATH_OP: 563 case AML_INT_NAMEPATH_OP:
558 564
559 acpi_os_printf("Reference.Node->Name %X\n", 565 acpi_os_printf("Reference: Namepath %X [%4.4s]\n",
560 obj_desc->reference.node->name.integer); 566 obj_desc->reference.node->name.integer,
567 obj_desc->reference.node->name.ascii);
561 break; 568 break;
562 569
563 default: 570 default:
@@ -874,20 +881,32 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
874 ret_buf.length = ACPI_ALLOCATE_LOCAL_BUFFER; 881 ret_buf.length = ACPI_ALLOCATE_LOCAL_BUFFER;
875 882
876 if (obj_desc->reference.opcode == AML_INT_NAMEPATH_OP) { 883 if (obj_desc->reference.opcode == AML_INT_NAMEPATH_OP) {
877 acpi_os_printf("Named Object %p ", obj_desc->reference.node); 884 acpi_os_printf(" Named Object %p ", obj_desc->reference.node);
878 885
879 status = 886 status =
880 acpi_ns_handle_to_pathname(obj_desc->reference.node, 887 acpi_ns_handle_to_pathname(obj_desc->reference.node,
881 &ret_buf); 888 &ret_buf);
882 if (ACPI_FAILURE(status)) { 889 if (ACPI_FAILURE(status)) {
883 acpi_os_printf("Could not convert name to pathname\n"); 890 acpi_os_printf(" Could not convert name to pathname\n");
884 } else { 891 } else {
885 acpi_os_printf("%s\n", (char *)ret_buf.pointer); 892 acpi_os_printf("%s\n", (char *)ret_buf.pointer);
886 ACPI_FREE(ret_buf.pointer); 893 ACPI_FREE(ret_buf.pointer);
887 } 894 }
888 } else if (obj_desc->reference.object) { 895 } else if (obj_desc->reference.object) {
889 acpi_os_printf("\nReferenced Object: %p\n", 896 if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==
890 obj_desc->reference.object); 897 ACPI_DESC_TYPE_OPERAND) {
898 acpi_os_printf(" Target: %p [%s]\n",
899 obj_desc->reference.object,
900 acpi_ut_get_type_name(((union
901 acpi_operand_object
902 *)obj_desc->
903 reference.
904 object)->common.
905 type));
906 } else {
907 acpi_os_printf(" Target: %p\n",
908 obj_desc->reference.object);
909 }
891 } 910 }
892} 911}
893 912
@@ -973,7 +992,9 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
973 992
974 case ACPI_TYPE_LOCAL_REFERENCE: 993 case ACPI_TYPE_LOCAL_REFERENCE:
975 994
976 acpi_os_printf("[Object Reference] "); 995 acpi_os_printf("[Object Reference] %s",
996 (acpi_ps_get_opcode_info
997 (obj_desc->reference.opcode))->name);
977 acpi_ex_dump_reference_obj(obj_desc); 998 acpi_ex_dump_reference_obj(obj_desc);
978 break; 999 break;
979 1000