From: Bob Moore <robert.moore@xxxxxxxxx> ACPICA commit 301f16e4037275888f65b88aec7231c1cd64339f Add support for multi-AML-table files that originate from either acpixtract or iASL. Link: https://github.com/acpica/acpica/commit/301f16e4 Signed-off-by: Bob Moore <robert.moore@xxxxxxxxx> Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> --- drivers/acpi/acpica/acutils.h | 4 ++++ drivers/acpi/acpica/utfileio.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h index 7495421..5d3ae91 100644 --- a/drivers/acpi/acpica/acutils.h +++ b/drivers/acpi/acpica/acutils.h @@ -356,6 +356,10 @@ acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node, * 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 diff --git a/drivers/acpi/acpica/utfileio.c b/drivers/acpi/acpica/utfileio.c index be49c71..e729486 100644 --- a/drivers/acpi/acpica/utfileio.c +++ b/drivers/acpi/acpica/utfileio.c @@ -292,6 +292,29 @@ acpi_ut_read_table(FILE * fp, ******************************************************************************/ acpi_status +acpi_ut_read_tables_from_file(FILE * file, struct acpi_table_header ** table) +{ + struct acpi_table_header table_header; + s32 count; + long position; + + position = ftell(file); + count = fread(&table_header, 1, sizeof(struct acpi_table_header), file); + if (count < sizeof(struct acpi_table_header)) { + return (AE_CTRL_TERMINATE); + } + + /* Allocate a buffer for the table */ + + *table = acpi_os_allocate((size_t) table_header.length); + fseek(file, position, SEEK_SET); + + count = fread(*table, 1, table_header.length, file); + + return (AE_OK); +} + +acpi_status acpi_ut_read_table_from_file(char *filename, struct acpi_table_header ** table) { FILE *file; -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
