Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77f6a9fc authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Update debug output routines for data structure changes 



Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 15a58ed1

drivers/acpi/executer/exdump.c

+5 −22
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ static void acpi_ex_out_string(char *title, char *value); 


static void acpi_ex_out_pointer(char *title, void *value);



static void acpi_ex_out_address(char *title, acpi_physical_address value);



static void

acpi_ex_dump_object(union acpi_operand_object *obj_desc,

		    struct acpi_exdump_info *info);
@@ -92,10 +90,11 @@ static struct acpi_exdump_info acpi_ex_dump_string[4] = { 
	{ACPI_EXD_STRING, 0, NULL}

};



static struct acpi_exdump_info acpi_ex_dump_buffer[4] = {

static struct acpi_exdump_info acpi_ex_dump_buffer[5] = {

	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_buffer), NULL},

	{ACPI_EXD_UINT32, ACPI_EXD_OFFSET(buffer.length), "Length"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.pointer), "Pointer"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.node), "Parent Node"},

	{ACPI_EXD_BUFFER, 0, NULL}

};
@@ -165,8 +164,8 @@ static struct acpi_exdump_info acpi_ex_dump_power[5] = { 


static struct acpi_exdump_info acpi_ex_dump_processor[7] = {

	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_processor), NULL},

	{ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},

	{ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.length), "Length"},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.length), "Length"},

	{ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify),

	 "System Notify"},
@@ -379,18 +378,12 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, 
			break;



		case ACPI_EXD_POINTER:

		case ACPI_EXD_ADDRESS:



			acpi_ex_out_pointer(name,

					    *ACPI_CAST_PTR(void *, target));

			break;



		case ACPI_EXD_ADDRESS:



			acpi_ex_out_address(name,

					    *ACPI_CAST_PTR

					    (acpi_physical_address, target));

			break;



		case ACPI_EXD_STRING:



			acpi_ut_print_string(obj_desc->string.pointer,
@@ -834,16 +827,6 @@ static void acpi_ex_out_pointer(char *title, void *value) 
	acpi_os_printf("%20s : %p\n", title, value);

}



static void acpi_ex_out_address(char *title, acpi_physical_address value)

{



#if ACPI_MACHINE_WIDTH == 16

	acpi_os_printf("%20s : %p\n", title, value);

#else

	acpi_os_printf("%20s : %8.8X%8.8X\n", title, ACPI_FORMAT_UINT64(value));

#endif

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ex_dump_namespace_node