diff options
Diffstat (limited to 'drivers/net/dc2114x.c')
| -rw-r--r-- | drivers/net/dc2114x.c | 47 | 
1 files changed, 23 insertions, 24 deletions
| diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 723892261..1d728d8b3 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -212,14 +212,14 @@ static struct pci_device_id supported[] = {  int dc21x4x_initialize(bd_t *bis)  { -	int             	idx=0; -	int             	card_number = 0; -	unsigned int           	cfrv; -	unsigned char   	timer; +	int			idx=0; +	int			card_number = 0; +	unsigned int		cfrv; +	unsigned char		timer;  	pci_dev_t		devbusfn;  	unsigned int		iobase;  	unsigned short		status; -	struct eth_device* 	dev; +	struct eth_device*	dev;  	while(1) {  		devbusfn =  pci_find_devices(supported, idx++); @@ -490,7 +490,7 @@ static void send_setup_frame(struct eth_device* dev, bd_t *bis)  {  	int		i;  	char	setup_frame[SETUP_FRAME_LEN]; -	char 	*pa = &setup_frame[0]; +	char	*pa = &setup_frame[0];  	memset(pa, 0xff, SETUP_FRAME_LEN); @@ -738,22 +738,22 @@ static void update_srom(struct eth_device *dev, bd_t *bis)  {  	int i;  	static unsigned short eeprom[0x40] = { -		0x140b, 0x6610, 0x0000, 0x0000, 	/* 00 */ -		0x0000, 0x0000, 0x0000, 0x0000, 	/* 04 */ -		0x00a3, 0x0103, 0x0000, 0x0000,  	/* 08 */ -		0x0000, 0x1f00, 0x0000, 0x0000, 	/* 0c */ -		0x0108, 0x038d, 0x0000, 0x0000,  	/* 10 */ -		0xe078, 0x0001, 0x0040, 0x0018, 	/* 14 */ -		0x0000, 0x0000, 0x0000, 0x0000,  	/* 18 */ -		0x0000, 0x0000, 0x0000, 0x0000, 	/* 1c */ -		0x0000, 0x0000, 0x0000, 0x0000,  	/* 20 */ -		0x0000, 0x0000, 0x0000, 0x0000, 	/* 24 */ -		0x0000, 0x0000, 0x0000, 0x0000,  	/* 28 */ -		0x0000, 0x0000, 0x0000, 0x0000, 	/* 2c */ -		0x0000, 0x0000, 0x0000, 0x0000,  	/* 30 */ -		0x0000, 0x0000, 0x0000, 0x0000, 	/* 34 */ -		0x0000, 0x0000, 0x0000, 0x0000,  	/* 38 */ -		0x0000, 0x0000, 0x0000, 0x4e07,		/* 3c */ +		0x140b, 0x6610, 0x0000, 0x0000,	/* 00 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 04 */ +		0x00a3, 0x0103, 0x0000, 0x0000,	/* 08 */ +		0x0000, 0x1f00, 0x0000, 0x0000,	/* 0c */ +		0x0108, 0x038d, 0x0000, 0x0000,	/* 10 */ +		0xe078, 0x0001, 0x0040, 0x0018,	/* 14 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 18 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 1c */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 20 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 24 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 28 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 2c */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 30 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 34 */ +		0x0000, 0x0000, 0x0000, 0x0000,	/* 38 */ +		0x0000, 0x0000, 0x0000, 0x4e07,	/* 3c */  	};  	/* Ethernet Addr... */ @@ -761,8 +761,7 @@ static void update_srom(struct eth_device *dev, bd_t *bis)  	eeprom[0x0b] = ((bis->bi_enetaddr[3] & 0xff) << 8) | (bis->bi_enetaddr[2] & 0xff);  	eeprom[0x0c] = ((bis->bi_enetaddr[5] & 0xff) << 8) | (bis->bi_enetaddr[4] & 0xff); -	for (i=0; i<0x40; i++) -	{ +	for (i=0; i<0x40; i++) {  		write_srom(dev, DE4X5_APROM, i, eeprom[i]);  	}  } |