X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.h;h=94fef6b90bf489b3e0abe15b34f88b8e0be97f0a;hb=264444f2ae0387a113215c8f2fc619d6c467dfb2;hp=79c41a4ec90b4d243150838ca0689771790c5327;hpb=e3663cb096badf3d493df25030333affe506669b;p=petitboot

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index 79c41a4..94fef6b 100644
--- 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;
 };
 
 /**
@@ -50,13 +54,15 @@ struct cui {
 	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));
 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 +72,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)