diff options
| author | Simon Glass | 2019-08-01 09:46:54 -0600 |
|---|---|---|
| committer | Tom Rini | 2019-08-11 16:43:41 -0400 |
| commit | 36c8b143c0c113232bcf47d6499a3982fdfaf98a (patch) | |
| tree | bece8d64b485797ecfbcf1b582da2936d73c6065 | |
| parent | b79cf1af0d1cf175c4414ea1b8465747431d77cf (diff) | |
env: net: Move eth_parse_enetaddr() to net.c/h
This function fits better with the network subsystem, so move it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | cmd/nvedit.c | 12 | ||||
| -rw-r--r-- | include/environment.h | 2 | ||||
| -rw-r--r-- | include/net.h | 11 | ||||
| -rw-r--r-- | net/net.c | 12 |
4 files changed, 23 insertions, 14 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 751b77d0e98..01110e9b3a6 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -358,18 +358,6 @@ ulong env_get_hex(const char *varname, ulong default_val) return value; } -void eth_parse_enetaddr(const char *addr, uint8_t *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_env_get_enetaddr(const char *name, uint8_t *enetaddr) { eth_parse_enetaddr(env_get(name), enetaddr); diff --git a/include/environment.h b/include/environment.h index 77915f459e8..0de9d3fc600 100644 --- a/include/environment.h +++ b/include/environment.h @@ -325,8 +325,6 @@ int env_erase(void); */ void env_fix_drivers(void); -void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr); - #endif /* DO_DEPS_ONLY */ #endif /* _ENVIRONMENT_H_ */ diff --git a/include/net.h b/include/net.h index 0262175c816..a54d5eeac5f 100644 --- a/include/net.h +++ b/include/net.h @@ -875,4 +875,15 @@ int update_tftp(ulong addr, char *interface, char *devstring); /**********************************************************************/ +/** + * eth_parse_enetaddr() - Parse a MAC address + * + * Convert a string MAC address + * + * @addr: MAC address in aa:bb:cc:dd:ee:ff format, where each part is a 2-digit + * hex value + * @enetaddr: Place to put MAC address (6 bytes) + */ +void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr); + #endif /* __NET_H__ */ diff --git a/net/net.c b/net/net.c index 1a175c45973..f0a3996cd61 100644 --- a/net/net.c +++ b/net/net.c @@ -1614,3 +1614,15 @@ ushort env_get_vlan(char *var) { return string_to_vlan(env_get(var)); } + +void eth_parse_enetaddr(const char *addr, uint8_t *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; + } +} |