From owner-FreeBSD-users-jp@jp.FreeBSD.org Wed Jan 15 22:33:24 2003
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id h0FDXOK20413;
	Wed, 15 Jan 2003 22:33:24 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from smtp11.mail.yahoo.co.jp (smtp11.mail.yahoo.co.jp [211.14.15.32])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with SMTP/inet id h0FDXOJ20389
	for <FreeBSD-users-jp@jp.freebsd.org>; Wed, 15 Jan 2003 22:33:24 +0900 (JST)
	(envelope-from suzu_hide_aki@yahoo.co.jp)
Received: from unknown (HELO Multi.ringbell.homeunix.net) (219.38.50.9)
  by smtp11.mail.yahoo.co.jp with SMTP; 15 Jan 2003 13:33:19 -0000
X-Apparently-From: <suzu_hide_aki@yahoo.co.jp>
From: =?ISO-2022-JP?B?GyRCTmtMWj0oTEAbKEI=?= <suzu_hide_aki@yahoo.co.jp>
To: FreeBSD-users-jp <FreeBSD-users-jp@jp.FreeBSD.org>
Message-Id: <20030115223256.0ad649d7.suzu_hide_aki@yahoo.co.jp>
X-Mailer: Sylpheed version 0.8.3 (GTK+ 1.2.10; i386-portbld-freebsd4.7)
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="Multipart_Wed__15_Jan_2003_22:32:56_+0900_081e6a00"
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
Date: Wed, 15 Jan 2003 22:32:56 +0900
X-Sequence: FreeBSD-users-jp 72942
Subject: [FreeBSD-users-jp 72942] =?ISO-2022-JP?B?GyRCRjA6bkpzOXAbKEI=?=
 (SiS962EtherChip)
Errors-To: owner-FreeBSD-users-jp@jp.FreeBSD.org
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: suzu_hide_aki@yahoo.co.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+030107

This is a multi-part message in MIME format.

--Multipart_Wed__15_Jan_2003_22:32:56_+0900_081e6a00
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit

$BNkLZ=(L@$H?=$7$^$9!#(B

$B$"$k%7%g%C%W%V%i%s%I$N(BPC$B$r9XF~$7$?$H$3$m!"(BEtherChip$B$K(BSiS962$B$,;H$o$l$F(B
$B$*$j$^$7$?!#%^%6!<%\!<%I$O(BASUS$B$N(BP4S533-VM$B$G$9!#(B
Linux$B$G$OF0$$$?$N$G$9$,!"(BFreeBSD$B$G$OF0$-$^$;$s$G$7$?!#(B

$B>I>u(B
1.MAC$B%"%I%l%9$,FI$_<h$l$J$$!#(B
2.PHY$B$,8+$D$+$i$J$$!#(B
$B$J$*(BChip$B$O(BSiS900$B$H$7$FG'<1$5$l$F$$$^$7$?!#(B

$B$3$N$&$A!"(B2.$B$O(B[FreeBSD-users-jp70210]$B$N(B($B$U(B)$B$5$s$N%Q%C%A$rEv$F$k$3$H$G(B
$B2r7h=PMh$^$7$?!#$"$j$,$H$&$4$6$$$^$9!#(B(RTL8201$B$,;HMQ$5$l$F$$$^$7$?!#(B)
$B$3$3$^$GMh$FF0$+$J$$$N$b2y$7$$$N$G!"(BLinux$B$N%I%i%$%P!<$r8+$J$,$i%Q%C%A$rEv$F$?(B
$B$H$3$m!"F0:n$7$?$N$G%Q%C%A$r:\$;$F$*$-$^$9!#(B
SiS962$B$N%j%S%8%g%s%J%s%P!<$O(B0x91$B$G$7$?!#(B
$B$J$*=i$a$F%Q%C%A$r=q$$$?$N$G!"%3!<%G%#%s%0%9%?%$%k$,$*$+$7$$$+$bCN$l$^$;$s!#(B
$B$5$i$K!"$3$N%Q%C%A$O(B($B$U(B)$B$5$s$N%Q%C%A$rEv$F$?8e$N%=!<%9$KEv$F$F$*$j$^$9!#(B

-- 
$BNkLZ=(L@(B
----------------------------------------------
E-mail:Yahoo
 suzu_hide_aki@yahoo.co.jp
----------------------------------------------

*** /sys/pci/if_sisreg.h	Wed Jan 15 08:07:42 2003
--- if_sisreg.h	Wed Jan 15 08:23:44 2003
***************
*** 124,129 ****
--- 124,134 ----
  #define SIS_EECMD_READ		0x180
  #define SIS_EECMD_ERASE		0x1c0
  
+ /* For SiS962, request the eeprom software access */
+ #define SIS_962_EECMD_REQ	0x00000400
+ #define SIS_962_EECMD_DONE	0x00000200
+ #define SIS_962_EECMD_GNT	0x00000100
+ 
  #define	SIS_NOENPHY	/* don't use Enhanced PHY Access Register */
  #ifdef	SIS_NOENPHY
  #define	SIS_MII_FRAME_START	0x4000
***************
*** 393,398 ****
--- 398,404 ----
  #define SIS_REV_630EA1		0x0083
  #define SIS_REV_630ET		0x0084
  #define SIS_REV_635		0x0090
+ #define SIS_REV_962		0x0091
  
  /*
   * NatSemi vendor ID
*** /sys/pci/if_sis.c	Wed Jan 15 08:01:25 2003
--- if_sis.c	Wed Jan 15 08:23:28 2003
***************
*** 148,153 ****
--- 148,154 ----
  static void sis_read_cmos	__P((struct sis_softc *, device_t, caddr_t,
  							int, int));
  static void sis_read_mac	__P((struct sis_softc *, device_t, caddr_t));
+ static void sis_962_read_mac	__P((struct sis_softc *, caddr_t));
  static device_t sis_find_bridge	__P((device_t));
  #endif
  
***************
*** 461,466 ****
--- 462,490 ----
  	CSR_WRITE_4(sc, SIS_CSR, csrsave);
  	return;
  }
+ 
+ /* read mac address for sis962 */
+ static void sis_962_read_mac(sc, dest)
+ 	struct sis_softc	*sc;
+ 	caddr_t			dest;
+ {
+ 	u_int32_t	waittime = 0;
+ 	
+ 	CSR_WRITE_4(sc, SIS_EECTL, SIS_962_EECMD_REQ);
+ 	while (waittime < 2000) {
+ 		if(CSR_READ_4(sc, SIS_EECTL) & SIS_962_EECMD_GNT) {
+ 			sis_read_eeprom(sc, dest, SIS_EE_NODEADDR, 3, 0);
+ 			CSR_WRITE_4(sc, SIS_EECTL, SIS_962_EECMD_DONE);
+ 			return;
+ 		} else {
+ 			DELAY(1);
+ 			waittime ++;
+ 		}
+ 	}
+ 	CSR_WRITE_4(sc, SIS_EECTL, SIS_962_EECMD_DONE);
+ 	return;
+ }
+ 
  #endif
  
  static int sis_miibus_readreg(dev, phy, reg)
***************
*** 992,997 ****
--- 1016,1024 ----
  		else if (sc->sis_rev == SIS_REV_635 ||
  			 sc->sis_rev == SIS_REV_630ET)
  			sis_read_mac(sc, dev, (caddr_t)&eaddr);
+ 		
+ 		else if (sc->sis_rev == SIS_REV_962)
+ 			sis_962_read_mac(sc, (caddr_t)&eaddr);
  		else
  #endif
  			sis_read_eeprom(sc, (caddr_t)&eaddr,


--Multipart_Wed__15_Jan_2003_22:32:56_+0900_081e6a00
Content-Type: application/octet-stream;
 name="sis962.patch"
Content-Disposition: attachment;
 filename="sis962.patch"
Content-Transfer-Encoding: base64

KioqIC9zeXMvcGNpL2lmX3Npc3JlZy5oCVdlZCBKYW4gMTUgMDg6MDc6NDIgMjAwMwotLS0gaWZf
c2lzcmVnLmgJV2VkIEphbiAxNSAwODoyMzo0NCAyMDAzCioqKioqKioqKioqKioqKgoqKiogMTI0
LDEyOSAqKioqCi0tLSAxMjQsMTM0IC0tLS0KICAjZGVmaW5lIFNJU19FRUNNRF9SRUFECQkweDE4
MAogICNkZWZpbmUgU0lTX0VFQ01EX0VSQVNFCQkweDFjMAogIAorIC8qIEZvciBTaVM5NjIsIHJl
cXVlc3QgdGhlIGVlcHJvbSBzb2Z0d2FyZSBhY2Nlc3MgKi8KKyAjZGVmaW5lIFNJU185NjJfRUVD
TURfUkVRCTB4MDAwMDA0MDAKKyAjZGVmaW5lIFNJU185NjJfRUVDTURfRE9ORQkweDAwMDAwMjAw
CisgI2RlZmluZSBTSVNfOTYyX0VFQ01EX0dOVAkweDAwMDAwMTAwCisgCiAgI2RlZmluZQlTSVNf
Tk9FTlBIWQkvKiBkb24ndCB1c2UgRW5oYW5jZWQgUEhZIEFjY2VzcyBSZWdpc3RlciAqLwogICNp
ZmRlZglTSVNfTk9FTlBIWQogICNkZWZpbmUJU0lTX01JSV9GUkFNRV9TVEFSVAkweDQwMDAKKioq
KioqKioqKioqKioqCioqKiAzOTMsMzk4ICoqKioKLS0tIDM5OCw0MDQgLS0tLQogICNkZWZpbmUg
U0lTX1JFVl82MzBFQTEJCTB4MDA4MwogICNkZWZpbmUgU0lTX1JFVl82MzBFVAkJMHgwMDg0CiAg
I2RlZmluZSBTSVNfUkVWXzYzNQkJMHgwMDkwCisgI2RlZmluZSBTSVNfUkVWXzk2MgkJMHgwMDkx
CiAgCiAgLyoKICAgKiBOYXRTZW1pIHZlbmRvciBJRAoqKiogL3N5cy9wY2kvaWZfc2lzLmMJV2Vk
IEphbiAxNSAwODowMToyNSAyMDAzCi0tLSBpZl9zaXMuYwlXZWQgSmFuIDE1IDA4OjIzOjI4IDIw
MDMKKioqKioqKioqKioqKioqCioqKiAxNDgsMTUzICoqKioKLS0tIDE0OCwxNTQgLS0tLQogIHN0
YXRpYyB2b2lkIHNpc19yZWFkX2Ntb3MJX19QKChzdHJ1Y3Qgc2lzX3NvZnRjICosIGRldmljZV90
LCBjYWRkcl90LAogIAkJCQkJCQlpbnQsIGludCkpOwogIHN0YXRpYyB2b2lkIHNpc19yZWFkX21h
YwlfX1AoKHN0cnVjdCBzaXNfc29mdGMgKiwgZGV2aWNlX3QsIGNhZGRyX3QpKTsKKyBzdGF0aWMg
dm9pZCBzaXNfOTYyX3JlYWRfbWFjCV9fUCgoc3RydWN0IHNpc19zb2Z0YyAqLCBjYWRkcl90KSk7
CiAgc3RhdGljIGRldmljZV90IHNpc19maW5kX2JyaWRnZQlfX1AoKGRldmljZV90KSk7CiAgI2Vu
ZGlmCiAgCioqKioqKioqKioqKioqKgoqKiogNDYxLDQ2NiAqKioqCi0tLSA0NjIsNDkwIC0tLS0K
ICAJQ1NSX1dSSVRFXzQoc2MsIFNJU19DU1IsIGNzcnNhdmUpOwogIAlyZXR1cm47CiAgfQorIAor
IC8qIHJlYWQgbWFjIGFkZHJlc3MgZm9yIHNpczk2MiAqLworIHN0YXRpYyB2b2lkIHNpc185NjJf
cmVhZF9tYWMoc2MsIGRlc3QpCisgCXN0cnVjdCBzaXNfc29mdGMJKnNjOworIAljYWRkcl90CQkJ
ZGVzdDsKKyB7CisgCXVfaW50MzJfdAl3YWl0dGltZSA9IDA7CisgCQorIAlDU1JfV1JJVEVfNChz
YywgU0lTX0VFQ1RMLCBTSVNfOTYyX0VFQ01EX1JFUSk7CisgCXdoaWxlICh3YWl0dGltZSA8IDIw
MDApIHsKKyAJCWlmKENTUl9SRUFEXzQoc2MsIFNJU19FRUNUTCkgJiBTSVNfOTYyX0VFQ01EX0dO
VCkgeworIAkJCXNpc19yZWFkX2VlcHJvbShzYywgZGVzdCwgU0lTX0VFX05PREVBRERSLCAzLCAw
KTsKKyAJCQlDU1JfV1JJVEVfNChzYywgU0lTX0VFQ1RMLCBTSVNfOTYyX0VFQ01EX0RPTkUpOwor
IAkJCXJldHVybjsKKyAJCX0gZWxzZSB7CisgCQkJREVMQVkoMSk7CisgCQkJd2FpdHRpbWUgKys7
CisgCQl9CisgCX0KKyAJQ1NSX1dSSVRFXzQoc2MsIFNJU19FRUNUTCwgU0lTXzk2Ml9FRUNNRF9E
T05FKTsKKyAJcmV0dXJuOworIH0KKyAKICAjZW5kaWYKICAKICBzdGF0aWMgaW50IHNpc19taWli
dXNfcmVhZHJlZyhkZXYsIHBoeSwgcmVnKQoqKioqKioqKioqKioqKioKKioqIDk5Miw5OTcgKioq
KgotLS0gMTAxNiwxMDI0IC0tLS0KICAJCWVsc2UgaWYgKHNjLT5zaXNfcmV2ID09IFNJU19SRVZf
NjM1IHx8CiAgCQkJIHNjLT5zaXNfcmV2ID09IFNJU19SRVZfNjMwRVQpCiAgCQkJc2lzX3JlYWRf
bWFjKHNjLCBkZXYsIChjYWRkcl90KSZlYWRkcik7CisgCQkKKyAJCWVsc2UgaWYgKHNjLT5zaXNf
cmV2ID09IFNJU19SRVZfOTYyKQorIAkJCXNpc185NjJfcmVhZF9tYWMoc2MsIChjYWRkcl90KSZl
YWRkcik7CiAgCQllbHNlCiAgI2VuZGlmCiAgCQkJc2lzX3JlYWRfZWVwcm9tKHNjLCAoY2FkZHJf
dCkmZWFkZHIsCg==

--Multipart_Wed__15_Jan_2003_22:32:56_+0900_081e6a00--
__________________________________________________
Do You Yahoo!?
Yahoo! BB is Broadband by Yahoo!  http://bb.yahoo.co.jp/

