 09f75cd7bf
			
		
	
	
	09f75cd7bf
	
	
	
		
			
			We now have struct net_device_stats embedded in struct net_device, and the default ->get_stats() hook does the obvious thing for us. Run through drivers/net/* and remove the driver-local storage of statistics, and driver-local ->get_stats() hook where applicable. This was just the low-hanging fruit in drivers/net; plenty more drivers remain to be updated. [ Resolved conflicts with napi_struct changes and fix sunqe build regression... -DaveM ] Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			168 lines
		
	
	
	
		
			5.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
	
		
			5.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /**************************************************
 | |
|  *                                                *
 | |
|  * Definition of D-Link Ethernet Pocket adapter   *
 | |
|  *                                                *
 | |
|  **************************************************/
 | |
| /*
 | |
|  * D-Link Ethernet pocket adapter ports
 | |
|  */
 | |
| /*
 | |
|  * OK, so I'm cheating, but there are an awful lot of
 | |
|  * reads and writes in order to get anything in and out
 | |
|  * of the DE-600 with 4 bits at a time in the parallel port,
 | |
|  * so every saved instruction really helps :-)
 | |
|  */
 | |
| 
 | |
| #ifndef DE600_IO
 | |
| #define DE600_IO	0x378
 | |
| #endif
 | |
| 
 | |
| #define DATA_PORT	(DE600_IO)
 | |
| #define STATUS_PORT	(DE600_IO + 1)
 | |
| #define COMMAND_PORT	(DE600_IO + 2)
 | |
| 
 | |
| #ifndef DE600_IRQ
 | |
| #define DE600_IRQ	7
 | |
| #endif
 | |
| /*
 | |
|  * It really should look like this, and autoprobing as well...
 | |
|  *
 | |
| #define DATA_PORT	(dev->base_addr + 0)
 | |
| #define STATUS_PORT	(dev->base_addr + 1)
 | |
| #define COMMAND_PORT	(dev->base_addr + 2)
 | |
| #define DE600_IRQ	dev->irq
 | |
|  */
 | |
| 
 | |
| /*
 | |
|  * D-Link COMMAND_PORT commands
 | |
|  */
 | |
| #define SELECT_NIC	0x04 /* select Network Interface Card */
 | |
| #define SELECT_PRN	0x1c /* select Printer */
 | |
| #define NML_PRN		0xec /* normal Printer situation */
 | |
| #define IRQEN		0x10 /* enable IRQ line */
 | |
| 
 | |
| /*
 | |
|  * D-Link STATUS_PORT
 | |
|  */
 | |
| #define RX_BUSY		0x80
 | |
| #define RX_GOOD		0x40
 | |
| #define TX_FAILED16	0x10
 | |
| #define TX_BUSY		0x08
 | |
| 
 | |
| /*
 | |
|  * D-Link DATA_PORT commands
 | |
|  * command in low 4 bits
 | |
|  * data in high 4 bits
 | |
|  * select current data nibble with HI_NIBBLE bit
 | |
|  */
 | |
| #define WRITE_DATA	0x00 /* write memory */
 | |
| #define READ_DATA	0x01 /* read memory */
 | |
| #define STATUS		0x02 /* read  status register */
 | |
| #define COMMAND		0x03 /* write command register (see COMMAND below) */
 | |
| #define NULL_COMMAND	0x04 /* null command */
 | |
| #define RX_LEN		0x05 /* read  received packet length */
 | |
| #define TX_ADDR		0x06 /* set adapter transmit memory address */
 | |
| #define RW_ADDR		0x07 /* set adapter read/write memory address */
 | |
| #define HI_NIBBLE	0x08 /* read/write the high nibble of data,
 | |
| 				or-ed with rest of command */
 | |
| 
 | |
| /*
 | |
|  * command register, accessed through DATA_PORT with low bits = COMMAND
 | |
|  */
 | |
| #define RX_ALL		0x01 /* PROMISCUOUS */
 | |
| #define RX_BP		0x02 /* default: BROADCAST & PHYSICAL ADDRESS */
 | |
| #define RX_MBP		0x03 /* MULTICAST, BROADCAST & PHYSICAL ADDRESS */
 | |
| 
 | |
| #define TX_ENABLE	0x04 /* bit 2 */
 | |
| #define RX_ENABLE	0x08 /* bit 3 */
 | |
| 
 | |
| #define RESET		0x80 /* set bit 7 high */
 | |
| #define STOP_RESET	0x00 /* set bit 7 low */
 | |
| 
 | |
| /*
 | |
|  * data to command register
 | |
|  * (high 4 bits in write to DATA_PORT)
 | |
|  */
 | |
| #define RX_PAGE2_SELECT	0x10 /* bit 4, only 2 pages to select */
 | |
| #define RX_BASE_PAGE	0x20 /* bit 5, always set when specifying RX_ADDR */
 | |
