From owner-FreeBSD-users-jp@jp.freebsd.org  Mon Nov 17 10:59:08 1997
Received: by jaz.jp.freebsd.org (8.8.8+2.7Wbeta7/8.7.3) id KAA25729
	Mon, 17 Nov 1997 10:59:08 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.8+2.7Wbeta7/8.7.3) with ESMTP id KAA25724
	for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 17 Nov 1997 10:59:04 +0900 (JST)
Received: from rd.njk.co.jp by abu.njk.co.jp (8.8.8/njk) with ESMTP id KAA06401 for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 17 Nov 1997 10:58:14 +0900 (JST)
Received: from pluto.rd.njk.co.jp by rd.njk.co.jp (8.8.5/mx) with ESMTP id KAA22125 for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 17 Nov 1997 10:58:16 +0900 (JST)
Received: from D-shibata.rd.njk.co.jp by pluto.rd.njk.co.jp (8.8.5/3.5Wpl4/pluto1.3) with SMTP id KAA16549 for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 17 Nov 1997 10:58:13 +0900 (JST)
Message-Id: <9711170158.AA04118@D-shibata.rd.njk.co.jp>
From: Chiharu Shibata <chi@rd.njk.co.jp>
Date: Mon, 17 Nov 1997 10:58:12 +0900
To: FreeBSD-users-jp@jp.freebsd.org
Organization: NJK Corporation <http://www.njk.co.jp/>
MIME-Version: 1.0
X-Mailer: AL-Mail 1.32
Content-Type: text/plain; charset=iso-2022-jp
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=20]
X-Sequence: FreeBSD-users-jp 20781
Subject: [FreeBSD-users-jp 20781] NE2000 PCI
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B$3$s$K$A$O!"<FED$G$9!#(J
$B!tF1$8FbMF$N$b$N$r(J98testers ML$B$K$bEj9F$7$F$$$^$9!#(J98testers ML$B$K$b(J
$B!t2CF~$7$F$$$kJ}$O!"$=$A$i$N$[$&$GJs9p$7$F$/$@$5$$(J

$B0JA0$K!"(JPCI$B$N(JNE2000$B8_49%\!<%I$r(JFreeBSD(98)$B$G;H$&$H(Jpanic$B$9$k$H$$$&OC(J
$B$,$"$C$?$H;W$&$N$G$9$,!"$I$&$d$i%P%0$N$h$&$G$9!#(J

