From owner-acpi-jp@jp.freebsd.org  Tue Mar 20 22:30:59 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA83026;
	Tue, 20 Mar 2001 22:30:59 +0900 (JST)
	(envelope-from owner-acpi-jp@jp.FreeBSD.org)
Received: from tasogare.imasy.or.jp (root@tasogare.imasy.or.jp [202.227.24.5])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA83021
	for <acpi-jp@jp.freebsd.org>; Tue, 20 Mar 2001 22:30:57 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (iwasaki.imasy.or.jp [202.227.24.92])
	by tasogare.imasy.or.jp (8.11.3+3.4W/8.11.3/tasogare) with ESMTP/inet id f2KDUpb46324
	for <acpi-jp@jp.freebsd.org>; Tue, 20 Mar 2001 22:30:51 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
To: acpi-jp@jp.freebsd.org
X-Mailer: Mew version 1.94.1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <20010320223051F.iwasaki@jp.FreeBSD.org>
Date: Tue, 20 Mar 2001 22:30:51 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 20000228(IM140)
Lines: 511
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 1104
Subject: [acpi-jp 1104] acpica-unix-20010313.tar.gz
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

Hi, I've found new Intel ACPICA acpica-unix-20010313.tar.gz and
made patches for FreeBSD.

In this snapshot, the layout of subdirectories has been changed so
CVS repo. copy maybe needed.
e.g.	Subsystem/Events -> components/core/events
	Subsystem/Hardware -> components/core/hardware
	Subsystem/Namespace -> components/core/namespace
	Subsystem/Tables -> components/core/tables
	Subsystem/Common -> components/core/utils
	Subsystem/Include -> components/include
	Subsystem/Debugger -> components/interpreter/debugger
	Subsystem/Dispatcher -> components/interpreter/dispatcher
	Subsystem/Interpreter -> components/interpreter/executer
	Subsystem/Parser -> components/interpreter/parser
	Subsystem/Resources -> components/services/resource

For ASL compiler, osunixxf.c is missing and I couldn't build compiler.
I'll try the next snapshot.

Thanks

Index: conf/Makefile.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.227
diff -u -r1.227 Makefile.i386
--- conf/Makefile.i386	2001/03/12 07:47:09	1.227
+++ conf/Makefile.i386	2001/03/19 16:48:20
@@ -51,7 +51,8 @@
 
 # This hack lets us use the Intel ACPICA code without spamming a new 
 # include path into 100+ source files.
-INCLUDES+= -I$S/contrib/dev/acpica/Subsystem/Include
+INCLUDES+= -I$S/contrib/dev/acpica/components/include
+INCLUDES+= -I$S/contrib/dev/acpica/components/include/platform
 
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
Index: conf/Makefile.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.ia64,v
retrieving revision 1.16
diff -u -r1.16 Makefile.ia64
--- conf/Makefile.ia64	2001/03/12 07:47:09	1.16
+++ conf/Makefile.ia64	2001/03/19 16:48:32
@@ -61,7 +61,8 @@
 
 # This hack lets us use the Intel ACPICA code without spamming a new 
 # include path into 100+ source files.
-INCLUDES+= -I$S/contrib/dev/acpica/Subsystem/Include
+INCLUDES+= -I$S/contrib/dev/acpica/components/include
+INCLUDES+= -I$S/contrib/dev/acpica/components/include/platform
 
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
Index: conf/Makefile.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.pc98,v
retrieving revision 1.126
diff -u -r1.126 Makefile.pc98
--- conf/Makefile.pc98	2001/03/12 07:47:09	1.126
+++ conf/Makefile.pc98	2001/03/19 16:48:40
@@ -53,7 +53,8 @@
 
 # This hack lets us use the Intel ACPICA code without spamming a new 
 # include path into 100+ source files.
-INCLUDES+= -I$S/contrib/dev/acpica/Subsystem/Include
+INCLUDES+= -I$S/contrib/dev/acpica/components/include
+INCLUDES+= -I$S/contrib/dev/acpica/components/include/platform
 
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
Index: conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.501
diff -u -r1.501 files
--- conf/files	2001/03/19 00:26:41	1.501
+++ conf/files	2001/03/19 18:04:57
@@ -48,110 +48,111 @@
 coda/coda_venus.c	optional vcoda
 coda/coda_vfsops.c	optional vcoda
 coda/coda_vnops.c	optional vcoda
