Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: introduce per device index

Browse source 
Instead of counting the device index everytime a functions needs it, store
it in the eth_device struct. eth_register() keeps track of the indices and
updates the device's index number. This simplifies some functions in
net/eth.c.

Additionally, a network driver can now query its index, eg. to get the
correct environment ethaddr name.

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Mike Frysinger <vapier@gentoo.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Michael Walle 2011-10-27 11:31:35 +00:00 • committed by Wolfgang Denk
parent 19a5944fcd
commit fea7dcae50
2 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/net.h
View file

@ -90,6 +90,7 @@ struct eth_device {
#endif #endif
int (*write_hwaddr) (struct eth_device*); int (*write_hwaddr) (struct eth_device*);
struct eth_device *next; struct eth_device *next;
int index;
void *priv; void *priv;
}; };

41
net/eth.c
View file

@ -127,7 +127,6 @@ struct eth_device *eth_get_dev_by_name(const char *devname)
struct eth_device *eth_get_dev_by_index(int index) struct eth_device *eth_get_dev_by_index(int index)
{ {
struct eth_device *dev, *target_dev; struct eth_device *dev, *target_dev;
int idx = 0;
if (!eth_devices) if (!eth_devices)
return NULL; return NULL;
@ -135,12 +134,11 @@ struct eth_device *eth_get_dev_by_index(int index)
dev = eth_devices; dev = eth_devices;
target_dev = NULL; target_dev = NULL;
do { do {
if (idx == index) { if (dev->index == index) {
target_dev = dev; target_dev = dev;
break; break;
} }
dev = dev->next; dev = dev->next;
idx++;
} while (dev != eth_devices); } while (dev != eth_devices);
return target_dev; return target_dev;
@ -148,24 +146,11 @@ struct eth_device *eth_get_dev_by_index(int index)
int eth_get_dev_index (void) int eth_get_dev_index (void)
{ {
struct eth_device *dev; if (!eth_current) {
int num = 0; return -1;
if (!eth_devices) {
return (-1);
} }
for (dev = eth_devices; dev; dev = dev->next) { return eth_current->index;
if (dev == eth_current)
break;
++num;
}
if (dev) {
return (num);
}
return (0);
} }
static void eth_current_changed(void) static void eth_current_changed(void)
@ -219,6 +204,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
int eth_register(struct eth_device *dev) int eth_register(struct eth_device *dev)
{ {
struct eth_device *d; struct eth_device *d;
static int index = 0;
assert(strlen(dev->name) < NAMESIZE); assert(strlen(dev->name) < NAMESIZE);
@ -233,14 +219,14 @@ int eth_register(struct eth_device *dev)
dev->state = ETH_STATE_INIT; dev->state = ETH_STATE_INIT;
dev->next = eth_devices; dev->next = eth_devices;
dev->index = index++;
return 0; return 0;
} }
int eth_initialize(bd_t *bis) int eth_initialize(bd_t *bis)
{ {
int eth_number = 0; int num_devices = 0;
eth_devices = NULL; eth_devices = NULL;
eth_current = NULL; eth_current = NULL;
@ -281,7 +267,7 @@ int eth_initialize(bd_t *bis)
show_boot_progress (65); show_boot_progress (65);
do { do {
if (eth_number) if (dev->index)
puts (", "); puts (", ");
printf("%s", dev->name); printf("%s", dev->name);
@ -294,18 +280,18 @@ int eth_initialize(bd_t *bis)
if (strchr(dev->name, ' ')) if (strchr(dev->name, ' '))
puts("\nWarning: eth device name has a space!\n"); puts("\nWarning: eth device name has a space!\n");
if (eth_write_hwaddr(dev, "eth", eth_number)) if (eth_write_hwaddr(dev, "eth", dev->index))
puts("\nWarning: failed to set MAC address\n"); puts("\nWarning: failed to set MAC address\n");
eth_number++;
dev = dev->next; dev = dev->next;
num_devices++;
} while(dev != eth_devices); } while(dev != eth_devices);
eth_current_changed(); eth_current_changed();
putc ('\n'); putc ('\n');
} }
return eth_number; return num_devices;
} }
#ifdef CONFIG_MCAST_TFTP #ifdef CONFIG_MCAST_TFTP
@ -356,7 +342,6 @@ u32 ether_crc (size_t len, unsigned char const *p)
int eth_init(bd_t *bis) int eth_init(bd_t *bis)
{ {
int eth_number;
struct eth_device *old_current, *dev; struct eth_device *old_current, *dev;
if (!eth_current) { if (!eth_current) {
@ -365,16 +350,14 @@ int eth_init(bd_t *bis)
} }
/* Sync environment with network devices */ /* Sync environment with network devices */
eth_number = 0;
dev = eth_devices; dev = eth_devices;
do { do {
uchar env_enetaddr[6]; uchar env_enetaddr[6];
if (eth_getenv_enetaddr_by_index("eth", eth_number, if (eth_getenv_enetaddr_by_index("eth", dev->index,
env_enetaddr)) env_enetaddr))
memcpy(dev->enetaddr, env_enetaddr, 6); memcpy(dev->enetaddr, env_enetaddr, 6);
++eth_number;
dev = dev->next; dev = dev->next;
} while (dev != eth_devices); } while (dev != eth_devices);