Commit ac6a86a5 authored by Armin Wolf's avatar Armin Wolf Committed by David S. Miller
Browse files

8390: Fix coding-style issues 



Fix some coding-style issues, including one which
made the function pointers in the struct ei_device
hard to understand.

Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 836e0e55

drivers/net/ethernet/8390/8390.h

+36 −25
Original line number Diff line number Diff line 
/* Generic NS8390 register definitions. */



/* This file is part of Donald Becker's 8390 drivers, and is distributed

   under the same license. Auto-loading of 8390.o only in v2.2 - Paul G.

   Some of these names and comments originated from the Crynwr

   packet drivers, which are distributed under the GPL. */

 * under the same license. Auto-loading of 8390.o only in v2.2 - Paul G.

 * Some of these names and comments originated from the Crynwr

 * packet drivers, which are distributed under the GPL.

 */



#ifndef _8390_h

#define _8390_h
@@ -66,18 +68,24 @@ static inline struct net_device *alloc_eip_netdev(void) 
/* You have one of these per-board */

struct ei_device {

	const char *name;

	void (*reset_8390)(struct net_device *);

	void (*get_8390_hdr)(struct net_device *, struct e8390_pkt_hdr *, int);

	void (*block_output)(struct net_device *, int, const unsigned char *, int);

	void (*block_input)(struct net_device *, int, struct sk_buff *, int);

	void (*reset_8390)(struct net_device *dev);

	void (*get_8390_hdr)(struct net_device *dev,

			     struct e8390_pkt_hdr *hdr, int ring_page);

	void (*block_output)(struct net_device *dev, int count,

			     const unsigned char *buf, int start_page);

	void (*block_input)(struct net_device *dev, int count,

			    struct sk_buff *skb, int ring_offset);

	unsigned long rmem_start;

	unsigned long rmem_end;

	void __iomem *mem;

	unsigned char mcfilter[8];

	unsigned open:1;

	unsigned word16:1;  		/* We have the 16-bit (vs 8-bit) version of the card. */

	unsigned bigendian:1;		/* 16-bit big endian mode. Do NOT */

					/* set this on random 8390 clones! */

	unsigned word16:1;		/* We have the 16-bit (vs 8-bit)

					 * version of the card.

					 */

	unsigned bigendian:1;		/* 16-bit big endian mode. Do NOT

					 * set this on random 8390 clones!

					 */

	unsigned txing:1;		/* Transmit Active */

	unsigned irqlock:1;		/* 8390's intrs disabled when '1'. */

	unsigned dmaing:1;		/* Remote DMA Active */
@@ -115,12 +123,16 @@ struct ei_device { 
#define E8390_RXCONFIG		(ei_status.rxcr_base | 0x04)

#define E8390_RXOFF		(ei_status.rxcr_base | 0x20)

#else

#define E8390_RXCONFIG		0x4	/* EN0_RXCR: broadcasts, no multicast,errors */

#define E8390_RXOFF		0x20	/* EN0_RXCR: Accept no packets */

/* EN0_RXCR: broadcasts, no multicast,errors */

#define E8390_RXCONFIG		0x4

/* EN0_RXCR: Accept no packets */

#define E8390_RXOFF		0x20

#endif



#define E8390_TXCONFIG		0x00	/* EN0_TXCR: Normal transmit mode */

#define E8390_TXOFF		0x02	/* EN0_TXCR: Transmitter off */

/* EN0_TXCR: Normal transmit mode */

#define E8390_TXCONFIG		0x00

/* EN0_TXCR: Transmitter off */

#define E8390_TXOFF		0x02





/*  Register accessed at EN_CMD, the 8390 base addr.  */
@@ -134,8 +146,7 @@ struct ei_device { 
#define E8390_PAGE1	0x40	/* using the two high-order bits */

#define E8390_PAGE2	0x80	/* Page 3 is invalid. */



/*

 *	Only generate indirect loads given a machine that needs them.

/* Only generate indirect loads given a machine that needs them.

 * - removed AMIGA_PCMCIA from this list, handled as ISA io now

 * - the _p for generates no delay by default 8390p.c overrides this.

 */