-contrib/dev/acpica/Subsystem/Common/cmalloc.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmclib.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmcopy.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmdebug.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmdelete.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmeval.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmglobal.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cminit.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmobject.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Common/cmxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbcmds.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbdisasm.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbdisply.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbexec.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbfileio.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbhistry.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbinput.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbstats.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbutils.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Debugger/dbxface.c	optional acpica acpi_debug
-contrib/dev/acpica/Subsystem/Dispatcher/dsfield.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dsmethod.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dsmthdat.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dsobject.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dsopcode.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dsutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dswexec.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dswload.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dswscope.c	optional acpica
-contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evevent.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evmisc.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evregion.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evrgnini.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evsci.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evxfevnt.c	optional acpica
-contrib/dev/acpica/Subsystem/Events/evxfregn.c	optional acpica
-contrib/dev/acpica/Subsystem/Hardware/hwacpi.c	optional acpica
-contrib/dev/acpica/Subsystem/Hardware/hwgpe.c	optional acpica
-contrib/dev/acpica/Subsystem/Hardware/hwregs.c	optional acpica
-contrib/dev/acpica/Subsystem/Hardware/hwsleep.c	optional acpica
-contrib/dev/acpica/Subsystem/Hardware/hwtimer.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amconfig.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amconvrt.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amcreate.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amdump.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amfield.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amfldio.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/ammisc.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/ammonad.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amnames.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amprep.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amregion.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amresnte.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amresolv.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amresop.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amstore.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amstoren.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amstorob.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amsystem.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Interpreter/amxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsaccess.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsalloc.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsdump.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nseval.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsinit.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsload.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsnames.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsobject.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nssearch.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nswalk.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsxfname.c	optional acpica
-contrib/dev/acpica/Subsystem/Namespace/nsxfobj.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psargs.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psfind.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psopcode.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psparse.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psscope.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/pstree.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/pswalk.c	optional acpica
-contrib/dev/acpica/Subsystem/Parser/psxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsaddr.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rscalc.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rscreate.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsdump.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsio.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsirq.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rslist.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsmemory.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsmisc.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Resources/rsxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Tables/tbconvrt.c	optional acpica
-contrib/dev/acpica/Subsystem/Tables/tbget.c	optional acpica
-contrib/dev/acpica/Subsystem/Tables/tbinstal.c	optional acpica
-contrib/dev/acpica/Subsystem/Tables/tbutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Tables/tbxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Tables/tbxfroot.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmalloc.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmclib.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmcopy.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmdebug.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmdelete.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmeval.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmglobal.c	optional acpica
+contrib/dev/acpica/components/core/utils/cminit.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmobject.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmutils.c	optional acpica
+contrib/dev/acpica/components/core/utils/cmxface.c	optional acpica
+contrib/dev/acpica/components/interpreter/debugger/dbcmds.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbdisasm.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbdisply.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbexec.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbfileio.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbhistry.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbinput.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbstats.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbutils.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/debugger/dbxface.c	optional acpica acpi_debug
+contrib/dev/acpica/components/interpreter/dispatcher/dsfield.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dsmethod.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dsmthdat.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dsobject.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dsopcode.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dsutils.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dswexec.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dswload.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dswscope.c	optional acpica
+contrib/dev/acpica/components/interpreter/dispatcher/dswstate.c	optional acpica
+contrib/dev/acpica/components/core/events/evevent.c	optional acpica
+contrib/dev/acpica/components/core/events/evmisc.c	optional acpica
+contrib/dev/acpica/components/core/events/evregion.c	optional acpica
+contrib/dev/acpica/components/core/events/evrgnini.c	optional acpica
+contrib/dev/acpica/components/core/events/evsci.c	optional acpica
+contrib/dev/acpica/components/core/events/evxface.c	optional acpica
+contrib/dev/acpica/components/core/events/evxfevnt.c	optional acpica
+contrib/dev/acpica/components/core/events/evxfregn.c	optional acpica
+contrib/dev/acpica/components/core/hardware/hwacpi.c	optional acpica
+contrib/dev/acpica/components/core/hardware/hwgpe.c	optional acpica
+contrib/dev/acpica/components/core/hardware/hwregs.c	optional acpica
+contrib/dev/acpica/components/core/hardware/hwsleep.c	optional acpica
+contrib/dev/acpica/components/core/hardware/hwtimer.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amconfig.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amconvrt.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amcreate.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amdump.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amdyadic.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amfield.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amfldio.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/ammisc.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/ammonad.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/ammutex.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amnames.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amprep.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amregion.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amresnte.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amresolv.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amresop.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amstore.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amstoren.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amstorob.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amsystem.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amutils.c	optional acpica
+contrib/dev/acpica/components/interpreter/executer/amxface.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsaccess.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsalloc.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsdump.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nseval.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsinit.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsload.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsnames.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsobject.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nssearch.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsutils.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nswalk.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsxfname.c	optional acpica
+contrib/dev/acpica/components/core/namespace/nsxfobj.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psargs.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psfind.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psopcode.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psparse.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psscope.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/pstree.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psutils.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/pswalk.c	optional acpica
+contrib/dev/acpica/components/interpreter/parser/psxface.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsaddr.c	optional acpica
+contrib/dev/acpica/components/services/resource/rscalc.c	optional acpica
+contrib/dev/acpica/components/services/resource/rscreate.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsdump.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsio.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsirq.c	optional acpica
+contrib/dev/acpica/components/services/resource/rslist.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsmemory.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsmisc.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsutils.c	optional acpica
+contrib/dev/acpica/components/services/resource/rsxface.c	optional acpica
+contrib/dev/acpica/components/core/tables/tbconvrt.c	optional acpica
+contrib/dev/acpica/components/core/tables/tbget.c	optional acpica
+contrib/dev/acpica/components/core/tables/tbinstal.c	optional acpica
+contrib/dev/acpica/components/core/tables/tbutils.c	optional acpica
+contrib/dev/acpica/components/core/tables/tbxface.c	optional acpica
+contrib/dev/acpica/components/core/tables/tbxfroot.c	optional acpica
 crypto/blowfish/bf_cbc.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_cbc_m.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_enc.c	optional ipsec ipsec_esp
