net: new utility functions for working with enetaddr's

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.

The functions in question:
	eth_parse_enetaddr - "..." -> {...}
	eth_getenv_enetaddr - env -> {...}
	eth_setenv_enetaddr - {...} -> env

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>

diff --git a/include/net.h b/include/net.h
index bd061d9e76002970fa04d43fc6cc8d5f5d8c4637..5a1d36ee3113c57bb3a3fd51f77edeb7fdebe42d 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -120,6 +120,9 @@ extern struct eth_device *eth_get_dev_by_name(char *devname); /* get device */
 extern struct eth_device *eth_get_dev_by_index(int index); /* get dev @ index */
 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(const char *addr, uchar *enetaddr);
+extern int eth_getenv_enetaddr(char *name, uchar *enetaddr);
+extern int eth_setenv_enetaddr(char *name, const 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 217e8853f5ceb1f76b7c358fd9d93fb575b76a74..4bbf84b6bb028c2d01ce644b83dd020bc2b1e4be 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -26,6 +26,35 @@
 #include <net.h>
 #include <miiphy.h>
 
+#ifdef CONFIG_CMD_NET
+void eth_parse_enetaddr(const 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_getenv_enetaddr(char *name, uchar *enetaddr)
+{
+       eth_parse_enetaddr(getenv(name), enetaddr);
+       return is_valid_ether_addr(enetaddr);
+}
+
+int eth_setenv_enetaddr(char *name, const uchar *enetaddr)
+{
+       char buf[20];
+
+       sprintf(buf, "%pM", enetaddr);
+
+       return setenv(name, buf);
+}
+#endif
+
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
 
 static char *act = NULL;
@@ -156,8 +185,7 @@ 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;
@@ -197,13 +225,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_getenv_enetaddr(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) &&
@@ -211,16 +233,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]);
+                                       printf ("Address in SROM is         %pM\n",
+                                               dev->enetaddr);
+                                       printf ("Address in environment is  %pM\n",
+                                               env_enetaddr);
                                }
 
                                memcpy(dev->enetaddr, env_enetaddr, 6);
@@ -249,19 +265,13 @@ int eth_initialize(bd_t *bis)
 void eth_set_enetaddr(int num, char *addr) {
        struct eth_device *dev;
        unsigned char enetaddr[6];
-       char *end;
-       int i;
 
        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) {
@@ -272,11 +282,8 @@ void eth_set_enetaddr(int num, char *addr) {
        }
 
        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             %pM\n",
+               dev->name, enetaddr);
 
        memcpy(dev->enetaddr, enetaddr, 6);
 }