From patchwork Fri Oct 14 21:04:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot, v3, 01/10] Add getenv_ulong() to read an integer from an environment variable Date: Fri, 14 Oct 2011 11:04:44 -0000 From: Simon Glass X-Patchwork-Id: 119918 Message-Id: <1318626284-11161-1-git-send-email-sjg@chromium.org> To: U-Boot Mailing List This is not an uncommon operation in U-Boot, so let's put it in a common function. Signed-off-by: Simon Glass --- Changes in v2: - Fix commit title from getenv_int() to getenv_ulong() Changes in v3: - Move getenv_ulong() function comment into C file - Add special code for early environment access common/cmd_nvedit.c | 25 +++++++++++++++++++++++++ include/common.h | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 101bc49..1456b99 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -540,6 +540,31 @@ int getenv_f(const char *name, char *buf, unsigned len) return -1; } +/** + * Decode the value of an environment variable and return it. + * + * @param name Name of environemnt variable + * @param base Number base to use (normally 10, or 16 for hex) + * @param default_val Default value to return if the variable is not + * found + * @return the decoded value, or default_val if not found + */ +ulong getenv_ulong(const char *name, int base, ulong default_val) +{ + char buff[20]; + const char *str = NULL; + + /* + * Prior to the import of the environment into the hashtable we + * should not call getenv() + */ + if (gd->flags & GD_FLG_ENV_READY) + str = getenv(name); + else if (getenv_f(name, buff, sizeof(buff)) > 0) + str = buff; + return str ? simple_strtoul(str, NULL, base) : default_val; +} + #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) diff --git a/include/common.h b/include/common.h index eb19a44..27f5e98 100644 --- a/include/common.h +++ b/include/common.h @@ -288,6 +288,7 @@ void env_relocate (void); int envmatch (uchar *, int); char *getenv (const char *); int getenv_f (const char *name, char *buf, unsigned len); +ulong getenv_ulong(const char *name, int base, ulong default_val); int saveenv (void); #ifdef CONFIG_PPC /* ARM version to be fixed! */ int inline setenv (const char *, const char *);