X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.h;h=69c15d46e03518d7e88a6ffa1675fd03fd6f9b63;hp=ddbf27f074ec53d3bc45c01559fb0b2ab3ecbe2e;hb=dbf139003bd6c8c6ca03ae7f533aa74afd8060c6;hpb=37428306a270088bfcb1f94362a0fe5b7a5a888e;ds=sidebyside diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h index ddbf27f..69c15d4 100644 --- a/ui/ncurses/nc-cui.h +++ b/ui/ncurses/nc-cui.h @@ -24,11 +24,11 @@ #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; @@ -51,23 +51,22 @@ 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 discover_client *client; struct pjs *pjs; void *platform_info; unsigned int default_item; - int (*on_kexec)(struct cui *cui, struct cui_opt_data *cod); + int (*on_boot)(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 (*js_map)(const struct js_event *e), int start_deamon, int dry_run); + int (*js_map)(const struct js_event *e), int start_deamon); 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 */