summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2009-07-09 10:40:44 -0700
committerGeoff Levand <geoffrey.levand@am.sony.com>2009-07-09 10:40:44 -0700
commit75967f32b9ae6d4e1e87790fef515ab1ed5d2d16 (patch)
treea2a2bff248d4c40dfe66328d1f43ae67fe4e5ba2
parentf57a6400e6b513695e2d1e9d1b08b0d5e562051c (diff)
downloadtalos-petitboot-75967f32b9ae6d4e1e87790fef515ab1ed5d2d16.tar.gz
talos-petitboot-75967f32b9ae6d4e1e87790fef515ab1ed5d2d16.zip
Remove ked ctrl-B hot key
Remove ked ctrl-B hot key. It is just as easy to hit enter twice. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
-rw-r--r--ui/ncurses/nc-ked.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/ui/ncurses/nc-ked.c b/ui/ncurses/nc-ked.c
index 0f52934..c326f91 100644
--- a/ui/ncurses/nc-ked.c
+++ b/ui/ncurses/nc-ked.c
@@ -189,6 +189,7 @@ static struct pb_kexec_data *ked_prepare_data(struct ked *ked)
static void ked_process_key(struct nc_scr *scr)
{
struct ked *ked = ked_from_scr(scr);
+ struct pb_kexec_data *kd;
while (1) {
int c = getch();
@@ -204,29 +205,17 @@ static void ked_process_key(struct nc_scr *scr)
break;
/* hot keys */
- case 2: { /* CTRL-B */
- struct pb_kexec_data *kd;
-
- form_driver(ked->ncf, REQ_VALIDATION);
- kd = ked_prepare_data(ked);
- ked->on_exit(ked, ked_boot, kd);
- nc_flush_keys();
- return;
- }
case 27: /* ESC */
ked->on_exit(ked, ked_cancel, NULL);
nc_flush_keys();
return;
case '\n':
- case '\r': {
- struct pb_kexec_data *kd;
-
+ case '\r':
form_driver(ked->ncf, REQ_VALIDATION);
kd = ked_prepare_data(ked);
ked->on_exit(ked, ked_update, kd);
nc_flush_keys();
return;
- }
/* insert mode */
case KEY_IC:
@@ -334,7 +323,7 @@ struct ked *ked_init(void *ui_ctx, const struct pb_kexec_data *kd,
ked->scr.frame.title = talloc_strdup(ked, "Petitboot Option Editor");
ked->scr.frame.help = talloc_strdup(ked,
- "ESC=cancel, Enter=accept, Ctrl-b=boot");
+ "ESC=cancel, Enter=accept");
ked->on_exit = on_exit;
OpenPOWER on IntegriCloud