Port latest in from FreeBSD- finally have some of the link issues sorted

out so we should now be able to work with switches.

1 files changed, 33 insertions, 1 deletions

diff --git a/sys/dev/pci/if_wxreg.h b/sys/dev/pci/if_wxreg.h
index a19c855fd1d..a95f0dfd64e 100644
--- a/sys/dev/pci/if_wxreg.h
+++ b/sys/dev/pci/if_wxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wxreg.h,v 1.1 2000/02/11 14:51:50 jason Exp $	*/
+/*	$OpenBSD: if_wxreg.h,v 1.2 2000/07/06 06:19:08 mjacob Exp $	*/
 
 /*
  * Copyright (c) 1999, Traakan Software
@@ -168,6 +168,13 @@ typedef struct {
 #define	WXDCR_SLU	0x40		/* Set Link Up */
 #define	WXDCR_ILOS	0x80		/* Invert Loss-of-Signal */
 
+/*
+ * General purpose I/O pins
+ *
+ * Pin 0 is for the LED.
+ *
+ * Pin 1 is to detect loss of signal (LOS)- if it is set, we've lost signal.
+ */
 #define	WXDCR_SWDPINS_SHIFT	18
 #define	WXDCR_SWDPINS_MASK	0xf
 #define		WXDCR_SWDPIN0	(1 << 18)
@@ -181,6 +188,7 @@ typedef struct {
 #define		WXDCR_SWDPIO2	(1 << 24)
 #define		WXDCR_SWDPIO3	(1 << 25)
 
+
 #define	WXDCR_RST	0x04000000	/* Device Reset (self clearing) */
 #define	WXDCR_RFCE	0x08000000	/* Receive Flow Control Enable */
 #define	WXDCR_TFCE	0x10000000	/* Transmit Flow Control Enable */
@@ -285,6 +293,30 @@ typedef struct {
 #define	WX_HDX_COLLISION_DX	512
 
 /*
+ * Receive Configuration Word defines
+ */
+
+#define	WXRXCW_CWMASK	0x0000ffff
+#define	WXRXCW_NC	0x04000000
+#define	WXRXCW_IV	0x08000000
+#define	WXRXCW_CC	0x10000000
+#define	WXRXCW_C	0x20000000
+#define	WXRXCW_SYNCH	0x40000000
+#define	WXRXCW_ANC	0x80000000
+
+/*
+ * Receive Configuration Word defines
+ */
+
+#define	WXRXCW_CWMASK	0x0000ffff
+#define	WXRXCW_NC	0x04000000
+#define	WXRXCW_IV	0x08000000
+#define	WXRXCW_CC	0x10000000
+#define	WXRXCW_C	0x20000000
+#define	WXRXCW_SYNCH	0x40000000
+#define	WXRXCW_ANC	0x80000000
+
+/*
  * Miscellaneous
  */
 #define	WX_EEPROM_MAC_OFF	0