Declare new utility functions for converting between the environment
variables (eth*addr) and the binary MAC address representation. This way
we can unify all the random places that already do this kind of thing.
Signed-off-by: Mike Frysinger <vap...@gentoo.org>
CC: Ben Warren <biggerbadder...@gmail.com>
---
include/net.h | 3 ++
net/eth.c | 76 +++++++++++++++++++++++++++++++++-----------------------
2 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/include/net.h b/include/net.h
index d2d394f..23892fe 100644
--- a/include/net.h
+++ b/include/net.h
@@ -119,6 +119,9 @@ extern struct eth_device *eth_get_dev(void); /* get
the current device MAC */
extern struct eth_device *eth_get_dev_by_name(char *devname); /* get device
*/
extern int eth_get_dev_index (void); /* get the device index
*/
extern void eth_set_enetaddr(int num, char* a); /* Set new MAC address
*/
+extern void eth_parse_enetaddr(char *addr, uchar *enetaddr);
+extern bool eth_getenv_enetaddr(char *name, uchar *enetaddr);
+extern int eth_setenv_enetaddr(char *name, uchar *enetaddr);
extern int eth_init(bd_t *bis); /* Initialize the
device */
extern int eth_send(volatile void *packet, int length); /* Send a
packet */
diff --git a/net/eth.c b/net/eth.c
index b7ef09f..cf6a678 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -127,12 +127,29 @@ int eth_register(struct eth_device* dev)
return 0;
}
+static void str_enetaddr(char *buf, uchar *enetaddr)
+{
+ sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X\n",
+ enetaddr[0], enetaddr[1], enetaddr[2],
+ enetaddr[3], enetaddr[4], enetaddr[5]);
+}
+
+void eth_parse_enetaddr(char *addr, uchar *enetaddr)
+{
+ char *end;
+ int i;
+ for (i = 0; i < 6; ++i) {
+ enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
+ if (addr)
+ addr = (*end) ? end + 1 : end;
+ }
+}
+
int eth_initialize(bd_t *bis)
{
char enetvar[32];
unsigned char env_enetaddr[6];
- int i, eth_number = 0;
- char *tmp, *end;
+ int eth_number = 0;
eth_devices = NULL;
eth_current = NULL;
@@ -172,13 +189,7 @@ int eth_initialize(bd_t *bis)
}
sprintf(enetvar, eth_number ? "eth%daddr" : "ethaddr",
eth_number);
- tmp = getenv (enetvar);
-
- for (i=0; i<6; i++) {
- env_enetaddr[i] = tmp ? simple_strtoul(tmp,
&end, 16) : 0;
- if (tmp)
- tmp = (*end) ? end+1 : end;
- }
+ eth_parse_enetaddr(getenv(enetvar), env_enetaddr);
if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
@@ -186,16 +197,10 @@ int eth_initialize(bd_t *bis)
{
printf ("\nWarning: %s MAC addresses
don't match:\n",
dev->name);
- printf ("Address in SROM is "
-
"%02X:%02X:%02X:%02X:%02X:%02X\n",
- dev->enetaddr[0],
dev->enetaddr[1],
- dev->enetaddr[2],
dev->enetaddr[3],
- dev->enetaddr[4],
dev->enetaddr[5]);
- printf ("Address in environment is "
-
"%02X:%02X:%02X:%02X:%02X:%02X\n",
- env_enetaddr[0], env_enetaddr[1],
- env_enetaddr[2], env_enetaddr[3],
- env_enetaddr[4],
env_enetaddr[5]);
+ str_enetaddr(enetvar, dev->enetaddr);
+ printf ("Address in SROM is
%s\n", enetvar);
+ str_enetaddr(enetvar, env_enetaddr);
+ printf ("Address in environment is
%s\n", enetvar);
}
memcpy(dev->enetaddr, env_enetaddr, 6);
@@ -221,22 +226,33 @@ int eth_initialize(bd_t *bis)
return eth_number;
}
+bool eth_getenv_enetaddr(char *name, uchar *enetaddr)
+{
+ char *addr = getenv(name);
+ if (!addr)
+ return false;
+ eth_parse_enetaddr(addr, enetaddr);
+ return true;
+}
+
+int eth_setenv_enetaddr(char *name, uchar *enetaddr)
+{
+ char addr[20];
+ str_enetaddr(addr, enetaddr);
+ return setenv(name, addr);
+}
+
void eth_set_enetaddr(int num, char *addr) {
struct eth_device *dev;
unsigned char enetaddr[6];
- char *end;
- int i;
+ char straddr[20];
debug ("eth_set_enetaddr(num=%d, addr=%s)\n", num, addr);
if (!eth_devices)
return;
- for (i=0; i<6; i++) {
- enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
- if (addr)
- addr = (*end) ? end+1 : end;
- }
+ eth_parse_enetaddr(addr, enetaddr);
dev = eth_devices;
while(num-- > 0) {
@@ -246,12 +262,10 @@ void eth_set_enetaddr(int num, char *addr) {
return;
}
+ str_enetaddr(straddr, enetaddr);
debug ( "Setting new HW address on %s\n"
- "New Address is %02X:%02X:%02X:%02X:%02X:%02X\n",
- dev->name,
- enetaddr[0], enetaddr[1],
- enetaddr[2], enetaddr[3],
- enetaddr[4], enetaddr[5]);
+ "New Address is %s\n",
+ dev->name, straddr);
memcpy(dev->enetaddr, enetaddr, 6);
}
--
1.6.1.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
