redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] Clean up tulip.h

Browse source 
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>
This commit is contained in:
Grant Grundler 2006-09-08 11:15:39 -07:00 committed by Jeff Garzik
parent 0bb3cf726b
commit 7f2b12482c
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/tulip/tulip.h
View file

@ -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,
};

7
drivers/net/tulip/tulip_core.c
View file

@ -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;