diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-16 20:00:53 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-16 20:00:53 +0000 |
| commit | 0a885a06376a92624987d1a67113b1d40b9c6d2a (patch) | |
| tree | 9cdb2e881fca8e83d94fb1733d90e810e5fcc82a /sys/contrib/dev/acpica/components/debugger/dbfileio.c | |
| parent | 4680fa4d960d2f6208d5138b22eb56e2cc048f84 (diff) | |
| download | FreeBSD-src-0a885a06376a92624987d1a67113b1d40b9c6d2a.zip FreeBSD-src-0a885a06376a92624987d1a67113b1d40b9c6d2a.tar.gz | |
MFC: r283092, r283966
Merge ACPICA 20150515.
Relnotes: yes
Diffstat (limited to 'sys/contrib/dev/acpica/components/debugger/dbfileio.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/debugger/dbfileio.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/components/debugger/dbfileio.c b/sys/contrib/dev/acpica/components/debugger/dbfileio.c index 9bf0b29..59a9a52 100644 --- a/sys/contrib/dev/acpica/components/debugger/dbfileio.c +++ b/sys/contrib/dev/acpica/components/debugger/dbfileio.c @@ -216,7 +216,8 @@ AeLocalLoadTable ( ACPI_STATUS AcpiDbGetTableFromFile ( char *Filename, - ACPI_TABLE_HEADER **ReturnTable) + ACPI_TABLE_HEADER **ReturnTable, + BOOLEAN MustBeAmlFile) { #ifdef ACPI_APPLICATION ACPI_STATUS Status; @@ -230,9 +231,18 @@ AcpiDbGetTableFromFile ( return (Status); } -#ifdef ACPI_DATA_TABLE_DISASSEMBLY - IsAmlTable = AcpiUtIsAmlTable (Table); -#endif + if (MustBeAmlFile) + { + IsAmlTable = AcpiUtIsAmlTable (Table); + if (!IsAmlTable) + { + ACPI_EXCEPTION ((AE_INFO, AE_OK, + "Input for -e is not an AML table: " + "\"%4.4s\" (must be DSDT/SSDT)", + Table->Signature)); + return (AE_TYPE); + } + } if (IsAmlTable) { |
