env: split env_import_redund() into 2 functions

split from env_import_redund() the part which checks
which Environment is valid into a separate function
called env_check_redund() and call it from env_import_redund().

So env_check_redund() can be used from places which also
need to do this checks.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/env/common.c b/env/common.c
index ed18378000f8ad5d22f8e2f32af8370a70dd6458..6c32a9b47960c7c96367f5b1f54b0fd3abc39d2c 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -141,12 +141,11 @@ int env_import(const char *buf, int check, int flags)
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
 static unsigned char env_flags;
 
-int env_import_redund(const char *buf1, int buf1_read_fail,
-                     const char *buf2, int buf2_read_fail,
-                     int flags)
+int env_check_redund(const char *buf1, int buf1_read_fail,
+                    const char *buf2, int buf2_read_fail)
 {
        int crc1_ok, crc2_ok;
-       env_t *ep, *tmp_env1, *tmp_env2;
+       env_t *tmp_env1, *tmp_env2;
 
        tmp_env1 = (env_t *)buf1;
        tmp_env2 = (env_t *)buf2;
@@ -159,14 +158,13 @@ int env_import_redund(const char *buf1, int buf1_read_fail,
        }
 
        if (buf1_read_fail && buf2_read_fail) {
-               env_set_default("bad env area", 0);
                return -EIO;
        } else if (!buf1_read_fail && buf2_read_fail) {
                gd->env_valid = ENV_VALID;
-               return env_import((char *)tmp_env1, 1, flags);
+               return -EINVAL;
        } else if (buf1_read_fail && !buf2_read_fail) {
                gd->env_valid = ENV_REDUND;
-               return env_import((char *)tmp_env2, 1, flags);
+               return -ENOENT;
        }
 
        crc1_ok = crc32(0, tmp_env1->data, ENV_SIZE) ==
@@ -175,7 +173,6 @@ int env_import_redund(const char *buf1, int buf1_read_fail,
                        tmp_env2->crc;
 
        if (!crc1_ok && !crc2_ok) {
-               env_set_default("bad CRC", 0);
                return -ENOMSG; /* needed for env_load() */
        } else if (crc1_ok && !crc2_ok) {
                gd->env_valid = ENV_VALID;
@@ -195,12 +192,37 @@ int env_import_redund(const char *buf1, int buf1_read_fail,
                        gd->env_valid = ENV_VALID;
        }
 
+       return 0;
+}
+
+int env_import_redund(const char *buf1, int buf1_read_fail,
+                     const char *buf2, int buf2_read_fail,
+                     int flags)
+{
+       env_t *ep;
+       int ret;
+
+       ret = env_check_redund(buf1, buf1_read_fail, buf2, buf2_read_fail);
+
+       if (ret == -EIO) {
+               env_set_default("bad env area", 0);
+               return -EIO;
+       } else if (ret == -EINVAL) {
+               return env_import((char *)buf1, 1, flags);
+       } else if (ret == -ENOENT) {
+               return env_import((char *)buf2, 1, flags);
+       } else if (ret == -ENOMSG) {
+               env_set_default("bad CRC", 0);
+               return -ENOMSG;
+       }
+
        if (gd->env_valid == ENV_VALID)
-               ep = tmp_env1;
+               ep = (env_t *)buf1;
        else
-               ep = tmp_env2;
+               ep = (env_t *)buf2;
 
        env_flags = ep->flags;
+
        return env_import((char *)ep, 0, flags);
 }
 #endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */

diff --git a/include/env.h b/include/env.h
index af405955b0f3ec406e90e4b9c4c2f7538d576733..c15339a93f1a9bbc8f75c8559fde232fa5519559 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -318,6 +318,24 @@ int env_import(const char *buf, int check, int flags);
  */
 int env_export(struct environment_s *env_out);
 
+/**
+ * env_check_redund() - check the two redundant environments
+ *   and find out, which is the valid one.
+ *
+ * @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,
+ *     -EINVAL if read of second entry is good
+ *     -ENOENT if read of first entry is good
+ *     -ENOMSG if the CRC was bad
+ */
+
+int env_check_redund(const char *buf1, int buf1_read_fail,
+                    const char *buf2, int buf2_read_fail);
+
 /**
  * env_import_redund() - Select and import one of two redundant environments
  *