X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.h;h=69c15d46e03518d7e88a6ffa1675fd03fd6f9b63;hp=b225caa05bac77d689fd5d16798a2ab929e0b716;hb=dbf139003bd6c8c6ca03ae7f533aa74afd8060c6;hpb=25cb540c8b73a044911ef7dab5b57879de1779e9

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index b225caa..69c15d4 100644
--- 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;
@@ -53,16 +54,19 @@ struct cui {
 	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);
 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 */