diff options
Diffstat (limited to 'drivers/net/tulip/tulip.h')
-rw-r--r-- | drivers/net/tulip/tulip.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h index 64d443a80d8c..25668ddb1f7e 100644 --- a/drivers/net/tulip/tulip.h +++ b/drivers/net/tulip/tulip.h | |||
@@ -30,11 +30,10 @@ | |||
30 | /* undefine, or define to various debugging levels (>4 == obscene levels) */ | 30 | /* undefine, or define to various debugging levels (>4 == obscene levels) */ |
31 | #define TULIP_DEBUG 1 | 31 | #define TULIP_DEBUG 1 |
32 | 32 | ||
33 | /* undefine USE_IO_OPS for MMIO, define for PIO */ | ||
34 | #ifdef CONFIG_TULIP_MMIO | 33 | #ifdef CONFIG_TULIP_MMIO |
35 | # undef USE_IO_OPS | 34 | #define TULIP_BAR 1 /* CBMA */ |
36 | #else | 35 | #else |
37 | # define USE_IO_OPS 1 | 36 | #define TULIP_BAR 0 /* CBIO */ |
38 | #endif | 37 | #endif |
39 | 38 | ||
40 | 39 | ||
@@ -143,6 +142,7 @@ enum status_bits { | |||
143 | RxNoBuf = 0x80, | 142 | RxNoBuf = 0x80, |
144 | RxIntr = 0x40, | 143 | RxIntr = 0x40, |
145 | TxFIFOUnderflow = 0x20, | 144 | TxFIFOUnderflow = 0x20, |
145 | RxErrIntr = 0x10, | ||
146 | TxJabber = 0x08, | 146 | TxJabber = 0x08, |
147 | TxNoBuf = 0x04, | 147 | TxNoBuf = 0x04, |
148 | TxDied = 0x02, | 148 | TxDied = 0x02, |
@@ -193,9 +193,14 @@ struct tulip_tx_desc { | |||
193 | 193 | ||
194 | 194 | ||
195 | enum desc_status_bits { | 195 | enum desc_status_bits { |
196 | DescOwned = 0x80000000, | 196 | DescOwned = 0x80000000, |
197 | RxDescFatalErr = 0x8000, | 197 | DescWholePkt = 0x60000000, |
198 | RxWholePkt = 0x0300, | 198 | DescEndPkt = 0x40000000, |
199 | DescStartPkt = 0x20000000, | ||
200 | DescEndRing = 0x02000000, | ||
201 | DescUseLink = 0x01000000, | ||
202 | RxDescFatalErr = 0x008000, | ||
203 | RxWholePkt = 0x00000300, | ||
199 | }; | 204 | }; |
200 | 205 | ||
201 | 206 | ||