diff options
author | Jason Wright <jason@cvs.openbsd.org> | 2002-01-28 01:04:03 +0000 |
---|---|---|
committer | Jason Wright <jason@cvs.openbsd.org> | 2002-01-28 01:04:03 +0000 |
commit | 3de33e4aa9291053bf586a979b063cdf22536171 (patch) | |
tree | 60e14418af1e0e0cfc937e12d4fdb724ba671bb9 /sys/dev/ic/gemreg.h | |
parent | 654fb3e6ed3005edd778cdd5fdbfbe278b530a40 (diff) |
Re-port the NetBSD driver, but rewrite tx logic to use static buffers (and
copies). This makes the Blade100 gem stable for me.
Diffstat (limited to 'sys/dev/ic/gemreg.h')
-rw-r--r-- | sys/dev/ic/gemreg.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/ic/gemreg.h b/sys/dev/ic/gemreg.h index 1f945b3ec92..00a8beee005 100644 --- a/sys/dev/ic/gemreg.h +++ b/sys/dev/ic/gemreg.h @@ -1,4 +1,3 @@ -/* $OpenBSD: gemreg.h,v 1.5 2001/12/14 02:43:55 drahn Exp $ */ /* $NetBSD: gemreg.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -82,11 +81,11 @@ #define GEM_INTR_MAC_CONTROL 0x000010000 /* MAC control interrupt */ #define GEM_INTR_MIF 0x000020000 #define GEM_INTR_BERR 0x000040000 /* Bus error interrupt */ -#define GEM_INTR_BITS "\020" \ - "\1INTME\2TXEMPTY\3TXDONE" \ - "\5RXDONE\6RXNOBUF\7RX_TAG_ERR" \ - "\16PCS\17TXMAC\20RXMAC" \ - "\21MACCONTROL\22MIF\23BERR" +#define GEM_INTR_BITS "\177\020" \ + "b\0INTME\0b\1TXEMPTY\0b\2TXDONE\0" \ + "b\4RXDONE\0b\5RXNOBUF\0b\6RX_TAG_ERR\0" \ + "b\15PCS\0b\16TXMAC\0b\17RXMAC\0" \ + "b\20MAC_CONTROL\0b\21MIF\0b\22BERR\0\0" \ @@ -532,11 +531,11 @@ struct gem_desc { #define GEM_RD_BUFSHIFT 16 #define GEM_RD_BUFLEN(x) (((x)&GEM_RD_BUFSIZE)>>GEM_RD_BUFSHIFT) -#ifndef EVL_ENCAPLEN /* defined if NVLAN > 0 */ +#ifndef EVL_ENCAPLEN #define EVL_ENCAPLEN 0 #endif #define GEM_MTU \ (ETHERMTU + EVL_ENCAPLEN + sizeof(u_int32_t) + sizeof(struct ether_header)) -#endif /* _IF_GEMREG_H */ +#endif |