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

env: Move env import/export functions to env.h

Browse source 
Move these functions to the new header file.

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

38
include/env.h
View file

@ -12,6 +12,8 @@
#include <stdbool.h> #include <stdbool.h>
#include <linux/types.h> #include <linux/types.h>
struct environment_s;
/** /**
* env_get_id() - Gets a sequence number for the environment * env_get_id() - Gets a sequence number for the environment
* *
@ -219,4 +221,40 @@ int env_save(void);
*/ */
int env_erase(void); int env_erase(void);
/**
* env_import() - Import from a binary representation into hash table
*
* This imports the environment from a buffer. The format for each variable is
* var=value\0 with a double \0 at the end of the buffer.
*
* @buf: Buffer containing the environment (struct environemnt_s *)
* @check: non-zero to check the CRC at the start of the environment, 0 to
* ignore it
* @return 0 if imported successfully, -ENOMSG if the CRC was bad, -EIO if
* something else went wrong
*/
int env_import(const char *buf, int check);
/**
* env_export() - Export the environment to a buffer
*
* Export from hash table into binary representation
*
* @env_out: Buffer to contain the environment (must be large enough!)
* @return 0 if OK, 1 on error
*/
int env_export(struct environment_s *env_out);
/**
* env_import_redund() - Select and import one of two redundant environments
*
* @buf1: First environment (struct environemnt_s *)
* @buf1_read_fail: 0 if buf1 is valid, non-zero if invalid
* @buf2: Second environment (struct environemnt_s *)
* @buf2_read_fail: 0 if buf2 is valid, non-zero if invalid
* @return 0 if OK, -EIO if no environment is valid, -ENOMSG if the CRC was bad
*/
int env_import_redund(const char *buf1, int buf1_read_fail,
const char *buf2, int buf2_read_fail);
#endif #endif

12
include/environment.h
View file

@ -274,18 +274,6 @@ char *env_get_default(const char *name);
/* [re]set to the default environment */ /* [re]set to the default environment */
void set_default_env(const char *s, int flags); void set_default_env(const char *s, int flags);
/* Import from binary representation into hash table */
int env_import(const char *buf, int check);
/* Export from hash table into binary representation */
int env_export(env_t *env_out);
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
/* Select and import one of two redundant environments */
int env_import_redund(const char *buf1, int buf1_status,
const char *buf2, int buf2_status);
#endif
/** /**
* env_get_char() - Get a character from the early environment * env_get_char() - Get a character from the early environment
* *