Bunch of updates:

- Try to unbreak what I broke by screwing with the tx queuing again.
  I'm waiting for a few more people to test out this code and report back
  before I move it into current. Hopefully it will be soon. Basically I
  reverted to the old TX queuing strategy.

- Add experimental support for the 3c900B-FL (10mbps ST fiber). The card
  should be detected properly and the 10baseFL mode supported, but again
  I'm still waiting for word from a tester to see if this actually works.
  It shouldn't affect the other cards though; all the differences are in
  media selection.

- Set the TX start threshold register to get better performance.

- Increase the size of the RX and TX rings. UDP performance was pretty
  bad because the TX ring was too small. Should be substantially better
  now (I can saturate the link with either TCP or UDP now).

- Change some of the #defines to reflect proper 3Com ASIC names (boomerang,
  cyclone, krakatoa, hurricane).

- Simplify and reorganize interrupt handler; ack all interrupts right
  away and then process them. This avoids a potential race condition.
  (Noted by Matt Dillon.)

- Reorganize the bridging code to eliminate using a goto to jump into
  the middle of an if() {} clause. Sorry, that just made my brain itch.

- Use m_adj() in xl_rxeof().

- Make the payload alignment in xl_newbuf() the default (instead of
  just conditionally defined for the alpha) to improve NFS performance
  (avoids need for nfs_realign()).

1 files changed, 12 insertions, 9 deletions

diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index 5062329..3128399 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xlreg.h,v 1.25 1999/04/14 22:21:36 wpaul Exp $
+ *	$Id: if_xlreg.h,v 1.27 1999/04/29 17:56:55 wpaul Exp $
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
@@ -437,8 +437,8 @@ struct xl_list_onefrag {
 };
 
 #define XL_MAXFRAGS		63
-#define XL_RX_LIST_CNT		16
-#define XL_TX_LIST_CNT		16
+#define XL_RX_LIST_CNT		128
+#define XL_TX_LIST_CNT		256
 #define XL_MIN_FRAMELEN		60
 
 struct xl_list_data {
@@ -451,7 +451,6 @@ struct xl_chain {
 	struct xl_list		*xl_ptr;
 	struct mbuf		*xl_mbuf;
 	struct xl_chain		*xl_next;
-	u_int8_t		xl_unsent;
 };
 
 struct xl_chain_onefrag {
@@ -617,15 +616,15 @@ struct xl_stats {
 #define TC_DEVICEID_BOOMERANG_10BT_COMBO	0x9001
 #define TC_DEVICEID_BOOMERANG_10_100BT		0x9050
 #define TC_DEVICEID_BOOMERANG_100BT4		0x9051
-#define TC_DEVICEID_CYCLONE_10BT		0x9004
-#define TC_DEVICEID_CYCLONE_10BT_COMBO		0x9005
-#define TC_DEVICEID_CYCLONE_10BT_TPC		0x9006
+#define TC_DEVICEID_KRAKATOA_10BT		0x9004
+#define TC_DEVICEID_KRAKATOA_10BT_COMBO		0x9005
+#define TC_DEVICEID_KRAKATOA_10BT_TPC		0x9006
 #define TC_DEVICEID_CYCLONE_10FL		0x900A
-#define TC_DEVICEID_CYCLONE_10_100BT		0x9055
+#define TC_DEVICEID_HURRICANE_10_100BT		0x9055
 #define TC_DEVICEID_CYCLONE_10_100BT4		0x9056
 #define TC_DEVICEID_CYCLONE_10_100_COMBO	0x9058
 #define TC_DEVICEID_CYCLONE_10_100FX		0x905A
-#define TC_DEVICEID_CYCLONE_10_100BT_SERV	0x9800
+#define TC_DEVICEID_HURRICANE_10_100BT_SERV	0x9800
 #define TC_DEVICEID_HURRICANE_SOHO100TX		0x7646
 
 /*
@@ -815,3 +814,7 @@ struct xl_stats {
 #define vtophys(va)		(pmap_kextract(((vm_offset_t) (va))) \
 					+ 1*1024*1024*1024)
 #endif
+
+#ifndef IFM_10_FL
+#define IFM_10_FL	13		/* 10baseFL - Fiber */
+#endif