ui/ncurses: Add cancel-default reporting

When we first see key input, we can tell the discover server to cancel
the default boot.

Untested on ps3.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

1 files changed, 1 insertions, 13 deletions

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index 69c15d4..a5ac5d5 100644
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -22,7 +22,6 @@
 #include <signal.h>
 
 #include "ui/common/joystick.h"
-#include "ui/common/timer.h"
 #include "nc-menu.h"
 #include "nc-boot-editor.h"
 
@@ -49,11 +48,11 @@ 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 pjs *pjs;
@@ -94,15 +93,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