X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.h;h=5298cade7ce97c55de140c9eb96ea385e4fe31e8;hp=a4ac2e885a4341b2674b3838a6a5abe80786e2ad;hb=47bc66a0c744f68a84147b0bd616ab25a242fb70;hpb=604a1ccf072f9f33326fb6dc919c1b6233d40866

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index a4ac2e8..5298cad 100644
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -22,13 +22,12 @@
 #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;
@@ -49,23 +48,26 @@ struct cui_opt_data {
 
 struct cui {
 	enum pb_nc_sig c_sig;
+	bool has_input;
 	sig_atomic_t abort;
 	sig_atomic_t resize;
 	struct nc_scr *current;
 	struct pmenu *main;
-	struct ui_timer timer;
+	struct waitset *waitset;
+	struct discover_client *client;
+	struct system_info *sysinfo;
 	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 (*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 */
 
@@ -93,15 +95,4 @@ static inline struct cui *cui_from_item(struct pmenu_item *item)
 	return cui_from_pmenu(item->pmenu);
 }
 
-static inline struct cui *cui_from_timer(struct ui_timer *timer)
-{
-	struct cui *cui;
-
-	cui = (struct cui *)((char *)timer
-		- (size_t)&((struct cui *)0)->timer);
-	assert(cui->c_sig == pb_cui_sig);
-
-	return cui;
-}
-
 #endif