[PATCH v2 58/60] expo: Split setting up the menu from adding items

[Simon Glass]

Some callers may wish to add items later as they are discovered. Split
the setup code into its own function, to permit this.

Signed-off-by: Simon Glass <s...@chromium.org>
---

(no changes since v1)

 boot/bootflow_menu.c | 31 ++++++++++++++++++++++++++-----
 include/bootflow.h   | 15 +++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c
index 6bca17142ad..56a34ac8ed5 100644
--- a/boot/bootflow_menu.c
+++ b/boot/bootflow_menu.c
@@ -210,7 +210,6 @@ int bootflow_menu_add_all(struct expo *exp)
                ret = bootflow_menu_add(exp, bflow, i, &scn);
                if (ret)
                        return log_msg_ret("bao", ret);
-
        }
 
        ret = scene_arrange(scn);
@@ -257,7 +256,7 @@ int bootflow_menu_apply_theme(struct expo *exp, ofnode node)
        return 0;
 }
 
-int bootflow_menu_start(struct bootstd_priv *std, bool text_mode,
+int bootflow_menu_setup(struct bootstd_priv *std, bool text_mode,
                        struct expo **expp)
 {
        struct udevice *dev;
@@ -267,9 +266,6 @@ int bootflow_menu_start(struct bootstd_priv *std, bool 
text_mode,
        ret = bootflow_menu_new(&exp);
        if (ret)
                return log_msg_ret("bmn", ret);
-       ret = bootflow_menu_add_all(exp);
-       if (ret)
-               return log_msg_ret("bma", ret);
 
        if (ofnode_valid(std->theme)) {
                ret = bootflow_menu_apply_theme(exp, std->theme);
@@ -292,6 +288,31 @@ int bootflow_menu_start(struct bootstd_priv *std, bool 
text_mode,
        if (text_mode)
                expo_set_text_mode(exp, text_mode);
 
+       *expp = exp;
+
+       return 0;
+}
+
+int bootflow_menu_start(struct bootstd_priv *std, bool text_mode,
+                       struct expo **expp)
+{
+       struct expo *exp;
+       int ret;
+
+       ret = bootflow_menu_setup(std, text_mode, &exp);
+       if (ret)
+               return log_msg_ret("bmd", ret);
+
+       ret = bootflow_menu_add_all(exp);
+       if (ret)
+               return log_msg_ret("bma", ret);
+
+       if (ofnode_valid(std->theme)) {
+               ret = expo_apply_theme(exp, std->theme);
+               if (ret)
+                       return log_msg_ret("thm", ret);
+       }
+
        ret = expo_calc_dims(exp);
        if (ret)
                return log_msg_ret("bmd", ret);
diff --git a/include/bootflow.h b/include/bootflow.h
index 8362cbe2e69..c0e19feb9cc 100644
--- a/include/bootflow.h
+++ b/include/bootflow.h
@@ -656,9 +656,24 @@ struct bootflow_img *bootflow_img_add(struct bootflow 
*bflow, const char *fname,
  */
 int bootflow_get_seq(const struct bootflow *bflow);
 
+/**
+ * bootflow_menu_setup() - Set up a menu for bootflows
+ *
+ * Set up the expo, initially empty
+ *
+ * @std: bootstd information
+ * @text_mode: true to show the menu in text mode, false to use video display
+ * @expp: Returns the expo created, on success
+ * Return: 0 if OK, -ve on error
+ */
+int bootflow_menu_setup(struct bootstd_priv *std, bool text_mode,
+                       struct expo **expp);
+
 /**
  * bootflow_menu_start() - Start up a menu for bootflows
  *
+ * Set up the expo and add items
+ *
  * @std: bootstd information
  * @text_mode: true to show the menu in text mode, false to use video display
  * @expp: Returns the expo created, on success
-- 
2.43.0