leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: net: Move eth_parse_enetaddr() to net.c/h

Browse Source 
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>
This commit is contained in:
Simon Glass 2019-08-01 09:46:54 -06:00 committed by Tom Rini
parent b79cf1af0d
commit 36c8b143c0
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/nvedit.c
View File

@ -358,18 +358,6 @@ ulong env_get_hex(const char *varname, ulong default_val)
return value; 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) int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr)
{ {
eth_parse_enetaddr(env_get(name), enetaddr); eth_parse_enetaddr(env_get(name), enetaddr);

2
include/environment.h
View File

@ -325,8 +325,6 @@ int env_erase(void);
*/ */
void env_fix_drivers(void); void env_fix_drivers(void);
void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr);
#endif /* DO_DEPS_ONLY */ #endif /* DO_DEPS_ONLY */
#endif /* _ENVIRONMENT_H_ */ #endif /* _ENVIRONMENT_H_ */

11
include/net.h
View File

@ -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__ */ #endif /* __NET_H__ */

12
net/net.c
View File

@ -1614,3 +1614,15 @@ ushort env_get_vlan(char *var)
{ {
return string_to_vlan(env_get(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;
}
}