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

Commit f42106fe authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' into acpi-bus

parents daae45ca 7a0b71dc

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ acpi-y += \ 
	utresrc.o	\

	utstate.o	\

	utstring.o	\

	utstrtoul64.o	\

	utxface.o	\

	utxfinit.o	\

	utxferror.o	\

drivers/acpi/acpica/acapps.h

+6 −4
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ 
#ifndef _ACAPPS

#define _ACAPPS



#include <stdio.h>

#ifdef ACPI_USE_STANDARD_HEADERS

#include <sys/stat.h>

#endif				/* ACPI_USE_STANDARD_HEADERS */



/* Common info for tool signons */
@@ -81,13 +83,13 @@ 
/* Macros for usage messages */



#define ACPI_USAGE_HEADER(usage) \

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

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



#define ACPI_USAGE_TEXT(description) \

	acpi_os_printf (description);

	printf (description);



#define ACPI_OPTION(name, description) \

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

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



/* Check for unexpected exceptions */

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ acpi_status acpi_db_disassemble_method(char *name); 


void acpi_db_disassemble_aml(char *statements, union acpi_parse_object *op);



void acpi_db_batch_execute(char *count_arg);

void acpi_db_evaluate_predefined_names(void);



/*

 * dbnames - namespace commands

drivers/acpi/acpica/acevents.h

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info); 


acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);



acpi_status

acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked);



acpi_status

acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);

drivers/acpi/acpica/acglobal.h

+2 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_ignore_noop_operator, FALSE); 
ACPI_INIT_GLOBAL(u8, acpi_gbl_cstyle_disassembly, TRUE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_force_aml_disassembly, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_dm_opt_verbose, TRUE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_dm_emit_external_opcodes, FALSE);



ACPI_GLOBAL(u8, acpi_gbl_dm_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_dm_opt_listing);
@@ -382,6 +383,7 @@ ACPI_GLOBAL(const char, *acpi_gbl_pld_shape_list[]); 


ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);

ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_output_file, NULL);

ACPI_INIT_GLOBAL(u8, acpi_gbl_debug_timeout, FALSE);



/* Print buffer */