ACPICA: Disassembler/tools: Support for multiple ACPI tables in one file (2ba7379b) · Commits · 戴 / test

drivers/acpi/acpica/Makefile

+0 −1

+14 −25

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@
		#ifndef _ACAPPS
		#define _ACAPPS

		#include <stdio.h>

		/* Common info for tool signons */

		#define ACPICA_NAME "Intel ACPI Component Architecture"
		@@ -90,6 +92,18 @@
		#define FILE_SUFFIX_DISASSEMBLY "dsl"
		#define FILE_SUFFIX_BINARY_TABLE ".dat" /* Needs the dot */

		/* acfileio */

		acpi_status
		acpi_ac_get_all_tables_from_file(char *filename,
		u8 get_only_aml_tables,
		struct acpi_new_table_desc **return_list_head);

		/* Values for get_only_aml_tables */

		#define ACPI_GET_ONLY_AML_TABLES TRUE
		#define ACPI_GET_ALL_TABLES FALSE

		/*
		* getopt
		*/
		@@ -107,30 +121,6 @@ extern char *acpi_gbl_optarg;
		*/
		u32 cm_get_file_size(ACPI_FILE file);

		#ifndef ACPI_DUMP_APP
		/*
		* adisasm
		*/
		acpi_status
		ad_aml_disassemble(u8 out_to_file,
		char filename, char prefix, char **out_filename);

		void ad_print_statistics(void);

		acpi_status ad_find_dsdt(u8 *dsdt_ptr, u32 dsdt_length);

		void ad_dump_tables(void);

		acpi_status ad_get_local_tables(void);

		acpi_status
		ad_parse_table(struct acpi_table_header *table,
		acpi_owner_id * owner_id, u8 load_table, u8 external);

		acpi_status ad_display_tables(char filename, struct acpi_table_header table);

		acpi_status ad_display_statistics(void);

		/*
		* adwalk
		*/
		@@ -168,6 +158,5 @@ char ad_generate_filename(char prefix, char *table_id);
		void
		ad_write_table(struct acpi_table_header *table,
		u32 length, char table_name, char oem_table_id);
		#endif

		#endif /* _ACAPPS */

+1 −4

Original line number	Diff line number	Diff line
		@@ -245,10 +245,7 @@ void acpi_db_open_debug_file(char *name);

		acpi_status acpi_db_load_acpi_table(char *filename);

		acpi_status
		acpi_db_get_table_from_file(char *filename,
		struct acpi_table_header **table,
		u8 must_be_aml_table);
		acpi_status acpi_db_load_tables(struct acpi_new_table_desc *list_head);

		/*
		* dbhistry - debugger HISTORY command

+7 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,13 @@ struct acpi_table_list {
		#define ACPI_ROOT_ORIGIN_ALLOCATED (1)
		#define ACPI_ROOT_ALLOW_RESIZE (2)

		/* List to manage incoming ACPI tables */

		struct acpi_new_table_desc {
		struct acpi_table_header *table;
		struct acpi_new_table_desc *next;
		};

		/* Predefined table indexes */

		#define ACPI_INVALID_TABLE_INDEX (0xFFFFFFFF)

+0 −12

Original line number	Diff line number	Diff line
		@@ -352,18 +352,6 @@ acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
		const char **method_names,
		u8 method_count, u8 *out_values);

		/*
		* utfileio - file operations
		*/
		#ifdef ACPI_APPLICATION

		acpi_status
		acpi_ut_read_tables_from_file(FILE * file, struct acpi_table_header **table);

		acpi_status
		acpi_ut_read_table_from_file(char filename, struct acpi_table_header *table);
		#endif

		/*
		* utids - device ID support
		*/