From owner-acpi-jp@jp.freebsd.org  Fri Jul 14 19:29:56 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id TAA93113;
	Fri, 14 Jul 2000 19:29:56 +0900 (JST)
	(envelope-from owner-acpi-jp@jp.FreeBSD.org)
Received: from kbtfw.kubota.co.jp (firewall-user@kbtfw.kubota.co.jp [133.253.102.202])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id TAA93106
	for <acpi-jp@jp.freebsd.org>; Fri, 14 Jul 2000 19:29:54 +0900 (JST)
	(envelope-from haro@tk.kubota.co.jp)
Received: by kbtfw.kubota.co.jp; id TAA11175; Fri, 14 Jul 2000 19:29:49 +0900 (JST)
Received: from unknown(133.253.122.1) by kbtfw.kubota.co.jp via smap (V4.2)
	id xma010931; Fri, 14 Jul 00 19:28:50 +0900
Received: from jkpc15.tk.kubota.co.jp ([192.168.7.250])
	by kbtmx.eto.kubota.co.jp (8.9.3+3.2W/3.7W) with ESMTP id TAA08837
	for <acpi-jp@jp.freebsd.org>; Fri, 14 Jul 2000 19:28:48 +0900 (JST)
Received: from localhost (localhost.ttr.kubota.co.jp [127.0.0.1])
	by jkpc15.tk.kubota.co.jp (8.9.3/3.7W-02/21/99) with ESMTP id TAA20798
	for <acpi-jp@jp.freebsd.org>; Fri, 14 Jul 2000 19:27:09 +0900 (JST)
To: acpi-jp@jp.freebsd.org
In-Reply-To: <20000713134031J.yokoyama@o3.otc.ogis-ri.co.jp>
References: <20000705135547M.yokoyama@o3.otc.ogis-ri.co.jp>
	<20000705161650D.iwasaki@jp.FreeBSD.org>
	<20000713134031J.yokoyama@o3.otc.ogis-ri.co.jp>
X-Mailer: Mew version 1.94.1 on Emacs 20.6 / Mule 4.0 (HANANOEN)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000714192708P.haro@tk.kubota.co.jp>
Date: Fri, 14 Jul 2000 19:27:08 +0900
From: haro@tk.kubota.co.jp (Munehiro Matsuda)
X-Dispatcher: imput version 990905(IM130)
Lines: 84
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 468
Subject: [acpi-jp 468] Re: merging to FreeBSD
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: haro@tk.kubota.co.jp

$B>>ED!w%/%\%?$G$9!#(B

$B5W$7$V$j(B(1$B%u7nH>$V$j!)(B)$B$K(B cvsweb.cgi$B7PM3$G:G?7HG$r<h$C$FMh$F!"(B
$B;d$N4D6-$N(B -current$B$K%^!<%8$7$^$7$?!#(B

$B$A$g$C$H5$$K$J$C$?E@$,$"$j$^$9$N$G!"$H$j$"$($:Js9p$7$^$9!#(B

1. sys/conf/files.i386$B$NFbMF$,!"<BBV$H9gCW$7$F$$$J$$!#(B
  sys/i386/acpi $B"*(B sys/dev/acpi$B$X0\9T$N:]!"(Bfiles.i386$B$NFbMF$,99?7(B
  $B$5$l$J$+$C$?$h$&$G$9!#$H$j$"$($:0J2<$N%Q%C%A$,I,MW$+$H;W$$$^$9!#(B

---8<------8<------8<------8<--- Cut Here ---8<------8<------8<------8<---
--- sys/conf/files.i386.org	Fri Jul 14 14:14:49 2000
+++ sys/conf/files.i386	Fri Jul 14 18:47:19 2000
@@ -60,6 +60,16 @@
 contrib/dev/oltr/trlldbm.c	optional	oltr
 contrib/dev/oltr/trlldhm.c	optional	oltr
 contrib/dev/oltr/trlldmac.c	optional	oltr
+dev/acpi/acpi.c			optional	acpi
+dev/acpi/aml/aml_amlmem.c	optional	acpi
+dev/acpi/aml/aml_common.c	optional	acpi
+dev/acpi/aml/aml_evalobj.c	optional	acpi
+dev/acpi/aml/aml_memman.c	optional	acpi
+dev/acpi/aml/aml_name.c		optional	acpi
+dev/acpi/aml/aml_obj.c		optional	acpi
+dev/acpi/aml/aml_parse.c	optional	acpi
+dev/acpi/aml/aml_store.c	optional	acpi
+dev/acpi/aml/aml_region.c	optional	acpi
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/ata/ata-all.c		optional	ata 
@@ -131,16 +141,6 @@
 gnu/i386/isa/dgb.c		optional	dgb
 gnu/i386/isa/dgm.c		optional	dgm
 gnu/i386/isa/sound/awe_wave.c	optional	awe
-i386/acpi/acpi.c		optional	acpi
-i386/acpi/aml/aml_amlmem.c	optional	acpi
-i386/acpi/aml/aml_common.c	optional	acpi
-i386/acpi/aml/aml_evalobj.c	optional	acpi
-i386/acpi/aml/aml_memman.c	optional	acpi
-i386/acpi/aml/aml_name.c	optional	acpi
-i386/acpi/aml/aml_obj.c		optional	acpi
-i386/acpi/aml/aml_parse.c	optional	acpi
-i386/acpi/aml/aml_store.c	optional	acpi
-i386/acpi/aml/aml_region.c	optional	acpi
 i386/apm/apm.c			optional	apm
 i386/i386/atomic.c		standard				\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
---8<------8<------8<------8<--- Cut Here ---8<------8<------8<------8<---

  $B$"$H!":G?7$N(B-current$B$X%^!<%8$N:]!"(B
	dev/acpi/acpi.c		optional	acpi
				  $B"-(B
	dev/acpi/acpi.c		count		acpi
  $B$NMM$J=$@5$,I,MW$+$H;W$o$l$^$9!#(B


2. PC98$B$G(B kernel$B$N%3%s%Q%$%k$K<:GT$9$k!#(B
  sys/i386/bios.c$B$,(B i386/PC98$B$NN><T$G6&M-$5$l$F$$$k4X78$G!"(BPC98$B$N(B
  $B%+!<%M%k:n@.(B(make depend)$B;~$K%(%i!<$H$J$j$^$9!#$H$j$"$($:0J2<$N(B
  $B%Q%C%A$GF($2$l$kMM$G$9!#(B

---8<------8<------8<------8<--- Cut Here ---8<------8<------8<------8<---
--- sys/i386/i386/bios.c.org	Fri Jul 14 13:56:03 2000
+++ sys/i386/i386/bios.c	Fri Jul 14 18:48:53 2000
@@ -31,7 +31,9 @@
  * Code for dealing with the BIOS in x86 PC systems.
  */
 
+#ifndef PC98
 #include "acpi.h"
+#endif
 #include "isa.h"
 #include "opt_smp.h"
 
---8<------8<------8<------8<--- Cut Here ---8<------8<------8<------8<---

$B$^$?5$$,IU$$$?;v$,=P$F$-$?$iJs9p$7$^$9!#(B
$B$G$O!#(B
=--------------------------------------------------------------------------
           _ _           $B3t<02q<R%/%\%?(B $BEl5~K\<R(B $B5;=Q3+H/K\It(B
 -|- /_\  |_|_|            $B>>ED(B  $B=!9@(B
 /|\ |_|  |_|_|          E-mail: haro@kubota.co.jp
                         Tel: 03-3245-3318  Fax: 03-3245-3315
