From owner-FreeBSD-users-jp@jp.freebsd.org  Sun Feb 18 00:51:33 1996
Received: by mail.jp.freebsd.org (8.7.3+2.6Wbeta5/8.7.3) id AAA27417
	Sun, 18 Feb 1996 00:51:33 +0900 (JST)
Received: by mail.jp.freebsd.org (8.7.3+2.6Wbeta5/8.7.3) with ESMTP id AAA27412
	for <FreeBSD-users-jp@jp.freebsd.org>; Sun, 18 Feb 1996 00:51:30 +0900 (JST)
Received: (from uucp@localhost) by rayearth.rim.or.jp (8.7.3/3.4W3-uucp1) with UUCP
	id AAA19839 for FreeBSD-users-jp@jp.freebsd.org; Sun, 18 Feb 1996 00:51:07 +0900 (JST)
Received: from apollon.greg.rim.or.jp (apollon.greg.rim.or.jp [172.31.1.2]) by atena.greg.rim.or.jp (8.6.12/3.4Wbeta6) with ESMTP id AAA09509; Sun, 18 Feb 1996 00:17:12 +0900
Received: (from greg@localhost) by apollon.greg.rim.or.jp (8.7.3/3.4Wbeta6) id AAA03034; Sun, 18 Feb 1996 00:17:09 +0900 (JST)
Date: Sun, 18 Feb 1996 00:17:09 +0900 (JST)
Message-Id: <199602171517.AAA03034@apollon.greg.rim.or.jp>
Mime-Version: 1.0
To: FreeBSD-users-jp@jp.freebsd.org
Cc: greg@greg.rim.or.jp
From: greg@greg.rim.or.jp (Kensaku Masuda)
Content-Type: text/plain; charset=ISO-2022-JP
X-Mailer: mnews [version 1.19PL2] 1996-01/26(Fri)
Reply-To: FreeBSD-users-jp@jp.freebsd.org
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 407
Subject: [FreeBSD-users-jp 407] Patch about BT for PCI
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$BA}ED!w(BFXIS$B$G$9!#(B
$B!!CY$l$P$;$J$,$i!"(BFreeBSD-2.1.0R$B$+$i(B2.2-960130-SNAP$B$X%P!<%8%g%s%"%C%W(B
$B$7$F$_$^$7$?!#(BBuslogic$B$N(BSCSI$B%"%@%W%?$N%I%i%$%P$O(B2.2-960130-SNAP$B$+$i(B
ISA/EISA/PCI$B$N%3!<%I$,J,N%$5$l$^$7$?!#(B
$B$H$$$&$3$H$G!"AaB.(BPCI$BMQ$N%+!<%M%k$r$D$/$C$F$_$^$7$?!#(B
	.
	.
	.
$B$7$+$7!"%V!<%H$O=PMh$^$;$s$G$7$?!#%+!<%I$rG'<1$7$J$$$N$G$9(B(T-T)$B!#(B
$B$"$^$j$KHa$7$+$C$?$N$G!"%A%c%A%c$C$HF0$/$h$&$K$7$F$_$^$7$?!#(B
$B$D$$$G$K!"%*%j%8%J%k$N$^$^$G$O(BBT-946$B$N?7$7$a$N%+!<%I$O@dBP$KF0$-(B
$B$^$;$s!#$=$3$bD>$7$F$_$^$7$?!#$5$i$K!"(BShared IRQ$B$GF0$+$7$F$$$k>l(B
$B9g$bLdBj$,=P$k$O$:$G$9$N$G!"$=$3$b<j$r$$$l$F$_$^$7$?!#$3$N%a!<%k(B
$B$N:G8e$K%Q%C%A$rE:IU$7$^$9!#(B

$B!t$3$l$G(BKT$B%I%i%$%P$O$OITMW$+$J!)(B
$B!t0l1~!"(B2.2-9600130-SNAP$BMQ$b$D$/$C$F$_$^$9$,!D!D(B
$B!t!t$7$+$7!"(Bcurrent$B$G$O=$@5:Q$_$@$C$?$i$I$&$7$h$&!#4VH4$1$@$J!#(B

$B$"$H<ALd$J$s$G$9$,!"$3$N$F$"$$$N%Q%C%A$C$F$I$3$KAw$l$P(Bcurrent$B$KH?1G(B
$B$5$l$k$N$G$7$g$&$+!)CN$C$F$$$k?M$,$$$?$i65$($F2<$5$$!#(B

diff -rc sys/i386/scsi/bt.c /usr/src/sys/i386/scsi/bt.c
*** sys/i386/scsi/bt.c	Fri Jan 26 08:03:07 1996
--- /usr/src/sys/i386/scsi/bt.c	Sat Feb 17 23:28:57 1996
***************
*** 263,268 ****
--- 263,269 ----
  
  static struct bt_found found[] =
  {
+ 	{ 0xfffc, 0},
  	{ 0x330, 0 },
  	{ 0x334, 0 },
  	{ 0x230, 0 },
***************
*** 561,566 ****
--- 562,573 ----
  	 * just return.
  	 */
  	stat = inb(BT_INTR_PORT);
+ #define BT_STAT_MASK \
+ 	(BT_STST | BT_DIAGF | BT_INIT | BT_IDLE | BT_CDF | BT_DF | BT_INVDCMD)
+ 	if((stat & BT_STAT_MASK) == 0) {
+ 		return;
+ 	}
+ #undef BT_STAT_MASK
  
  	/* Mail Box out empty ? */
  	if (stat & BT_MBOA) {
diff -rc sys/pci/bt9xx.c /usr/src/sys/pci/bt9xx.c
*** sys/pci/bt9xx.c	Wed Jan 24 06:46:57 1996
--- /usr/src/sys/pci/bt9xx.c	Sat Feb 17 23:59:21 1996
***************
*** 35,42 ****
  #include <i386/scsi/btreg.h>
  
  /* XXX Need more device IDs */
! #define PCI_BASEADR0	PCI_MAP_REG_START
! #define PCI_DEVICE_ID_BUSLOGIC_946	0x104B1040ul
  
  static char* bt_pci_probe __P((pcici_t tag, pcidi_t type));
  static void bt_pci_attach __P((pcici_t config_id, int unit));
--- 35,43 ----
  #include <i386/scsi/btreg.h>
  
  /* XXX Need more device IDs */
! #define PCI_BASEADR0			PCI_MAP_REG_START
! #define PCI_DEVICE_ID_BUSLOGIC_946	0x1040104Bul
! #define PCI_DEVICE_ID_BUSLOGIC_946_OLD	0x0140104Bul
  
  static char* bt_pci_probe __P((pcici_t tag, pcidi_t type));
  static void bt_pci_attach __P((pcici_t config_id, int unit));
***************
*** 55,60 ****
--- 56,64 ----
  bt_pci_probe (pcici_t tag, pcidi_t type)
  {
  	switch(type) {
+ 		case PCI_DEVICE_ID_BUSLOGIC_946_OLD:
+ 			return ("Buslogic 946 SCSI host adapter(Old revision)");
+ 			break;
  		case PCI_DEVICE_ID_BUSLOGIC_946:
  			return ("Buslogic 946 SCSI host adapter");
  			break;
---
    _/ $BA}ED(B  $B7r:n(B greg@greg.rim.or.jp _/_/_/_/_/_/_/_/_/_/
   _/               greg@apt.fxis.fujixerox.co.jp      _/
  _/                  http://www.st.rim.or.jp/~greg/  _/
 _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