| #define FLIP_IRQ	0x40 /* bit 6 */
 | |
| 
 | |
| /*
 | |
|  * D-Link adapter internal memory:
 | |
|  *
 | |
|  * 0-2K 1:st transmit page (send from pointer up to 2K)
 | |
|  * 2-4K	2:nd transmit page (send from pointer up to 4K)
 | |
|  *
 | |
|  * 4-6K 1:st receive page (data from 4K upwards)
 | |
|  * 6-8K 2:nd receive page (data from 6K upwards)
 | |
|  *
 | |
|  * 8K+	Adapter ROM (contains magic code and last 3 bytes of Ethernet address)
 | |
|  */
 | |
| #define MEM_2K		0x0800 /* 2048 */
 | |
| #define MEM_4K		0x1000 /* 4096 */
 | |
| #define MEM_6K		0x1800 /* 6144 */
 | |
| #define NODE_ADDRESS	0x2000 /* 8192 */
 | |
| 
 | |
| #define RUNT 60		/* Too small Ethernet packet */
 | |
| 
 | |
| /**************************************************
 | |
|  *                                                *
 | |
|  *             End of definition                  *
 | |
|  *                                                *
 | |
|  **************************************************/
 | |
| 
 | |
| /*
 | |
|  * Index to functions, as function prototypes.
 | |
|  */
 | |
| /* Routines used internally. (See "convenience macros") */
 | |
| static u8	de600_read_status(struct net_device *dev);
 | |
| static u8	de600_read_byte(unsigned char type, struct net_device *dev);
 | |
| 
 | |
| /* Put in the device structure. */
 | |
| static int	de600_open(struct net_device *dev);
 | |
| static int	de600_close(struct net_device *dev);
 | |
| static int	de600_start_xmit(struct sk_buff *skb, struct net_device *dev);
 | |
| 
 | |
| /* Dispatch from interrupts. */
 | |
| static irqreturn_t de600_interrupt(int irq, void *dev_id);
 | |
| static int	de600_tx_intr(struct net_device *dev, int irq_status);
 | |
| static void	de600_rx_intr(struct net_device *dev);
 | |
| 
 | |
| /* Initialization */
 | |
| static void	trigger_interrupt(struct net_device *dev);
 | |
| static int	adapter_init(struct net_device *dev);
 | |
| 
 | |
| /*
 | |
|  * Convenience macros/functions for D-Link adapter
 | |
|  */
 | |
| 
 | |
| #define select_prn() outb_p(SELECT_PRN, COMMAND_PORT); DE600_SLOW_DOWN
 | |
| #define select_nic() outb_p(SELECT_NIC, COMMAND_PORT); DE600_SLOW_DOWN
 | |
| 
 | |
| /* Thanks for hints from Mark Burton <markb@ordern.demon.co.uk> */
 | |
| #define de600_put_byte(data) ( \
 | |
| 	outb_p(((data) << 4)   | WRITE_DATA            , DATA_PORT), \
 | |
| 	outb_p(((data) & 0xf0) | WRITE_DATA | HI_NIBBLE, DATA_PORT))
 | |
| 
 | |
| /*
 | |
|  * The first two outb_p()'s below could perhaps be deleted if there
 | |
|  * would be more delay in the last two. Not certain about it yet...
 | |
|  */
 | |
| #define de600_put_command(cmd) ( \
 | |
| 	outb_p(( rx_page        << 4)   | COMMAND            , DATA_PORT), \
 | |
| 	outb_p(( rx_page        & 0xf0) | COMMAND | HI_NIBBLE, DATA_PORT), \
 | |
| 	outb_p(((rx_page | cmd) << 4)   | COMMAND            , DATA_PORT), \
 | |
| 	outb_p(((rx_page | cmd) & 0xf0) | COMMAND | HI_NIBBLE, DATA_PORT))
 | |
| 
 | |
| #define de600_setup_address(addr,type) ( \
 | |
| 	outb_p((((addr) << 4) & 0xf0) | type            , DATA_PORT), \
 | |
| 	outb_p(( (addr)       & 0xf0) | type | HI_NIBBLE, DATA_PORT), \
 | |
| 	outb_p((((addr) >> 4) & 0xf0) | type            , DATA_PORT), \
 | |
| 	outb_p((((addr) >> 8) & 0xf0) | type | HI_NIBBLE, DATA_PORT))
 | |
| 
 | |
| #define rx_page_adr() ((rx_page & RX_PAGE2_SELECT)?(MEM_6K):(MEM_4K))
 | |
| 
 | |
| /* Flip bit, only 2 pages */
 | |
| #define next_rx_page() (rx_page ^= RX_PAGE2_SELECT)
 | |
| 
 | |
| #define tx_page_adr(a) (((a) + 1) * MEM_2K)
 |