Index: dev/acpica/acpi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v
retrieving revision 1.13
diff -u -r1.13 acpi.c
--- dev/acpica/acpi.c	2001/03/07 15:22:14	1.13
+++ dev/acpica/acpi.c	2001/03/20 11:08:57
@@ -55,7 +55,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	BUS_MANAGER
+#define _COMPONENT	ACPI_BUS_MANAGER
 MODULE_NAME("ACPI")
 
 /*
Index: dev/acpica/acpi_button.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_button.c,v
retrieving revision 1.2
diff -u -r1.2 acpi_button.c
--- dev/acpica/acpi_button.c	2000/12/08 09:16:19	1.2
+++ dev/acpica/acpi_button.c	2001/03/20 06:22:07
@@ -40,7 +40,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	SYSTEM_CONTROL
+#define _COMPONENT	ACPI_BUTTON
 MODULE_NAME("BUTTON")
 
 struct acpi_button_softc {
Index: dev/acpica/acpi_ec.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_ec.c,v
retrieving revision 1.10
diff -u -r1.10 acpi_ec.c
--- dev/acpica/acpi_ec.c	2001/02/26 20:36:56	1.10
+++ dev/acpica/acpi_ec.c	2001/03/20 06:22:14
@@ -152,7 +152,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	EMBEDDED_CONTROLLER
+#define _COMPONENT	ACPI_EMBEDDED_CONTROLLER
 MODULE_NAME("EC")
 
 struct acpi_ec_softc {
Index: dev/acpica/acpi_isa.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_isa.c,v
retrieving revision 1.3
diff -u -r1.3 acpi_isa.c
--- dev/acpica/acpi_isa.c	2000/12/08 09:16:19	1.3
+++ dev/acpica/acpi_isa.c	2001/03/20 06:22:19
@@ -46,7 +46,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	BUS_MANAGER
+#define _COMPONENT	ACPI_BUS_MANAGER
 MODULE_NAME("ISA")
 
 #define PNP_HEXTONUM(c) ((c) >= 'a'		\
Index: dev/acpica/acpi_lid.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_lid.c,v
retrieving revision 1.4
diff -u -r1.4 acpi_lid.c
--- dev/acpica/acpi_lid.c	2001/01/31 09:30:57	1.4
+++ dev/acpica/acpi_lid.c	2001/03/20 06:22:24
@@ -42,7 +42,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	SYSTEM_CONTROL
+#define _COMPONENT	ACPI_BUTTON
 MODULE_NAME("LID")
 
 struct acpi_lid_softc {
Index: dev/acpica/acpi_pcib.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_pcib.c,v
retrieving revision 1.6
diff -u -r1.6 acpi_pcib.c
--- dev/acpica/acpi_pcib.c	2001/01/31 09:30:57	1.6
+++ dev/acpica/acpi_pcib.c	2001/03/20 11:09:08
@@ -42,7 +42,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	BUS_MANAGER
+#define _COMPONENT	ACPI_BUS_MANAGER
 MODULE_NAME("PCIB")
 
 struct acpi_pcib_softc {
Index: dev/acpica/acpi_processor.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_processor.c,v
retrieving revision 1.4
diff -u -r1.4 acpi_processor.c
--- dev/acpica/acpi_processor.c	2001/01/23 21:52:34	1.4
+++ dev/acpica/acpi_processor.c	2001/03/20 06:22:33
@@ -157,7 +157,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	PROCESSOR_CONTROL
+#define _COMPONENT	ACPI_PROCESSOR_CONTROL
 MODULE_NAME("PROCESSOR")
 
 #define PR_MAX_POWER_STATES		4
Index: dev/acpica/acpi_resource.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_resource.c,v
retrieving revision 1.2
diff -u -r1.2 acpi_resource.c
--- dev/acpica/acpi_resource.c	2000/12/08 09:16:20	1.2
+++ dev/acpica/acpi_resource.c	2001/03/20 06:22:38
@@ -41,7 +41,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	BUS_MANAGER
+#define _COMPONENT	ACPI_BUS_MANAGER
 MODULE_NAME("RESOURCE")
 
 /*
Index: dev/acpica/acpi_thermal.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_thermal.c,v
retrieving revision 1.5
diff -u -r1.5 acpi_thermal.c
--- dev/acpica/acpi_thermal.c	2001/01/31 09:33:51	1.5
+++ dev/acpica/acpi_thermal.c	2001/03/20 06:22:48
@@ -39,7 +39,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	THERMAL_CONTROL
+#define _COMPONENT	ACPI_THERMAL_ZONE
 MODULE_NAME("THERMAL")
 
 #define TZ_ZEROC	2732
Index: dev/acpica/acpi_timer.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_timer.c,v
retrieving revision 1.4
diff -u -r1.4 acpi_timer.c
--- dev/acpica/acpi_timer.c	2001/01/31 09:30:57	1.4
+++ dev/acpica/acpi_timer.c	2001/03/20 06:22:54
@@ -39,7 +39,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	SYSTEM_CONTROL
+#define _COMPONENT	ACPI_SYSTEM
 MODULE_NAME("TIMER")
 
 #define ACPITIMER_MAGIC 0x524d4954	/* "TIMR" */
