diff options
| author | benno <benno@FreeBSD.org> | 2002-07-10 10:24:23 +0000 |
|---|---|---|
| committer | benno <benno@FreeBSD.org> | 2002-07-10 10:24:23 +0000 |
| commit | c04f2a4cddd9c20c6ade603b2184d9589561ed90 (patch) | |
| tree | 59419e0670d18b76107059ef309fecded9fd9b5f /sys/dev/gem/if_gemreg.h | |
| parent | 9e81110a6ef2934f0e55dd5e0afbc4fcac5df4f0 (diff) | |
| download | FreeBSD-src-c04f2a4cddd9c20c6ade603b2184d9589561ed90.zip FreeBSD-src-c04f2a4cddd9c20c6ade603b2184d9589561ed90.tar.gz | |
Incorporate changes made to the NetBSD version of this driver.
- Remove some obsolete code (NetBSD gem.c r1.12)
- Clean up how the local MAC address is programmed (NetBSD gem.c r1.13)
- Make the driver work on PowerMacs with gigabit interfaces
(NetBSD gem.c r1.14 and r1.15, gemreg.h r1.3 and r1.4, gemvar.h r1.6 and 1.7)
- Suppress RX_MAC interrutps regarding the FRAME_COUNT register.
(NetBSD gem.c r1.16 and r1.17)
- Fix receiver lockups. (NetBSD gem.c r1.18, gemvar.h r1.8)
- Distinguish between Apple and Sun variants (NetBSD if_gem_pci.c r1.9)
Reviewed by: tmm
Obtained from: NetBSD
Diffstat (limited to 'sys/dev/gem/if_gemreg.h')
| -rw-r--r-- | sys/dev/gem/if_gemreg.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h index c0f84ef..700c732 100644 --- a/sys/dev/gem/if_gemreg.h +++ b/sys/dev/gem/if_gemreg.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: NetBSD: gemreg.h,v 1.2 2001/10/18 03:33:33 thorpej Exp + * from: NetBSD: gemreg.h,v 1.15 2002/05/11 00:36:02 matt Exp * * $FreeBSD$ */ @@ -205,13 +205,14 @@ /* GEM_RX_PAUSE_THRESH register bits -- sizes in multiples of 64 bytes */ #define GEM_RX_PTH_XOFF_THRESH 0x000001ff -#define GEM_RX_PTH_XON_THRESH 0x07fc0000 +#define GEM_RX_PTH_XON_THRESH 0x001ff000 /* GEM_RX_BLANKING register bits */ #define GEM_RX_BLANKING_PACKETS 0x000001ff /* Delay intr for x packets */ -#define GEM_RX_BLANKING_TIME 0x03fc0000 /* Delay intr for x ticks */ -/* One tick is 1048 PCI clocs, or 16us at 66MHz */ +#define GEM_RX_BLANKING_TIME 0x000ff000 /* Delay intr for x ticks */ +#define GEM_RX_BLANKING_TIME_SHIFT 12 +/* One tick is 2048 PCI clocks, or 16us at 66MHz */ /* GEM_MAC registers */ @@ -324,7 +325,7 @@ #define GEM_MAC_XIF_TX_MII_ENA 0x00000001 /* Enable XIF output drivers */ #define GEM_MAC_XIF_MII_LOOPBK 0x00000002 /* Enable MII loopback mode */ #define GEM_MAC_XIF_ECHO_DISABL 0x00000004 /* Disable echo */ -#define GEM_MAC_XIF_MII_MODE 0x00000008 /* Select GMII/MII mode */ +#define GEM_MAC_XIF_GMII_MODE 0x00000008 /* Select GMII/MII mode */ #define GEM_MAC_XIF_MII_BUF_ENA 0x00000010 /* Enable MII recv buffers */ #define GEM_MAC_XIF_LINK_LED 0x00000020 /* force link LED active */ #define GEM_MAC_XIF_FDPLX_LED 0x00000040 /* force FDPLX LED active */ |
