ui: pb_kexec_data -> pb_boot_data

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

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index b225caa05bac77d689fd5d16798a2ab929e0b716..3bdbcfca2eaf8e4423aa6ec218d3f336d1f19398 100644 (file)
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -21,13 +21,14 @@
 
 #include <signal.h>
 
+#include "ui/common/joystick.h"
 #include "ui/common/timer.h"
 #include "nc-menu.h"
-#include "nc-ked.h"
+#include "nc-boot-editor.h"
 
 struct cui_opt_data {
        const char *name;
-       struct pb_kexec_data *kd;
+       struct pb_boot_data *bd;
 
        /* optional data */
        const struct device *dev;
@@ -50,19 +51,23 @@ 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 waitset *waitset;
+       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);
+int cui_boot_editor_run(struct pmenu_item *item);
 
 /* convenience routines */