dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-11-02 19:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

env: Rename setenv() to env_set()

Browse Source 
We are now using an env_ prefix for environment functions. Rename setenv()
for consistency. Also add function comments in common.h.

Suggested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2017-08-03 12:22:09 -06:00
committed by Tom Rini
parent 01510091de
commit 382bee57f1
156 changed files with 470 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
test/dm/eth.c
View File

@@ -26,15 +26,15 @@ static int dm_test_eth(struct unit_test_state *uts)
{
net_ping_ip = string_to_ip("1.1.2.2");
setenv("ethact", "eth@10002000");
env_set("ethact", "eth@10002000");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
setenv("ethact", "eth@10003000");
env_set("ethact", "eth@10003000");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10003000", getenv("ethact"));
setenv("ethact", "eth@10004000");
env_set("ethact", "eth@10004000");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
@@ -45,20 +45,20 @@ DM_TEST(dm_test_eth, DM_TESTF_SCAN_FDT);
static int dm_test_eth_alias(struct unit_test_state *uts)
{
net_ping_ip = string_to_ip("1.1.2.2");
setenv("ethact", "eth0");
env_set("ethact", "eth0");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
setenv("ethact", "eth1");
env_set("ethact", "eth1");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
/* Expected to fail since eth2 is not defined in the device tree */
setenv("ethact", "eth2");
env_set("ethact", "eth2");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
setenv("ethact", "eth5");
env_set("ethact", "eth5");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10003000", getenv("ethact"));
@@ -71,14 +71,14 @@ static int dm_test_eth_prime(struct unit_test_state *uts)
net_ping_ip = string_to_ip("1.1.2.2");
/* Expected to be "eth@10003000" because of ethprime variable */
setenv("ethact", NULL);
setenv("ethprime", "eth5");
env_set("ethact", NULL);
env_set("ethprime", "eth5");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10003000", getenv("ethact"));
/* Expected to be "eth@10002000" because it is first */
setenv("ethact", NULL);
setenv("ethprime", NULL);
env_set("ethact", NULL);
env_set("ethprime", NULL);
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
@@ -121,26 +121,26 @@ static int dm_test_eth_act(struct unit_test_state *uts)
/* Invalidate MAC address */
strcpy(ethaddr[i], getenv(addrname[i]));
/* Must disable access protection for ethaddr before clearing */
setenv(".flags", addrname[i]);
setenv(addrname[i], NULL);
env_set(".flags", addrname[i]);
env_set(addrname[i], NULL);
}
/* Set ethact to "eth@10002000" */
setenv("ethact", ethname[0]);
env_set("ethact", ethname[0]);
/* Segment fault might happen if something is wrong */
ut_asserteq(-ENODEV, net_loop(PING));
for (i = 0; i < DM_TEST_ETH_NUM; i++) {
/* Restore the env */
setenv(".flags", addrname[i]);
setenv(addrname[i], ethaddr[i]);
env_set(".flags", addrname[i]);
env_set(addrname[i], ethaddr[i]);
/* Probe the device again */
ut_assertok(device_probe(dev[i]));
}
setenv(".flags", NULL);
setenv("ethact", NULL);
env_set(".flags", NULL);
env_set("ethact", NULL);
return 0;
}
@@ -150,13 +150,13 @@ DM_TEST(dm_test_eth_act, DM_TESTF_SCAN_FDT);
static int _dm_test_eth_rotate1(struct unit_test_state *uts)
{
/* Make sure that the default is to rotate to the next interface */
setenv("ethact", "eth@10004000");
env_set("ethact", "eth@10004000");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
/* If ethrotate is no, then we should fail on a bad MAC */
setenv("ethact", "eth@10004000");
setenv("ethrotate", "no");
env_set("ethact", "eth@10004000");
env_set("ethrotate", "no");
ut_asserteq(-EINVAL, net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
@@ -166,12 +166,12 @@ static int _dm_test_eth_rotate1(struct unit_test_state *uts)
static int _dm_test_eth_rotate2(struct unit_test_state *uts)
{
/* Make sure we can skip invalid devices */
setenv("ethact", "eth@10004000");
env_set("ethact", "eth@10004000");
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
/* Make sure we can handle device name which is not eth# */
setenv("ethact", "sbe5");
env_set("ethact", "sbe5");
ut_assertok(net_loop(PING));
ut_asserteq_str("sbe5", getenv("ethact"));
@@ -189,29 +189,29 @@ static int dm_test_eth_rotate(struct unit_test_state *uts)
/* Invalidate eth1's MAC address */
strcpy(ethaddr, getenv("eth1addr"));
/* Must disable access protection for eth1addr before clearing */
setenv(".flags", "eth1addr");
setenv("eth1addr", NULL);
env_set(".flags", "eth1addr");
env_set("eth1addr", NULL);
retval = _dm_test_eth_rotate1(uts);
/* Restore the env */
setenv("eth1addr", ethaddr);
setenv("ethrotate", NULL);
env_set("eth1addr", ethaddr);
env_set("ethrotate", NULL);
if (!retval) {
/* Invalidate eth0's MAC address */
strcpy(ethaddr, getenv("ethaddr"));
/* Must disable access protection for ethaddr before clearing */
setenv(".flags", "ethaddr");
setenv("ethaddr", NULL);
env_set(".flags", "ethaddr");
env_set("ethaddr", NULL);
retval = _dm_test_eth_rotate2(uts);
/* Restore the env */
setenv("ethaddr", ethaddr);
env_set("ethaddr", ethaddr);
}
/* Restore the env */
setenv(".flags", NULL);
env_set(".flags", NULL);
return retval;
}
@@ -225,8 +225,8 @@ static int _dm_test_net_retry(struct unit_test_state *uts)
* the active device should be eth0
*/
sandbox_eth_disable_response(1, true);
setenv("ethact", "eth@10004000");
setenv("netretry", "yes");
env_set("ethact", "eth@10004000");
env_set("netretry", "yes");
sandbox_eth_skip_timeout();
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
@@ -235,8 +235,8 @@ static int _dm_test_net_retry(struct unit_test_state *uts)
* eth1 is disabled and netretry is no, so the ping should fail and the
* active device should be eth1
*/
setenv("ethact", "eth@10004000");
setenv("netretry", "no");
env_set("ethact", "eth@10004000");
env_set("netretry", "no");
sandbox_eth_skip_timeout();
ut_asserteq(-ETIMEDOUT, net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
@@ -253,7 +253,7 @@ static int dm_test_net_retry(struct unit_test_state *uts)
retval = _dm_test_net_retry(uts);
/* Restore the env */
setenv("netretry", NULL);
env_set("netretry", NULL);
sandbox_eth_disable_response(1, false);
return retval;