diff options
| author | jkim <jkim@FreeBSD.org> | 2016-09-30 22:40:58 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-09-30 22:40:58 +0000 |
| commit | dba8c0a565199df70a86f6a036d00c92f0c7675f (patch) | |
| tree | cf4924274c6e92898c01efb3c8ba31b34f0630f2 /usr.sbin/acpi/acpidb/acpidb.c | |
| parent | 0f41551ef9dde560d9d191d7190af02904dbf611 (diff) | |
| download | FreeBSD-src-dba8c0a565199df70a86f6a036d00c92f0c7675f.zip FreeBSD-src-dba8c0a565199df70a86f6a036d00c92f0c7675f.tar.gz | |
MFC: r284583, r285797, r285799, r287168, r298714, r298720, r298838,
r300879
Merge ACPICA up to 20160527.
Requested by: mav
Diffstat (limited to 'usr.sbin/acpi/acpidb/acpidb.c')
| -rw-r--r-- | usr.sbin/acpi/acpidb/acpidb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 7f4e49f..fefe6da 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -44,6 +44,7 @@ #include <contrib/dev/acpica/include/acpi.h> #include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/acapps.h> #include <contrib/dev/acpica/include/acdebug.h> #include <contrib/dev/acpica/include/amlresrc.h> @@ -381,6 +382,7 @@ static int load_dsdt(const char *dsdtfile) { char filetmp[PATH_MAX]; + ACPI_NEW_TABLE_DESC *list; u_int8_t *code; struct stat sb; int dounlink, error, fd; @@ -488,9 +490,10 @@ load_dsdt(const char *dsdtfile) return (-1); } - AcpiDbGetTableFromFile(filetmp, NULL, TRUE); + list = NULL; + AcGetAllTablesFromFile(filetmp, TRUE, &list); - AcpiDbInitialize(); + AcpiInitializeDebugger(); AcpiGbl_DebuggerConfiguration = 0; AcpiDbUserCommands(':', NULL); |
