[PATCH] Clean up tulip.h

Update/cleanup some definitions in tulip.h and tulip_core.c.

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Valerie Henson <val_henson@linux.intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 13 insertions, 11 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 @@
 /* undefine, or define to various debugging levels (>4 == obscene levels) */
 #define TULIP_DEBUG 1
 
-/* undefine USE_IO_OPS for MMIO, define for PIO */
 #ifdef CONFIG_TULIP_MMIO
-# undef USE_IO_OPS
+#define TULIP_BAR       1       /* CBMA */
 #else
-# define USE_IO_OPS 1
+#define TULIP_BAR       0       /* CBIO */
 #endif
 
 
@@ -143,6 +142,7 @@ enum status_bits {
         RxNoBuf = 0x80,
         RxIntr = 0x40,
         TxFIFOUnderflow = 0x20,
+        RxErrIntr = 0x10,
         TxJabber = 0x08,
         TxNoBuf = 0x04,
         TxDied = 0x02,
@@ -193,9 +193,14 @@ struct tulip_tx_desc {
 
 
 enum desc_status_bits {
-        DescOwned = 0x80000000,
-        RxDescFatalErr = 0x8000,
-        RxWholePkt = 0x0300,
+        DescOwned    = 0x80000000,
+        DescWholePkt = 0x60000000,
+        DescEndPkt   = 0x40000000,
+        DescStartPkt = 0x20000000,
+        DescEndRing  = 0x02000000,
+        DescUseLink  = 0x01000000,
+        RxDescFatalErr = 0x008000,
+        RxWholePkt   = 0x00000300,
 };
 
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7e1ca3cae1ee..def5999f987b 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1357,11 +1357,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         if (pci_request_regions (pdev, "tulip"))
                 goto err_out_free_netdev;
 
-#ifndef USE_IO_OPS
-        ioaddr =  pci_iomap(pdev, 1, tulip_tbl[chip_idx].io_size);
-#else
-        ioaddr =  pci_iomap(pdev, 0, tulip_tbl[chip_idx].io_size);
-#endif
+        ioaddr =  pci_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);
+
         if (!ioaddr)
                 goto err_out_free_res;