From owner-FreeBSD-users-jp@jp.freebsd.org  Fri Mar 19 10:39:03 1999
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.2+3.1W/8.7.3) id KAA15979;
	Fri, 19 Mar 1999 10:39:03 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mist.nintendo.co.jp (firewall-user@mist.nintendo.co.jp [202.214.242.34])
	by jaz.jp.freebsd.org (8.9.2+3.1W/8.7.3) with ESMTP id KAA15968
	for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 19 Mar 1999 10:39:01 +0900 (JST)
	(envelope-from shirai@pon.nintendo.co.jp)
Received: by mist.nintendo.co.jp; id KAA16073; Fri, 19 Mar 1999 10:38:59 +0900 (JST)
Received: from unknown(172.16.1.9) by mist.nintendo.co.jp via smap (4.1)
	id xma016000; Fri, 19 Mar 99 10:38:30 +0900
Received: from pon.nintendo.co.jp (pon [172.16.1.1])
	by yellow.nintendo.co.jp (8.9.3/3.7W/1999030310) with SMTP id KAA00806
	for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 19 Mar 1999 10:35:58 +0900 (JST)
Received: from pon (localhost) by pon.nintendo.co.jp (4.2/6.4J.6)
	id AA14545; Fri, 19 Mar 99 10:38:14 JST
Message-Id: <9903190138.AA14545@pon.nintendo.co.jp>
To: FreeBSD-users-jp@jp.freebsd.org
In-Reply-To: Your message of Thu, 18 Mar 1999 21:02:29 JST.
             <199903181202.VAA18568@horse.fsinet.or.jp> 
Date: Fri, 19 Mar 1999 10:38:13 +0900
From: Takashi SHIRAI <shirai@pon.nintendo.co.jp>
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: FreeBSD-users-jp 40005
Subject: [FreeBSD-users-jp 40005] Re: Chandra II (Re: B5
 =?ISO-2022-JP?B?GyRCJTUlJCU6JE4lTiE8JUgbKEI=?=
 PC) 
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: shirai@pon.nintendo.co.jp

$B!!#N#e#c#o$G$9!#(B