Index: dev/acpica/Osd/OsdInterrupt.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdInterrupt.c,v
retrieving revision 1.2
diff -u -r1.2 OsdInterrupt.c
--- dev/acpica/Osd/OsdInterrupt.c	2001/01/31 09:34:54	1.2
+++ dev/acpica/Osd/OsdInterrupt.c	2001/03/20 06:22:59
@@ -40,7 +40,7 @@
  
 #include <dev/acpica/acpivar.h>
 
-#define _COMPONENT	OS_DEPENDENT
+#define _COMPONENT	ACPI_OS_SERVICES
 MODULE_NAME("INTERRUPT")
 
 /*
Index: dev/acpica/Osd/OsdSchedule.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/Osd/OsdSchedule.c,v
retrieving revision 1.7
diff -u -r1.7 OsdSchedule.c
--- dev/acpica/Osd/OsdSchedule.c	2001/02/12 00:20:04	1.7
+++ dev/acpica/Osd/OsdSchedule.c	2001/03/20 12:52:11
@@ -35,10 +35,11 @@
 
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/taskqueue.h>
 #include <machine/clock.h>
 
-#define _COMPONENT	OS_DEPENDENT
+#define _COMPONENT	ACPI_OS_SERVICES
 MODULE_NAME("SCHEDULE")
 
 /*
@@ -58,6 +59,18 @@
     OSD_EXECUTION_CALLBACK	at_function;
     void			*at_context;
 };
+
+UINT32
+AcpiOsGetThreadId(void)
+{
+    FUNCTION_TRACE(__FUNCTION__);
+
+    if (curproc) {
+	return((curproc->p_pid) ? curproc->p_pid : 1);
+    }
+
+    return(1);
+}
 
 ACPI_STATUS
 AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void *Context)
