[PATCH] Clean up tulip.h (7f2b1248) · Commits · 戴 / test

drivers/net/tulip/tulip.h

+11 −6

Original line number	Diff line number	Diff line
		@@ -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,
		@@ -194,8 +194,13 @@ struct tulip_tx_desc {

		enum desc_status_bits {
		DescOwned = 0x80000000,
		RxDescFatalErr = 0x8000,
		RxWholePkt = 0x0300,
		DescWholePkt = 0x60000000,
		DescEndPkt = 0x40000000,
		DescStartPkt = 0x20000000,
		DescEndRing = 0x02000000,
		DescUseLink = 0x01000000,
		RxDescFatalErr = 0x008000,
		RxWholePkt = 0x00000300,
		};

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;