In Message-Id <199903181202.VAA18568@horse.fsinet.or.jp> 
        yuki@dayo.ne.jp (ITO Takayuki) $B$5$s(Bwrites:
> >$B$I$&$7$FJQ$J$s$G$9$+!%(BISA $B$N(B PCIC $B$G$O(B 0x3e2 $B$r;H$&$N$b$"$j$^$9$7!$(B
> 
> $B>5CN$7$F$$$^$9!#(BISA probe$B$+$i(B0x3e2$B$r30$;$H$O$$$C$F$$$^$;$s!#(BPCI$B$J(BPCIC
> $B$G(BBIOS$B$,(BCB_PCI_LEGACY16_IOADDR$B$r@_Dj$7$F$J$$>l9g$K(BPAO$B$,@_Dj$9$kCM$N8u(B
> $BJd$+$i30$7$^$7$g$&$H$$$&$3$H$G$9!#(B

$B!!$D$^$j!"(BISA $BE*$J(B port $BA*Br;h$H(B PCI $BE*$J(B port $BA*Br;h$rJL!9(B
$B$K$7$h$&$H$$$&$3$H$J$s$G$9$h$M!#(B
$B!!;d$,8!>ZMQ$K<j$r2C$($?$H$$$&$N$O@5$K$=$l$J$s$G$9$,!"C1=c$J(B
$BJQ99$@$H;W$C$F:9J,$r:\$;$J$+$C$?$?$a$K!">u67$d;v>p$,$&$^$/EA(B
$B$o$C$F$J$$$h$&$G$9$M!#(B
$B!!H=$C$F$k?M$K$O>iD9$J>pJs$G$9$,!"@h$N8!>Z$N:]$K$$$8$C$?ItJ,(B
$B$N:9J,$r:\$;$F$*$-$^$9!#(B

-------- Cut Here --------
diff -ur sys.ORG/pccard/pcic.c sys/pccard/pcic.c
--- sys.ORG/pccard/pcic.c	Fri Mar 19 09:54:20 1999
+++ sys/pccard/pcic.c	Thu Mar 18 08:43:07 1999
@@ -295,10 +295,10 @@
 
 #if NISA > 0
 static struct isa_device isa_devtab_pcic[] = {
-{ 0, &pcicdriver, IO_PCIC1, PCIC_INTR, -1, (caddr_t) 0, 0, pcicintr, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
-{ 0, &pcicdriver, IO_PCIC3, PCIC_INTR, -1, (caddr_t) 0, 0, pcicintr, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
-{ 0, &pcicdriver, IO_PCIC2, 0, -1, (caddr_t) 0, 0, NULL, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
-{ 0, &pcicdriver, IO_PCIC3, 0, -1, (caddr_t) 0, 0, NULL, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
+{ 0, &pcicdriver, ISA_IO_PCIC1, PCIC_INTR, -1, (caddr_t) 0, 0, pcicintr, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+{ 0, &pcicdriver, ISA_IO_PCIC3, PCIC_INTR, -1, (caddr_t) 0, 0, pcicintr, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+{ 0, &pcicdriver, ISA_IO_PCIC2, 0, -1, (caddr_t) 0, 0, NULL, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
+{ 0, &pcicdriver, ISA_IO_PCIC3, 0, -1, (caddr_t) 0, 0, NULL, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
 0
 };
 #endif
diff -ur sys.ORG/pccard/pcicvar.h sys/pccard/pcicvar.h
--- sys.ORG/pccard/pcicvar.h	Fri Mar 19 09:54:20 1999
+++ sys/pccard/pcicvar.h	Thu Mar 18 08:42:52 1999
@@ -78,14 +78,24 @@
  *	select one of the 64 possible data registers.
  */
 
-#ifndef IO_PCIC1
-#define IO_PCIC1	0x3e0
+#ifndef ISA_IO_PCIC1
+#define ISA_IO_PCIC1	0x3e0
 #endif
-#ifndef IO_PCIC2
-#define IO_PCIC2	0x3e2
+#ifndef ISA_IO_PCIC2
+#define ISA_IO_PCIC2	0x3e2
 #endif
-#ifndef IO_PCIC3
-#define IO_PCIC3	0x3e4
+#ifndef ISA_IO_PCIC3
+#define ISA_IO_PCIC3	0x3e4
+#endif
+
+#ifndef PCI_IO_PCIC1
+#define PCI_IO_PCIC1	0x3e0
+#endif
+#ifndef PCI_IO_PCIC2
+#define PCI_IO_PCIC2	0x3e4
+#endif
+#ifndef PCI_IO_PCIC3
+#define PCI_IO_PCIC3	0x3e8
 #endif
 
 #ifndef PCIC_IRQ
diff -ur sys.ORG/pci/pcic_p.c sys/pci/pcic_p.c
--- sys.ORG/pci/pcic_p.c	Fri Mar 19 09:54:20 1999
+++ sys/pci/pcic_p.c	Thu Mar 18 08:43:23 1999
@@ -77,9 +77,9 @@
 	char	probed;
 } found[] =
 {
-	{ IO_PCIC1, 0 },
-	{ IO_PCIC2, 0 },
-	{ IO_PCIC3, 0 }
+	{ PCI_IO_PCIC1, 0 },
+	{ PCI_IO_PCIC2, 0 },
+	{ PCI_IO_PCIC3, 0 }
 };
 
 static u_long
-------- Cut Here --------

$B!t!!<j85$N(B kernel source $B$,(B 2.2.7-RELEASE + PAO-980913 $B$@$C(B
$B!t$?$N$G$A$g$C$H8E$$$s$G$9$,!"(BPAO-19981225 $B$HHf$Y$F$_$k8B$j(B
$B!t$G$O!"$3$NItJ,$OJQ99$J$$$h$&$G$9!#(B
$B!t!!C"$7!"B>$NItJ,$GJQ99$,2C$o$C$?7k2L!"9T?t$,$:$l$F$-$F$$$k(B
$B!t$h$&$G$9$N$G!"$3$N$^$^$G$O(B patch $B$,DL$i$J$$$+$bCN$l$^$;$s!#(B


> >Chandra2 $B<+?H$,!$(B3E0-3E1, 3E2-3E3, 3E4-3E5, 3E6-3E7 $B$N$I$NAH$_9g$o$;$G(B
> >$B$bA*$Y$k$h$&$K$J$C$F$^$9$1$I!%(B
> 
> BIOS$B$K$*$1$k$3$NA*Br$b!"$$$^$^$G$NOC$+$i$9$k$K!"8_49%b!<%I(B(ISA$B@\B3$K8+(B
> $B$($k%b!<%I(B)$B;~$K$7$+M-8z$G$J$$$h$&$G$9!#8_49%b!<%I$G$O!"K\Ev$K(BISA$B%G%P%$(B
> $B%9$G$"$k$+$N$h$&$K$U$k$^$&$N$G!"%"%I%l%9%G%3!<%@<!Bh$G(B0x3e2$B$d(B0x3e6$B$K$b(B
> $BG[CV$G$-$k$N$G$7$g$&!#(B

$B!!$3$NJU$j$O?dB,$G$"$C$FK\Ev$N$H$3$m$ONI$/H=$i$J$$$H$$$&$N$,(B
$B<B>u$J$s$G$9$h$M!#0lHVIT2D2r$J$N$,!"(BPCIC0,1 $B6&$KF1$8(B port $B$r(B
$B;XDj$7$FF0$$$F$7$^$&E@$G$7$F!#(B
$B!!(Bpcic1 $B$K(B 0x3e2 $B$r;XDj$9$k$H(B pcic0 $B$HF1$8(B port $B$K$J$C$F$7$^(B
$B$&$H$$$&$N$O(B Chandra2 $B0J30$N(B machine $B$N(B CardBus $B%b!<%I$G$b8@(B
$B$($k$3$H$@$H;W$&$s$G$9$,!"B>$N(B machine $B$G$O$3$l$G;Y>c=P$F$J(B
$B$$$s$G$7$g$&$+!)(B

$B!t!!$3$NJU$j$N0lO"$N$^$H$a$r(B QandA $B$KAw$m$&$H$O9M$($F$$$k$s(B
$B!t$G$9$,!"21B,$N0h$r=P$J$$>pJs$bB?$/!"2?$H=q$$$?$i$$$$$N$+H=(B
$B!tCG$D$17s$M$F$$$^$9!#(B
$B!t!!;d$,=q$/$H$I$&$7$F$b!V(BCardBus $B%b!<%I$O;H$&$J!W$,4pK\(B$B$G!"(B
$B!t!V$I$&$7$F$b;H$$$?$$$J$i%@%a$b$H$G$d$C$F$_$m!W$K$J$C$A$c$$(B
$B!t$^$9!#(B

                                       $BGr0f(B $BN4(B (as $B#N#e#c#o(B)
