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, 33 deletions

diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c
index 3b9fab1..5735055 100644
--- a/ui/ncurses/ps3-main.c
+++ b/ui/ncurses/ps3-main.c
@@ -70,7 +70,6 @@ struct opts {
 	enum opt_value show_help;
 	const char *log_file;
 	enum opt_value reset_defaults;
-	enum opt_value use_timeout;
 	enum opt_value show_version;
 };
 
@@ -84,11 +83,10 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		{"help",           no_argument,       NULL, 'h'},
 		{"log",            required_argument, NULL, 'l'},
 		{"reset-defaults", no_argument,       NULL, 'r'},
-		{"timeout",        no_argument,       NULL, 't'},
 		{"version",        no_argument,       NULL, 'V'},
 		{ NULL, 0, NULL, 0},
 	};
-	static const char short_options[] = "hl:trV";
+	static const char short_options[] = "hl:rV";
 	static const struct opts default_values = {
 		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
@@ -109,9 +107,6 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		case 'l':
 			opts->log_file = optarg;
 			break;
-		case 't':
-			opts->use_timeout = opt_yes;
-			break;
 		case 'r':
 			opts->reset_defaults = opt_yes;
 			break;
@@ -399,21 +394,6 @@ static int ps3_hot_key(struct pmenu __attribute__((unused)) *menu,
 }
 
 /**
- * ps3_timer_update - Timer callback.
- */
-
-static void ps3_timer_update(struct ui_timer *timer, unsigned int timeout)
-{
-	struct ps3_cui *ps3 = ps3_from_cui(cui_from_timer(timer));
-
-	//FIXME: make scr:timer.
-	// nc_scr_timer_update(&ps3.mm->scr, timeout);
-
-	nc_scr_status_printf(&ps3->mm->scr,
-		"Welcome to Petitboot (timeout %u sec)", timeout);
-}
-
-/**
  * ps3_mm_init - Setup the main menu instance.
  */
 
@@ -566,10 +546,6 @@ static void sig_handler(int signum)
 	DBGS("%d\n", signum);
 
 	switch (signum) {
-	case SIGALRM:
-		if (ps3.cui)
-			ui_timer_sigalrm(&ps3.cui->timer);
-		break;
 	case SIGWINCH:
 		if (ps3.cui)
 			cui_resize(ps3.cui);
@@ -666,14 +642,6 @@ int main(int argc, char *argv[])
 	ps3.mm = ps3_mm_init(&ps3);
 	ps3.svm = ps3_svm_init(&ps3);
 
-	if (opts.use_timeout != opt_yes
-		|| ps3.values.timeout == ps3_timeout_forever)
-		ui_timer_disable(&ps3.cui->timer);
-	else {
-		ps3.cui->timer.update_display = ps3_timer_update;
-		ui_timer_init(&ps3.cui->timer, ps3.values.timeout);
-	}
-
 	cui_result = cui_run(ps3.cui, ps3.mm, ps3.values.default_item);
 
 	pmenu_delete(ps3.mm);