Cleanup --dry-run option code

[petitboot] / ui / ncurses / nc-cui.h

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index 79c41a4ec90b4d243150838ca0689771790c5327..90eef1cdfd7cd264cef80eebde5110fb202b9eb4 100644 (file)
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -21,15 +21,19 @@
 
 #include <signal.h>
 
+#include "ui/common/joystick.h"
 #include "ui/common/timer.h"
 #include "nc-menu.h"
 #include "nc-ked.h"
 
 struct cui_opt_data {
+       const char *name;
+       struct pb_kexec_data *kd;
+
+       /* optional data */
        const struct device *dev;
        const struct boot_option *opt;
        uint32_t opt_hash;
-       struct pb_kexec_data *kd;
 };
 
 /**
@@ -47,16 +51,19 @@ struct cui {
        enum pb_nc_sig c_sig;
        sig_atomic_t abort;
        sig_atomic_t resize;
+       int dry_run;
        struct nc_scr *current;
        struct pmenu *main;
        struct ui_timer timer;
+       struct pjs *pjs;
        void *platform_info;
        unsigned int default_item;
        int (*on_kexec)(struct cui *cui, struct cui_opt_data *cod);
 };
 
 struct cui *cui_init(void* platform_info,
-       int (*on_kexec)(struct cui *, struct cui_opt_data *));
+       int (*on_kexec)(struct cui *, struct cui_opt_data *),
+       int (*js_map)(const struct js_event *e), int start_deamon, int dry_run);
 struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr);
 int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item);
 int cui_ked_run(struct pmenu_item *item);
@@ -66,6 +73,7 @@ int cui_ked_run(struct pmenu_item *item);
 void cui_abort(struct cui *cui);
 void cui_resize(struct cui *cui);
 void cui_on_exit(struct pmenu *menu);
+void cui_on_open(struct pmenu *menu);
 int cui_run_cmd(struct pmenu_item *item);
 
 static inline struct cui *cui_from_arg(void *arg)