From dba8c0a565199df70a86f6a036d00c92f0c7675f Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Fri, 30 Sep 2016 22:40:58 +0000
Subject: MFC:	r284583, r285797, r285799, r287168, r298714, r298720, r298838,
 	r300879

Merge ACPICA up to 20160527.

Requested by:	mav
---
 usr.sbin/acpi/acpidb/acpidb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'usr.sbin/acpi/acpidb/acpidb.c')

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);
 
-- 
cgit v1.1