$B0J2<$N%Q%C%A$rE,1~$7$?>l9g$N7k2L$H(Jdmesg$B$NI=<(FbMF!"$*$h$S%F%9%H$7$?(J
$B%\!<%I$H!"$o$+$k$J$i$P(JLAN$B%3%s%H%m!<%i$N%A%C%WL>$r$"$o$;$F!"Aa5^$K(J
$B%l%]!<%H$r2<$5$$!#(J
$B%Q%C%A$O!"(JFreeBSD(98)2.2.1R-ALPHA$B$G:n$j$^$7$?$,!"(J2.2$B7O$J$iE,1~$G$-$k(J
$B$H;W$$$^$9!#(J
$B!t@8$N(Jdiff$B$H!"$=$l$r(Juuencode$B$7$?$b$N$NN>J}$rE:IU$7$F$$$^$9(J

$B!<!<!<!<$3$3$+$i(J
--- /sys/pc98/pc98/if_ed.c-	Wed Feb 12 22:41:21 1997
+++ /sys/pc98/pc98/if_ed.c	Sat Nov 15 21:16:10 1997
@@ -1612,6 +1612,10 @@
 {
 	int     nports;
 
+#ifdef PC98
+	ed_softc[isa_dev->id_unit].type = ED_TYPE98_GENERIC;
+	(void)pc98_set_register(isa_dev, ED_TYPE98_GENERIC);
+#endif
 	nports = ed_probe_WD80x3(isa_dev);
 	if (nports)
 		return (nports);
@@ -2544,6 +2548,10 @@
 		return sc;
 
 	bzero(sc, sizeof *sc);
+#ifdef PC98
+	sc->type = ED_TYPE98_GENERIC;
+	(void)pc98_set_register_unit(sc, 0, ED_TYPE98_GENERIC);
+#endif
 	if (ed_probe_Novell_generic(sc, port, unit, isa_flags) == 0
 	    || ed_attach(sc, unit, isa_flags) == 0) {
 		free(sc, M_DEVBUF);
--- /sys/pc98/pc98/if_ed98.h-	Sat Nov 15 20:10:03 1997
+++ /sys/pc98/pc98/if_ed98.h	Sat Nov 15 20:59:02 1997
@@ -37,6 +37,7 @@
 #endif
 
 static	int pc98_set_register __P((struct isa_device *dev, int type));
+static	int pc98_set_register_unit __P((struct ed_softc *sc, int iobase, int 
type));
 
 /*
  * Vendor types
@@ -386,7 +387,12 @@
 static int
 pc98_set_register(struct isa_device *dev, int type)
 {
-	struct	ed_softc *sc = &ed_softc[dev->id_unit];
+	return (&ed_softc[dev->id_unit], dev->id_iobase, type);
+}
+
+static int
+pc98_set_register_unit(struct ed_softc *sc, int iobase, int type)
+{
 	int	adj;
 	int	nports;
 
@@ -470,9 +476,9 @@
 
 	case ED_TYPE98_108:
 		sc->edreg.port = edp_nec108;
-		adj = (dev->id_iobase & 0xf000) / 2;
+		adj = (iobase & 0xf000) / 2;
 		ED_NOVELL_NIC_OFFSET = 0;
-		ED_NOVELL_ASIC_OFFSET = (0x888 | adj) - dev->id_iobase;
+		ED_NOVELL_ASIC_OFFSET = (0x888 | adj) - iobase;
 		ED_NOVELL_DATA = 0;
 		ED_NOVELL_RESET = 2;
 		ED_PC_MISC = 0x18;
$B!<!<!<!<$3$3$^$G(J

begin 644 ed_pci.diff
M+2TM("]S>7,O<&,Y."]P8SDX+VEF7V5D+F,M"5=E9"!&96(@,3(@,C(Z-#$Z
M,C$@,3DY-PHK*RL@+W-Y<R]P8SDX+W!C.3@O:69?960N8PE3870@3F]V(#$U
M(#(Q.C$V.C$P(#$Y.3<*0$`@+3$V,3(L-B`K,38Q,BPQ,"!`0`H@>PH@"6EN
M="`@("`@;G!O<G1S.PH@"BLC:69D968@4$,Y.`HK"65D7W-O9G1C6VES85]D
M978M/FED7W5N:71=+G1Y<&4@/2!%1%]465!%.3A?1T5.15))0SL**PDH=F]I
M9"EP8SDX7W-E=%]R96=I<W1E<BAI<V%?9&5V+"!%1%]465!%.3A?1T5.15))
M0RD["BLC96YD:68*(`EN<&]R=',@/2!E9%]P<F]B95]71#@P>#,H:7-A7V1E
M=BD["B`):68@*&YP;W)T<RD*(`D)<F5T=7)N("AN<&]R=',I.PI`0"`M,C4T
M-"PV("LR-30X+#$P($!`"B`)"7)E='5R;B!S8SL*(`H@"6)Z97)O*'-C+"!S
M:7IE;V8@*G-C*3L**R-I9F1E9B!00SDX"BL)<V,M/G1Y<&4@/2!%1%]465!%
M.3A?1T5.15))0SL**PDH=F]I9"EP8SDX7W-E=%]R96=I<W1E<E]U;FET*'-C
M+"`P+"!%1%]465!%.3A?1T5.15))0RD["BLC96YD:68*(`EI9B`H961?<')O
M8F5?3F]V96QL7V=E;F5R:6,H<V,L('!O<G0L('5N:70L(&ES85]F;&%G<RD@
M/3T@,`H@"2`@("!\?"!E9%]A='1A8V@H<V,L('5N:70L(&ES85]F;&%G<RD@
M/3T@,"D@>PH@"0EF<F5E*'-C+"!-7T1%5D)51BD["BTM+2`O<WES+W!C.3@O
M<&,Y."]I9E]E9#DX+F@M"5-A="!.;W8@,34@,C`Z,3`Z,#,@,3DY-PHK*RL@
M+W-Y<R]P8SDX+W!C.3@O:69?960Y."YH"5-A="!.;W8@,34@,C`Z-3DZ,#(@
M,3DY-PI`0"`M,S<L-B`K,S<L-R!`0`H@(V5N9&EF"B`*('-T871I8PEI;G0@
M<&,Y.%]S971?<F5G:7-T97(@7U]0*"AS=')U8W0@:7-A7V1E=FEC92`J9&5V
M+"!I;G0@='EP92DI.PHK<W1A=&EC"6EN="!P8SDX7W-E=%]R96=I<W1E<E]U
M;FET(%]?4"@H<W1R=6-T(&5D7W-O9G1C("IS8RP@:6YT(&EO8F%S92P@:6YT
M('1Y<&4I*3L*(`H@+RH*("`J(%9E;F1O<B!T>7!E<PI`0"`M,S@V+#<@*S,X
M-RPQ,B!`0`H@<W1A=&EC(&EN=`H@<&,Y.%]S971?<F5G:7-T97(H<W1R=6-T
M(&ES85]D979I8V4@*F1E=BP@:6YT('1Y<&4I"B!["BT)<W1R=6-T"65D7W-O
M9G1C("IS8R`]("9E9%]S;V9T8UMD978M/FED7W5N:71=.PHK"7)E='5R;B`H
M)F5D7W-O9G1C6V1E=BT^:61?=6YI=%TL(&1E=BT^:61?:6]B87-E+"!T>7!E
M*3L**WT**PHK<W1A=&EC(&EN=`HK<&,Y.%]S971?<F5G:7-T97)?=6YI="AS
M=')U8W0@961?<V]F=&,@*G-C+"!I;G0@:6]B87-E+"!I;G0@='EP92D**WL*
M(`EI;G0)861J.PH@"6EN=`EN<&]R=',["B`*0$`@+30W,"PY("LT-S8L.2!`
M0`H@"B`)8V%S92!%1%]465!%.3A?,3`X.@H@"0ES8RT^961R96<N<&]R="`]
M(&5D<%]N96,Q,#@["BT)"6%D:B`]("AD978M/FED7VEO8F%S92`F(#!X9C`P
M,"D@+R`R.PHK"0EA9&H@/2`H:6]B87-E("8@,'AF,#`P*2`O(#(["B`)"45$
M7TY/5D5,3%].24-?3T9&4T54(#T@,#L*+0D)141?3D]614Q,7T%324-?3T9&
M4T54(#T@*#!X.#@X('P@861J*2`M(&1E=BT^:61?:6]B87-E.PHK"0E%1%].
M3U9%3$Q?05-)0U]/1D93150@/2`H,'@X.#@@?"!A9&HI("T@:6]B87-E.PH@
M"0E%1%].3U9%3$Q?1$%402`](#`["B`)"45$7TY/5D5,3%]215-%5"`](#([
7"B`)"45$7U!#7TU)4T,@/2`P>#$X.PH)
`
end

-- 
$B<FED(J $B@i=U(J($B!i(J)  chi@rd.njk.co.jp, chi@bd.mbn.or.jp, HQG00246@niftyserve.or.jp
               <http://plaza17.mbn.or.jp/~chi/>
