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

Commit d9cf147d authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Application: Enhance ACPI_USAGE_xxx/ACPI_OPTION with acpi_os_printf()... 


ACPICA: Application: Enhance ACPI_USAGE_xxx/ACPI_OPTION with acpi_os_printf() to improve portability

This patch enhances ACPI_USAGE_xxx/ACPI_OPTION macros to use portable
acpi_os_printf() so that usage functions for applications no longer rely on
the printf() API.

To use acpi_os_printf() exported by osunixxf.c as a replacement of
printf(), applications need to initialize acpi_gbl_output_file to stdout
and initialize acpi_gbl_db_output_flags to ACPI_DB_CONSOLE_OUTPUT. The
latter is automatically done by ACPI_INIT_GLOBAL(), applications need to
link utglobal.o to utilize this mechanism. For GCC, assigning stdout to
acpi_gbl_output_file using ACPI_INIT_GLOBAL() is not possible as stdout is
not a constant in GCC environment. As an alternative solution, stdout
assignment has been put into acpi_os_initialize(). Thus
acpi_os_initialize() need to be invoked very early by the applications to
initialize the default output of acpi_os_printf() to keep behavior
consistency.

acpidump has already invoked acpi_os_initialize() in this way. Lv Zheng.

Signed-off-by: default avatarLv Zheng <lv.zheng@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 2e70da4c

drivers/acpi/acpica/acapps.h

+5 −2
Original line number Diff line number Diff line
@@ -79,10 +79,13 @@ 
/* Macros for usage messages */



#define ACPI_USAGE_HEADER(usage) \

	printf ("Usage: %s\nOptions:\n", usage);

	acpi_os_printf ("Usage: %s\nOptions:\n", usage);



#define ACPI_USAGE_TEXT(description) \

	acpi_os_printf (description);



#define ACPI_OPTION(name, description) \

	printf ("  %-18s%s\n", name, description);

	acpi_os_printf (" %-18s%s\n", name, description);



#define FILE_SUFFIX_DISASSEMBLY     "dsl"

#define ACPI_TABLE_FILE_SUFFIX      ".dat"

tools/power/acpi/tools/acpidump/apmain.c

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void ap_display_usage(void) 
	ACPI_OPTION("-v", "Display version information");

	ACPI_OPTION("-z", "Verbose mode");



	printf("\nTable Options:\n");

	ACPI_USAGE_TEXT("\nTable Options:\n");



	ACPI_OPTION("-a <Address>", "Get table via a physical address");

	ACPI_OPTION("-f <BinaryFile>", "Get table via a binary file");
@@ -112,7 +112,7 @@ static void ap_display_usage(void) 
	ACPI_OPTION("-x", "Do not use but dump XSDT");

	ACPI_OPTION("-x -x", "Do not use or dump XSDT");



	printf("\n"

	ACPI_USAGE_TEXT("\n"

			"Invocation without parameters dumps all available tables\n"

			"Multiple mixed instances of -a, -f, and -n are supported\n\n");

}