Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

env: Move get_env_id() to env.h

Browse source 
Move this function over to the new header file. Also rename it to have an
env_ prefix like the other functions.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Simon Glass 2019-08-01 09:46:41 -06:00 committed by Tom Rini
parent af95f2061a
commit f1f0ae6a9c
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/nvedit.c
View file

@ -27,6 +27,7 @@
#include <cli.h> #include <cli.h>
#include <command.h> #include <command.h>
#include <console.h> #include <console.h>
#include <env.h>
#include <environment.h> #include <environment.h>
#include <search.h> #include <search.h>
#include <errno.h> #include <errno.h>
@ -69,14 +70,14 @@ NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE
/* /*
* This variable is incremented on each do_env_set(), so it can * This variable is incremented on each do_env_set(), so it can
* be used via get_env_id() as an indication, if the environment * be used via env_get_id() as an indication, if the environment
* has changed or not. So it is possible to reread an environment * has changed or not. So it is possible to reread an environment
* variable only if the environment was changed ... done so for * variable only if the environment was changed ... done so for
* example in NetInitLoop() * example in NetInitLoop()
*/ */
static int env_id = 1; static int env_id = 1;
int get_env_id(void) int env_get_id(void)
{ {
return env_id; return env_id;
} }

5
drivers/net/netconsole.c
View file

@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <env.h>
#include <stdio_dev.h> #include <stdio_dev.h>
#include <net.h> #include <net.h>
@ -55,7 +56,7 @@ static int is_broadcast(struct in_addr ip)
static struct in_addr netmask; static struct in_addr netmask;
static struct in_addr our_ip; static struct in_addr our_ip;
static int env_changed_id; static int env_changed_id;
int env_id = get_env_id(); int env_id = env_get_id();
/* update only when the environment has changed */ /* update only when the environment has changed */
if (env_changed_id != env_id) { if (env_changed_id != env_id) {
@ -75,7 +76,7 @@ static int refresh_settings_from_env(void)
{ {
const char *p; const char *p;
static int env_changed_id; static int env_changed_id;
int env_id = get_env_id(); int env_id = env_get_id();
/* update only when the environment has changed */ /* update only when the environment has changed */
if (env_changed_id != env_id) { if (env_changed_id != env_id) {

2
include/common.h
View file

@ -247,8 +247,6 @@ static inline int env_set_addr(const char *varname, const void *addr)
return env_set_hex(varname, (ulong)addr); return env_set_hex(varname, (ulong)addr);
} }
int get_env_id (void);
void pci_init_board(void); void pci_init_board(void);
/* common/exports.c */ /* common/exports.c */

10
include/env.h
View file

@ -11,6 +11,16 @@
#include <stdbool.h> #include <stdbool.h>
/**
* env_get_id() - Gets a sequence number for the environment
*
* This value increments every time the environment changes, so can be used an
* an indication of this
*
* @return environment ID
*/
int env_get_id(void);
/** /**
* env_complete() - return an auto-complete for environment variables * env_complete() - return an auto-complete for environment variables
* *

3
net/eth_common.c
View file

@ -7,6 +7,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <env.h>
#include <environment.h> #include <environment.h>
#include <miiphy.h> #include <miiphy.h>
#include <net.h> #include <net.h>
@ -110,7 +111,7 @@ void eth_set_current(void)
static int env_changed_id; static int env_changed_id;
int env_id; int env_id;
env_id = get_env_id(); env_id = env_get_id();
if ((act == NULL) || (env_changed_id != env_id)) { if ((act == NULL) || (env_changed_id != env_id)) {
act = env_get("ethact"); act = env_get("ethact");
env_changed_id = env_id; env_changed_id = env_id;