diff -ru acpica/Makefile /usr/src/usr.bin/acpica/Makefile
--- acpica/Makefile	Sat Dec 23 17:48:03 2000
+++ /usr/src/usr.bin/acpica/Makefile	Thu Jan 11 03:27:49 2001
@@ -1,6 +1,6 @@
 #
 # Makefile for Intel ACPI CA tools
-# $FreeBSD$
+# $Id$
 #
 
 SUBDIR= acpicadb iasl
diff -ru acpica/Makefile.inc /usr/src/usr.bin/acpica/Makefile.inc
--- acpica/Makefile.inc	Sat Dec 23 17:45:39 2000
+++ /usr/src/usr.bin/acpica/Makefile.inc	Thu Jan 11 03:28:12 2001
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 ACPICA_BASEDIR?= /usr/src/sys/contrib/dev/acpica
 BINDIR?= /usr/bin
diff -ru acpica/acpicadb/Makefile /usr/src/usr.bin/acpica/acpicadb/Makefile
--- acpica/acpicadb/Makefile	Sat Dec 23 18:52:33 2000
+++ /usr/src/usr.bin/acpica/acpicadb/Makefile	Thu Jan 11 03:26:54 2001
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 PROG=		acpicadb
 SRCS=		acpicadb.c
diff -ru acpica/acpicadb/acpicadb.c /usr/src/usr.bin/acpica/acpicadb/acpicadb.c
--- acpica/acpicadb/acpicadb.c	Mon Dec 18 04:47:19 2000
+++ /usr/src/usr.bin/acpica/acpicadb/acpicadb.c	Thu Jan 11 03:24:29 2001
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
+ * Copyright (c) 2000, 2001 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/param.h>
@@ -335,7 +335,7 @@
 	void			*HandlerContext,
 	void			*RegionContext)
 {
-	return(VMSpaceHandler(0, Function, Address, BitWidth, Value, aml_debug_prompt));
+	return(VMSpaceHandler(ADDRESS_SPACE_SYSTEM_MEMORY, Function, Address, BitWidth, Value, aml_debug_prompt));
 }
 
 static ACPI_STATUS
@@ -347,7 +347,7 @@
 	void			*HandlerContext,
 	void			*RegionContext)
 {
-	return(VMSpaceHandler(1, Function, Address, BitWidth, Value, aml_debug_prompt));
+	return(VMSpaceHandler(ADDRESS_SPACE_SYSTEM_IO, Function, Address, BitWidth, Value, aml_debug_prompt));
 }
 
 static ACPI_STATUS
@@ -359,7 +359,7 @@
 	void			*HandlerContext,
 	void			*RegionContext)
 {
-	return(VMSpaceHandler(2, Function, Address, BitWidth, Value, aml_debug_prompt));
+	return(VMSpaceHandler(ADDRESS_SPACE_PCI_CONFIG, Function, Address, BitWidth, Value, aml_debug_prompt));
 }
 
 /*
@@ -370,9 +370,9 @@
 load_dsdt(const char *dsdtfile)
 {
 	u_int8_t		*code, *amlptr;
-	struct stat		sb;
-	int			fd;
-	int			error;
+	struct stat		 sb;
+	int			 fd;
+	int			 error;
 	ACPI_TABLE_HEADER	*tableptr;
 
 	fd = open(dsdtfile, O_RDONLY, 0);
@@ -405,7 +405,8 @@
 			return (-1);
 		}
 
-		amlptr = (u_int8_t *)(tableptr + sizeof(ACPI_TABLE_HEADER));
+		amlptr = (u_int8_t *)tableptr;
+		amlptr += sizeof(ACPI_TABLE_HEADER);
 		dummy_dsdt_table.Length = sizeof(ACPI_TABLE_HEADER) + sb.st_size;
 		bcopy(&dummy_dsdt_table, tableptr, sizeof(ACPI_TABLE_HEADER));
 		bcopy(code, amlptr, sb.st_size);
diff -ru acpica/common/acpicaosd.c /usr/src/usr.bin/acpica/common/acpicaosd.c
--- acpica/common/acpicaosd.c	Sat Dec 23 04:10:25 2000
+++ /usr/src/usr.bin/acpica/common/acpicaosd.c	Thu Jan 11 03:25:29 2001
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@freebsd.org>
+ * Copyright (c) 2000, 2001 Mitsuru IWASAKI <iwasaki@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/param.h>
diff -ru acpica/iasl/Makefile /usr/src/usr.bin/acpica/iasl/Makefile
--- acpica/iasl/Makefile	Sat Dec 23 19:03:35 2000
+++ /usr/src/usr.bin/acpica/iasl/Makefile	Thu Jan 11 03:25:56 2001
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 PROG=	iasl
 SRCS=	aslcompilerparse.c aslcompilerlex.c aslanalyze.c aslcodegen.c \