Commit efcf9456 authored by Erik Schmauss's avatar Erik Schmauss Committed by Rafael J. Wysocki
Browse files

ACPICA: utilities: add flag to only display data when dumping buffers 

ACPICA commit fb18935fcf940c5854a055975c6b9ee31f0e1a5a

Link: https://github.com/acpica/acpica/commit/fb18935f


Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1770093c

drivers/acpi/acpica/acutils.h

+5 −4
Original line number Diff line number Diff line
@@ -142,10 +142,11 @@ struct acpi_pkg_info { 


/* acpi_ut_dump_buffer */



#define DB_BYTE_DISPLAY     1

#define DB_WORD_DISPLAY     2

#define DB_DWORD_DISPLAY    4

#define DB_QWORD_DISPLAY    8

#define DB_BYTE_DISPLAY      0x01

#define DB_WORD_DISPLAY      0x02

#define DB_DWORD_DISPLAY     0x04

#define DB_QWORD_DISPLAY     0x08

#define DB_DISPLAY_DATA_ONLY 0x10



/*

 * utascii - ASCII utilities

drivers/acpi/acpica/utbuffer.c

+29 −23
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset) 
	u32 j;

	u32 temp32;

	u8 buf_char;

	u32 display_data_only = display & DB_DISPLAY_DATA_ONLY;



	display &= ~DB_DISPLAY_DATA_ONLY;

	if (!buffer) {

		acpi_os_printf("Null Buffer Pointer in DumpBuffer!\n");

		return;
@@ -53,7 +55,9 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset) 


		/* Print current offset */



		if (!display_data_only) {

			acpi_os_printf("%8.4X: ", (base_offset + i));

		}



		/* Print 16 hex chars */
@@ -109,6 +113,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset) 
		 * Print the ASCII equivalent characters but watch out for the bad

		 * unprintable ones (printable chars are 0x20 through 0x7E)

		 */

		if (!display_data_only) {

			acpi_os_printf(" ");

			for (j = 0; j < 16; j++) {

				if (i + j >= count) {
@@ -135,6 +140,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset) 
			/* Done with that line. */



			acpi_os_printf("\n");

		}

		i += 16;

	}