MFC r197104,197105,197106,197107,197688,198237,199337,199338,200553,200554,

202771,202773: bring acpica version to 20100121

MFC details:
r197104 | jkim | 2009-09-12 01:48:53 +0300 (Sat, 12 Sep 2009) | 4 lines
MFV:    r196804
Import ACPICA 20090903

r197105 | jkim | 2009-09-12 01:49:34 +0300 (Sat, 12 Sep 2009) | 2 lines
Catch up with ACPICA 20090903.

r197106 | jkim | 2009-09-12 01:50:15 +0300 (Sat, 12 Sep 2009) | 2 lines
Catch up with ACPICA 20090903.

r197107 | jkim | 2009-09-12 01:56:08 +0300 (Sat, 12 Sep 2009) | 2 lines
Canonify include paths for newly added files.

r197688 | jkim | 2009-10-01 23:56:15 +0300 (Thu, 01 Oct 2009) | 4 lines
Compile ACPI debugger and disassembler for kernel modules
unconditionally.
These files will generate almost empty object files without
ACPI_DEBUG/DDB
options.  As a result, size of acpi.ko will increase slightly.

r198237 | jkim | 2009-10-19 19:12:58 +0300 (Mon, 19 Oct 2009) | 2 lines
Merge ACPICA 20091013.

r199337 | jkim | 2009-11-16 23:47:12 +0200 (Mon, 16 Nov 2009) | 2 lines
Merge ACPICA 20091112.

r199338 | jkim | 2009-11-16 23:53:56 +0200 (Mon, 16 Nov 2009) | 2 lines
Add a forgotten module Makefile change from the previous commit.

r200553 | jkim | 2009-12-15 00:24:04 +0200 (Tue, 15 Dec 2009) | 2 lines
Merge ACPICA 20091214.

r200554 | jkim | 2009-12-15 00:28:32 +0200 (Tue, 15 Dec 2009) | 3 lines
Remove _FDE quirk handling as these quirks are automatically repaired
by ACPICA layer since ACPICA 20091214.

r202771 | jkim | 2010-01-21 23:14:28 +0200 (Thu, 21 Jan 2010) | 2 lines
Merge ACPICA 20100121.

r202773 | jkim | 2010-01-21 23:31:39 +0200 (Thu, 21 Jan 2010) | 2 lines
Fix a new header inclusion.

Discussed with:		jkim, jhb
No objections from:	acpi@

3 files changed, 14 insertions, 13 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 1694867..5981f38 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -38,8 +38,8 @@ SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
 # namespace
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c		\
 	nsload.c nsnames.c nsobject.c nsparse.c nspredef.c	\
-	nssearch.c nsutils.c nswalk.c nsxfeval.c nsxfname.c	\
-	nsxfobj.c
+	nsrepair.c nsrepair2.c nssearch.c nsutils.c nswalk.c	\
+	nsxfeval.c nsxfname.c nsxfobj.c
 
 # resources
 SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c		\
@@ -52,9 +52,9 @@ SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c	\
 
 # utilities
 SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
-	uteval.c utglobal.c utinit.c utlock.c utmath.c utmisc.c	\
-	utmutex.c utobject.c utresrc.c utstate.c uttrack.c	\
-	utxface.c
+	uteval.c utglobal.c utids.c utinit.c utlock.c utmath.c	\
+	utmisc.c utmutex.c utobject.c utresrc.c utstate.c	\
+	uttrack.c utxface.c
 
 MAN=	acpidb.8
 WARNS?=	2
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 53d9db1..325dfae 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -81,7 +81,7 @@ static int		 aml_simulate_regcontent_read(int regtype,
 static int		 aml_simulate_regcontent_write(int regtype,
 			     ACPI_PHYSICAL_ADDRESS addr,
 			     UINT8 *valuep);
-static ACPI_INTEGER	 aml_simulate_prompt(char *msg, ACPI_INTEGER def_val);
+static UINT64		 aml_simulate_prompt(char *msg, UINT64 def_val);
 static void		 aml_simulation_regload(const char *dumpfile);
 static void		 aml_simulation_regdump(const char *dumpfile);
 
@@ -161,11 +161,11 @@ aml_simulate_regcontent_write(int regtype, ACPI_PHYSICAL_ADDRESS addr, UINT8 *va
 	return (aml_simulate_regcontent_add(regtype, addr, *valuep));
 }
 
-static ACPI_INTEGER
-aml_simulate_prompt(char *msg, ACPI_INTEGER def_val)
+static UINT64
+aml_simulate_prompt(char *msg, UINT64 def_val)
 {
 	char		buf[16], *ep;
-	ACPI_INTEGER	val;
+	UINT64		val;
 
 	val = def_val;
 	printf("DEBUG");
@@ -271,12 +271,12 @@ aml_vm_space_handler(
 	UINT32			Function,
 	ACPI_PHYSICAL_ADDRESS	Address,
 	UINT32			BitWidth,
-	ACPI_INTEGER		*Value,
+	UINT64			*Value,
 	int			Prompt)
 {
 	int			state;
 	UINT8			val;
-	ACPI_INTEGER		value, i;
+	UINT64			value, i;
 	char			msg[256];
 	static const char	*space_names[] = {
 		"SYSTEM_MEMORY", "SYSTEM_IO", "PCI_CONFIG",
@@ -336,7 +336,7 @@ aml_vm_space_handler_##name (					\
 	UINT32			Function,			\
 	ACPI_PHYSICAL_ADDRESS	Address,			\
 	UINT32			BitWidth,			\
-	ACPI_INTEGER		*Value)				\
+	UINT64			*Value)				\
 {								\
 	return (aml_vm_space_handler(id, Function, Address,	\
 		BitWidth, Value, aml_debug_prompt));		\
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 551bfc6..ff6ebd7 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -5,7 +5,8 @@ SRCS=	adfile.c adisasm.c adwalk.c
 SRCS+=	osunixxf.c
 
 # common
-SRCS+=	dmrestag.c dmtable.c dmtbdump.c	dmtbinfo.c getopt.c
+SRCS+=	dmextern.c dmrestag.c dmtable.c dmtbdump.c dmtbinfo.c	\
+	getopt.c
 
 # compiler
 SRCS+=	aslanalyze.c aslcodegen.c aslcompile.c aslcompiler.y.h	\