diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-05-21 14:26:12 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-06-24 12:52:50 +0800 |
commit | 78c82fbd0a481249de1763b5d43bb9876ea612bd (patch) | |
tree | 6a18be70349e410243f9fd3fc8848da8b91165c5 /ui/ncurses/nc-cui.h | |
parent | e65870b0d7638ad9e848b87526a04e32bc96f756 (diff) | |
download | talos-petitboot-78c82fbd0a481249de1763b5d43bb9876ea612bd.tar.gz talos-petitboot-78c82fbd0a481249de1763b5d43bb9876ea612bd.zip |
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>
Diffstat (limited to 'ui/ncurses/nc-cui.h')
-rw-r--r-- | ui/ncurses/nc-cui.h | 14 |
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 |