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

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

ACPICA: OSL: Clean up acpi_os_printf()/acpi_os_vprintf() stubs 



This patch is mainly for acpidump where there are redundant
acpi_os_printf()/acpi_os_vprintf() stubs implemented. This patch cleans up such
specific implementation by linking acpidump to osunixxf.c/oswinxf.c.

To make acpi_os_printf() exported by osunixxf.c/oswinxf.c to behave as the
old acpidump specific ones, applications need to:
 1. Initialize acpi_gbl_db_output_flags to ACPI_DB_CONSOLE_OUTPUT.
    This is automatically done by ACPI_INIT_GLOBAL(), applications need to
    link utglobal.o to utilize this mechanism.
 2. Initialize acpi_gbl_output_file to stdout.
    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 is 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().

This patch also releases osunixxf.c to the Linux kernel. 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 e8c038a3

drivers/acpi/acpica/acglobal.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ ACPI_GLOBAL(u32, acpi_gbl_trace_dbg_layer); 
 *

 *

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

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





ACPI_GLOBAL(u8, acpi_gbl_db_output_flags);

ACPI_INIT_GLOBAL(u8, acpi_gbl_db_output_flags, ACPI_DB_CONSOLE_OUTPUT);





#ifdef ACPI_DISASSEMBLER

#ifdef ACPI_DISASSEMBLER
@@ -362,6 +362,7 @@ ACPI_GLOBAL(u32, acpi_gbl_num_objects); 
#ifdef ACPI_APPLICATION

#ifdef ACPI_APPLICATION





ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);

ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);

ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_output_file, NULL);





#endif				/* ACPI_APPLICATION */

#endif				/* ACPI_APPLICATION */

drivers/acpi/acpica/acutils.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ extern const char *acpi_gbl_pt_decode[]; 
#ifdef ACPI_ASL_COMPILER

#ifdef ACPI_ASL_COMPILER





#include <stdio.h>

#include <stdio.h>

extern FILE *acpi_gbl_output_file;





#define ACPI_MSG_REDIRECT_BEGIN \

#define ACPI_MSG_REDIRECT_BEGIN \

	FILE                            *output_file = acpi_gbl_output_file; \

	FILE                            *output_file = acpi_gbl_output_file; \

drivers/acpi/acpica/utinit.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,6 @@ acpi_status acpi_ut_init_globals(void) 
	acpi_gbl_trace_dbg_level = 0;

	acpi_gbl_trace_dbg_level = 0;

	acpi_gbl_trace_dbg_layer = 0;

	acpi_gbl_trace_dbg_layer = 0;

	acpi_gbl_debugger_configuration = DEBUGGER_THREADING;

	acpi_gbl_debugger_configuration = DEBUGGER_THREADING;

	acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;

	acpi_gbl_osi_mutex = NULL;

	acpi_gbl_osi_mutex = NULL;

	acpi_gbl_reg_methods_executed = FALSE;

	acpi_gbl_reg_methods_executed = FALSE;

tools/power/acpi/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,7 @@ DUMP_OBJS = \ 
	apmain.o\

	apmain.o\

	osunixdir.o\

	osunixdir.o\

	osunixmap.o\

	osunixmap.o\

	osunixxf.o\

	tbprint.o\

	tbprint.o\

	tbxfroot.o\

	tbxfroot.o\

	utbuffer.o\

	utbuffer.o\

tools/power/acpi/os_specific/service_layers/osunixxf.c

0 → 100644
+1304 −0

File added.

Preview size limit exceeded, changes collapsed.