diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2015-06-26 11:36:19 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2015-06-26 11:39:39 +0800 |
commit | 37b4861cb01bf6bd9da41aa1b311a87b0d26fc25 (patch) | |
tree | 3330d1958b04c9923de090273a4c0be4ee36e577 /ui/ncurses/nc-cui.h | |
parent | 83a3159f19f237fa994d2c0a16f97f711d02472c (diff) | |
parent | 7df003a0d222ae08bff62de4fefff1cf56628123 (diff) | |
download | talos-petitboot-37b4861cb01bf6bd9da41aa1b311a87b0d26fc25.tar.gz talos-petitboot-37b4861cb01bf6bd9da41aa1b311a87b0d26fc25.zip |
Merge remote-tracking rbanch sammj/master
Conflicts:
discover/platform-powerpc.c
discover/ipmi.h
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui/ncurses/nc-cui.h')
-rw-r--r-- | ui/ncurses/nc-cui.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h index 694ebd1..24a0761 100644 --- a/ui/ncurses/nc-cui.h +++ b/ui/ncurses/nc-cui.h @@ -63,6 +63,7 @@ struct cui { struct boot_editor *boot_editor; struct lang_screen *lang_screen; struct help_screen *help_screen; + struct subset_screen *subset_screen; struct pjs *pjs; void *platform_info; unsigned int default_item; @@ -81,6 +82,8 @@ void cui_show_config(struct cui *cui); void cui_show_lang(struct cui *cui); void cui_show_help(struct cui *cui, const char *title, const struct help_text *text); +void cui_show_subset(struct cui *cui, const char *title, + void *arg); void cui_show_add_url(struct cui *cui); int cui_send_config(struct cui *cui, struct config *config); int cui_send_url(struct cui *cui, char *url); |